improve SHGetFileInfo #118
Conversation
This patch reduces failures of SHGetFileInfo function. CORE-7159
|
Done. Review and commit me. |
| } | ||
| else | ||
| ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, sizeof(temppsfi), flags); |
There was a problem hiding this comment.
s/sizeof(temppsfi)/0/.
| @@ -429,11 +430,11 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, | |||
| return FALSE; | |||
|
|
|||
| /* windows initializes these values regardless of the flags */ | |||
| if (psfi != NULL) | |||
| if (psfi) | |||
There was a problem hiding this comment.
Please avoid unnecessary style changes.
| @@ -566,8 +591,8 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, | |||
|
|
|||
| if (flags & SHGFI_LINKOVERLAY) | |||
| uGilFlags |= GIL_FORSHORTCUT; | |||
| else if ((flags&SHGFI_ADDOVERLAYS) || | |||
| (flags&(SHGFI_ICON|SHGFI_SMALLICON))==SHGFI_ICON) | |||
| else if ((flags & SHGFI_ADDOVERLAYS) || | |||
|
Is this PR ready to squash & merge? |
|
I think so. One thing that I still wonder about is if the fixes are supposed to be so simple, why didn't wine fix them already. |
| { | ||
| if (flags & SHGFI_USEFILEATTRIBUTES) | ||
| { | ||
| return 1; |
There was a problem hiding this comment.
Some magic value here.
Is it SHGFI_SMALLICON (0x000000001)?
|
SHGetFileInfo function In this case, SHGFI_USEFILEATTRIBUTES and SHGFI_EXETYPE flags are used. MSDN says SHGFI_USEFILEATTRIBUTES and SHGFI_EXETYPE are mutually exclusive. So this case is abnormal. I don't know why it is TRUE. |
|
SHGFI_SMALLICON is not for the return value. Can anyone understand? |
|
@katahiromz I do not understand your question. |
|
SHGFI_SMALLICON is usually used as a flag. It is not used as the return value. The test result says using TRUE as a return value in this case. Okay? |
|
Probably because both are defined as 1?
|
|
Yep. |
|
@yagoulas @gigaherz @learn-more unless you object, I'll merge them this weekend |
|
@katahiromz : are there other things to add to this patch or is it ok to be merged? |
|
@HBelusca: It's ready to be merged. |
* Added an entry for Dave Gnukem Dave Gnukem is a retro-style 2D scrolling platform shooter similar to, and inspired by, Duke Nukem 1 The source and assets are licensed under MIT GPL and CC https://github.com/davidjoffe/dave_gnukem I tested the download and install with RAPPS and it worked. This game installed and ran perfectly even with sound using ReactOS 0.4.13 The creator of the game made some comments in his repo about making changes to the gmae so that it could run under ReactOS. This is the latest version * added extra licenses
This patch reduces failures of SHGetFileInfo function. CORE-7159
Purpose
Improve SHGetFileInfo.
JIRA issue: CORE-7159
TODO