Fixed a few type clashes in preparation for the switch to STRICT.
This commit is contained in:
parent
345acc90fd
commit
55146dbe18
|
@ -28,7 +28,7 @@ DEFAULT_DEBUG_CHANNEL(file);
|
||||||
HANDLE WINAPI FindFirstChangeNotificationA( LPCSTR lpPathName, BOOL bWatchSubtree,
|
HANDLE WINAPI FindFirstChangeNotificationA( LPCSTR lpPathName, BOOL bWatchSubtree,
|
||||||
DWORD dwNotifyFilter )
|
DWORD dwNotifyFilter )
|
||||||
{
|
{
|
||||||
HANDLE ret = -1;
|
HANDLE ret = INVALID_HANDLE_VALUE;
|
||||||
|
|
||||||
FIXME("this is not supported yet (non-trivial).\n");
|
FIXME("this is not supported yet (non-trivial).\n");
|
||||||
|
|
||||||
|
|
|
@ -244,7 +244,7 @@ static HPEN EMFDRV_PEN_SelectObject(DC *dc, HPEN hPen )
|
||||||
{
|
{
|
||||||
EMRSELECTOBJECT emr;
|
EMRSELECTOBJECT emr;
|
||||||
DWORD index;
|
DWORD index;
|
||||||
HFONT hOldPen;
|
HPEN hOldPen;
|
||||||
|
|
||||||
/* If the object is a stock pen object, do not need to create it.
|
/* If the object is a stock pen object, do not need to create it.
|
||||||
* See definitions in wingdi.h for range of stock pens.
|
* See definitions in wingdi.h for range of stock pens.
|
||||||
|
|
|
@ -3564,8 +3564,8 @@ BOOL WINAPI KillTimer(HWND,UINT);
|
||||||
HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
|
HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
|
||||||
HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
|
HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
|
||||||
#define LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
|
#define LoadAccelerators WINELIB_NAME_AW(LoadAccelerators)
|
||||||
HBITMAP WINAPI LoadBitmapA(HANDLE,LPCSTR);
|
HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
|
||||||
HBITMAP WINAPI LoadBitmapW(HANDLE,LPCWSTR);
|
HBITMAP WINAPI LoadBitmapW(HINSTANCE,LPCWSTR);
|
||||||
#define LoadBitmap WINELIB_NAME_AW(LoadBitmap)
|
#define LoadBitmap WINELIB_NAME_AW(LoadBitmap)
|
||||||
HCURSOR WINAPI LoadCursorA(HINSTANCE,LPCSTR);
|
HCURSOR WINAPI LoadCursorA(HINSTANCE,LPCSTR);
|
||||||
HCURSOR WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
|
HCURSOR WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
|
||||||
|
|
|
@ -251,7 +251,7 @@ HRSRC PE_FindResourceW( HMODULE hmod, LPCWSTR name, LPCWSTR type )
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* PE_LoadResource
|
* PE_LoadResource
|
||||||
*/
|
*/
|
||||||
HANDLE PE_LoadResource( HMODULE hmod, HANDLE hRsrc )
|
HGLOBAL PE_LoadResource( HMODULE hmod, HRSRC hRsrc )
|
||||||
{
|
{
|
||||||
if (!hRsrc) return 0;
|
if (!hRsrc) return 0;
|
||||||
return (HANDLE)(hmod + ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->OffsetToData);
|
return (HANDLE)(hmod + ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->OffsetToData);
|
||||||
|
@ -261,7 +261,7 @@ HANDLE PE_LoadResource( HMODULE hmod, HANDLE hRsrc )
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* PE_SizeofResource
|
* PE_SizeofResource
|
||||||
*/
|
*/
|
||||||
DWORD PE_SizeofResource( HANDLE hRsrc )
|
DWORD PE_SizeofResource( HRSRC hRsrc )
|
||||||
{
|
{
|
||||||
if (!hRsrc) return 0;
|
if (!hRsrc) return 0;
|
||||||
return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;
|
return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;
|
||||||
|
|
|
@ -325,7 +325,7 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* FindResourceA (KERNEL32.128)
|
* FindResourceA (KERNEL32.128)
|
||||||
*/
|
*/
|
||||||
HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
|
HRSRC WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
|
||||||
{
|
{
|
||||||
return RES_FindResource( hModule, type, name,
|
return RES_FindResource( hModule, type, name,
|
||||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), FALSE, FALSE );
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), FALSE, FALSE );
|
||||||
|
@ -334,7 +334,7 @@ HANDLE WINAPI FindResourceA( HMODULE hModule, LPCSTR name, LPCSTR type )
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* FindResourceExA (KERNEL32.129)
|
* FindResourceExA (KERNEL32.129)
|
||||||
*/
|
*/
|
||||||
HANDLE WINAPI FindResourceExA( HMODULE hModule,
|
HRSRC WINAPI FindResourceExA( HMODULE hModule,
|
||||||
LPCSTR type, LPCSTR name, WORD lang )
|
LPCSTR type, LPCSTR name, WORD lang )
|
||||||
{
|
{
|
||||||
return RES_FindResource( hModule, type, name,
|
return RES_FindResource( hModule, type, name,
|
||||||
|
|
|
@ -110,7 +110,7 @@ BOOL WINAPI DuplicateHandle( HANDLE source_process, HANDLE source,
|
||||||
*/
|
*/
|
||||||
HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
|
HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
|
||||||
{
|
{
|
||||||
HANDLE ret = -1;
|
HANDLE ret = INVALID_HANDLE_VALUE;
|
||||||
DuplicateHandle( GetCurrentProcess(), hSrc, (HANDLE)-1, &ret, 0, FALSE,
|
DuplicateHandle( GetCurrentProcess(), hSrc, (HANDLE)-1, &ret, 0, FALSE,
|
||||||
DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE );
|
DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE );
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue