mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 05:26:58 +00:00
[USER32] Sync exticon.c with Wine Staging 1.7.55. CORE-10536
svn path=/trunk/; revision=70183
This commit is contained in:
parent
a6a7b6c127
commit
b4abe066d4
|
@ -306,7 +306,7 @@ User32 -
|
|||
reactos/win32ss/user/user32/misc/dde.c # Synced to WineStaging-1.7.55 (dde_misc.c)
|
||||
reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55
|
||||
reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.55
|
||||
reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22
|
||||
reactos/win32ss/user/user32/misc/exticon.c # Synced to WineStaging-1.7.55
|
||||
reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55
|
||||
reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown
|
||||
reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1_1_23
|
||||
|
|
|
@ -231,7 +231,7 @@ static UINT ICO_ExtractIconExW(
|
|||
LPBYTE pData;
|
||||
DWORD sig;
|
||||
HANDLE hFile;
|
||||
UINT16 iconDirCount = 0, iconCount = 0;
|
||||
UINT16 iconDirCount = 0,iconCount = 0;
|
||||
LPBYTE peimage;
|
||||
HANDLE fmapping;
|
||||
DWORD fsizeh,fsizel;
|
||||
|
@ -256,13 +256,13 @@ static UINT ICO_ExtractIconExW(
|
|||
CloseHandle(hFile);
|
||||
if (!fmapping)
|
||||
{
|
||||
WARN("CreateFileMapping error %ld\n", GetLastError() );
|
||||
WARN("CreateFileMapping error %ld\n", GetLastError() );
|
||||
return 0xFFFFFFFF;
|
||||
}
|
||||
|
||||
if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0)))
|
||||
{
|
||||
WARN("MapViewOfFile error %ld\n", GetLastError() );
|
||||
WARN("MapViewOfFile error %ld\n", GetLastError() );
|
||||
CloseHandle(fmapping);
|
||||
return 0xFFFFFFFF;
|
||||
}
|
||||
|
@ -617,8 +617,10 @@ UINT WINAPI PrivateExtractIconsA (
|
|||
UINT ret;
|
||||
INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0);
|
||||
LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
||||
#ifdef __REACTOS__
|
||||
if (lpwstrFile == NULL)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, lpwstrFile, len);
|
||||
ret = PrivateExtractIconsW(lpwstrFile, nIndex, sizeX, sizeY, phicon, piconid, nIcons, flags);
|
||||
|
@ -696,8 +698,10 @@ UINT WINAPI PrivateExtractIconExA (
|
|||
UINT ret;
|
||||
INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0);
|
||||
LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
|
||||
#ifdef __REACTOS__
|
||||
if (lpwstrFile == NULL)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
TRACE("%s %d %p %p %d\n", lpstrFile, nIndex, phIconLarge, phIconSmall, nIcons);
|
||||
|
||||
|
|
Loading…
Reference in a new issue