Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CreateFile() fails with INVALID_HANDLE_VALUE, not NULL - this fixes GetLastError() to more accurately point to the problem when diagnosing problems.

Browse source 
svn path=/trunk/; revision=20216
This commit is contained in:
Royce Mitchell III 2005-12-17 06:26:20 +00:00
parent 451a45a649
commit 3488008713
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/user32/windows/bitmap.c
View file

@ -66,7 +66,7 @@ LoadImageA(HINSTANCE hinst,
Handle = LoadImageW(hinst, (LPCWSTR)lpszName, uType, cxDesired, Handle = LoadImageW(hinst, (LPCWSTR)lpszName, uType, cxDesired,
cyDesired, fuLoad); cyDesired, fuLoad);
} }
return Handle; return Handle;
} }
@ -130,7 +130,7 @@ LoadCursorIconImage(
id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height,
fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME));
h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id),
Icon ? MAKEINTRESOURCEW(RT_ICON) : Icon ? MAKEINTRESOURCEW(RT_ICON) :
MAKEINTRESOURCEW(RT_CURSOR)); MAKEINTRESOURCEW(RT_CURSOR));
@ -171,7 +171,7 @@ LoadCursorIconImage(
hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL); OPEN_EXISTING, 0, NULL);
if (hFile == NULL) if (hFile == INVALID_HANDLE_VALUE)
return NULL; return NULL;
hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
@ -298,7 +298,7 @@ LoadBitmapImage(HINSTANCE hInstance, LPCWSTR lpszName, UINT fuLoad)
{ {
hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL); OPEN_EXISTING, 0, NULL);
if (hFile == NULL) if (hFile == INVALID_HANDLE_VALUE)
return NULL; return NULL;
hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
@ -411,7 +411,7 @@ LoadImageW(
default: default:
break; break;
} }
return NULL; return NULL;
} }
@ -501,6 +501,6 @@ CopyImage(
return CopyCursor(hnd); return CopyCursor(hnd);
} }
} }
return NULL; return NULL;
} }