Remove (POINTER)NULL casts.
This commit is contained in:
parent
bf9390e7d2
commit
9b0b1e078a
|
@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile);
|
||||||
#include "initguid.h"
|
#include "initguid.h"
|
||||||
#include "avifile_private.h"
|
#include "avifile_private.h"
|
||||||
|
|
||||||
HMODULE AVIFILE_hModule = (HMODULE)NULL;
|
HMODULE AVIFILE_hModule = NULL;
|
||||||
|
|
||||||
BOOL AVIFILE_bLocked = FALSE;
|
BOOL AVIFILE_bLocked = FALSE;
|
||||||
UINT AVIFILE_uUseCount = 0;
|
UINT AVIFILE_uUseCount = 0;
|
||||||
|
@ -204,7 +204,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
|
|
||||||
switch (fdwReason) {
|
switch (fdwReason) {
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
if (AVIFILE_hModule == (HMODULE)NULL)
|
if (AVIFILE_hModule == NULL)
|
||||||
AVIFILE_hModule = (HMODULE)hInstDll;
|
AVIFILE_hModule = (HMODULE)hInstDll;
|
||||||
break;
|
break;
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
|
|
|
@ -110,14 +110,14 @@ extern void UPDOWN_Register(void);
|
||||||
extern void UPDOWN_Unregister(void);
|
extern void UPDOWN_Unregister(void);
|
||||||
|
|
||||||
|
|
||||||
HANDLE COMCTL32_hHeap = (HANDLE)NULL;
|
HANDLE COMCTL32_hHeap = NULL;
|
||||||
LPSTR COMCTL32_aSubclass = (LPSTR)NULL;
|
LPSTR COMCTL32_aSubclass = NULL;
|
||||||
HMODULE COMCTL32_hModule = 0;
|
HMODULE COMCTL32_hModule = 0;
|
||||||
LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
|
LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
|
||||||
HBRUSH COMCTL32_hPattern55AABrush = (HANDLE)NULL;
|
HBRUSH COMCTL32_hPattern55AABrush = NULL;
|
||||||
COMCTL32_SysColor comctl32_color;
|
COMCTL32_SysColor comctl32_color;
|
||||||
|
|
||||||
static HBITMAP COMCTL32_hPattern55AABitmap = (HANDLE)NULL;
|
static HBITMAP COMCTL32_hPattern55AABitmap = NULL;
|
||||||
|
|
||||||
static const WORD wPattern55AA[] =
|
static const WORD wPattern55AA[] =
|
||||||
{
|
{
|
||||||
|
@ -203,19 +203,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
|
|
||||||
/* delete local pattern brush */
|
/* delete local pattern brush */
|
||||||
DeleteObject (COMCTL32_hPattern55AABrush);
|
DeleteObject (COMCTL32_hPattern55AABrush);
|
||||||
COMCTL32_hPattern55AABrush = (HANDLE)NULL;
|
COMCTL32_hPattern55AABrush = NULL;
|
||||||
DeleteObject (COMCTL32_hPattern55AABitmap);
|
DeleteObject (COMCTL32_hPattern55AABitmap);
|
||||||
COMCTL32_hPattern55AABitmap = (HANDLE)NULL;
|
COMCTL32_hPattern55AABitmap = NULL;
|
||||||
|
|
||||||
/* delete global subclassing atom */
|
/* delete global subclassing atom */
|
||||||
GlobalDeleteAtom (LOWORD(COMCTL32_aSubclass));
|
GlobalDeleteAtom (LOWORD(COMCTL32_aSubclass));
|
||||||
TRACE("Subclassing atom deleted: %p\n", COMCTL32_aSubclass);
|
TRACE("Subclassing atom deleted: %p\n", COMCTL32_aSubclass);
|
||||||
COMCTL32_aSubclass = (LPSTR)NULL;
|
COMCTL32_aSubclass = NULL;
|
||||||
|
|
||||||
/* destroy private heap */
|
/* destroy private heap */
|
||||||
HeapDestroy (COMCTL32_hHeap);
|
HeapDestroy (COMCTL32_hHeap);
|
||||||
TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
|
TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
|
||||||
COMCTL32_hHeap = (HANDLE)NULL;
|
COMCTL32_hHeap = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7045,7 +7045,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
|
||||||
LISTVIEW_SaveTextMetrics(infoPtr);
|
LISTVIEW_SaveTextMetrics(infoPtr);
|
||||||
|
|
||||||
/* create header */
|
/* create header */
|
||||||
infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, (LPCWSTR)NULL,
|
infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL,
|
||||||
WS_CHILD | HDS_HORZ | (DWORD)((LVS_NOSORTHEADER & lpcs->style)?0:HDS_BUTTONS),
|
WS_CHILD | HDS_HORZ | (DWORD)((LVS_NOSORTHEADER & lpcs->style)?0:HDS_BUTTONS),
|
||||||
0, 0, 0, 0, hwnd, NULL,
|
0, 0, 0, 0, hwnd, NULL,
|
||||||
lpcs->hInstance, NULL);
|
lpcs->hInstance, NULL);
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
|
||||||
GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB);
|
GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB);
|
||||||
MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
|
MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
|
||||||
|
|
||||||
fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
|
fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
|
||||||
WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
|
WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
|
||||||
0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
|
0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
|
||||||
|
|
||||||
|
|
|
@ -208,9 +208,9 @@ BOOL WINAPI MapAndLoad(
|
||||||
BOOL bDotDll, BOOL bReadOnly)
|
BOOL bDotDll, BOOL bReadOnly)
|
||||||
{
|
{
|
||||||
CHAR szFileName[MAX_PATH];
|
CHAR szFileName[MAX_PATH];
|
||||||
HANDLE hFile = (HANDLE) NULL;
|
HANDLE hFile = NULL;
|
||||||
HANDLE hFileMapping = (HANDLE) NULL;
|
HANDLE hFileMapping = NULL;
|
||||||
HMODULE hModule = (HMODULE) NULL;
|
HMODULE hModule = NULL;
|
||||||
PIMAGE_NT_HEADERS pNtHeader = NULL;
|
PIMAGE_NT_HEADERS pNtHeader = NULL;
|
||||||
|
|
||||||
/* PathCombine(&szFileName, pszDllPath, pszImageName); */
|
/* PathCombine(&szFileName, pszDllPath, pszImageName); */
|
||||||
|
@ -219,7 +219,7 @@ BOOL WINAPI MapAndLoad(
|
||||||
/* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage) */
|
/* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage) */
|
||||||
if(!(hFile = CreateFileA(
|
if(!(hFile = CreateFileA(
|
||||||
szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */
|
szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */
|
||||||
NULL, OPEN_EXISTING, 0, (HANDLE) NULL)))
|
NULL, OPEN_EXISTING, 0, NULL)))
|
||||||
{
|
{
|
||||||
SetLastError(ERROR_FILE_NOT_FOUND);
|
SetLastError(ERROR_FILE_NOT_FOUND);
|
||||||
goto Error;
|
goto Error;
|
||||||
|
@ -234,7 +234,7 @@ BOOL WINAPI MapAndLoad(
|
||||||
goto Error;
|
goto Error;
|
||||||
}
|
}
|
||||||
CloseHandle(hFile);
|
CloseHandle(hFile);
|
||||||
hFile = (HANDLE) NULL;
|
hFile = NULL;
|
||||||
|
|
||||||
if(!(hModule = (HMODULE) MapViewOfFile(
|
if(!(hModule = (HMODULE) MapViewOfFile(
|
||||||
hFileMapping, FILE_MAP_READ, 0, 0, 0)))
|
hFileMapping, FILE_MAP_READ, 0, 0, 0)))
|
||||||
|
@ -246,7 +246,7 @@ BOOL WINAPI MapAndLoad(
|
||||||
}
|
}
|
||||||
|
|
||||||
CloseHandle(hFileMapping);
|
CloseHandle(hFileMapping);
|
||||||
hFileMapping=(HANDLE) NULL;
|
hFileMapping=NULL;
|
||||||
|
|
||||||
pLoadedImage = (PLOADED_IMAGE) HeapAlloc(
|
pLoadedImage = (PLOADED_IMAGE) HeapAlloc(
|
||||||
IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)
|
IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)
|
||||||
|
|
|
@ -37,7 +37,7 @@ HANDLE WINAPI FindDebugInfoFile(
|
||||||
debugstr_a(DebugFilePath)
|
debugstr_a(DebugFilePath)
|
||||||
);
|
);
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||||
return (HANDLE) NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
@ -51,7 +51,7 @@ HANDLE WINAPI FindExecutableImage(
|
||||||
debugstr_a(ImageFilePath)
|
debugstr_a(ImageFilePath)
|
||||||
);
|
);
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||||
return (HANDLE) NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
|
@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
|
||||||
|
|
||||||
/**********************************************************************/
|
/**********************************************************************/
|
||||||
|
|
||||||
HANDLE IMAGEHLP_hHeap = (HANDLE) NULL;
|
HANDLE IMAGEHLP_hHeap = NULL;
|
||||||
|
|
||||||
static API_VERSION IMAGEHLP_ApiVersion = { 4, 0, 0, 5 };
|
static API_VERSION IMAGEHLP_ApiVersion = { 4, 0, 0, 5 };
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
break;
|
break;
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
HeapDestroy(IMAGEHLP_hHeap);
|
HeapDestroy(IMAGEHLP_hHeap);
|
||||||
IMAGEHLP_hHeap = (HANDLE) NULL;
|
IMAGEHLP_hHeap = NULL;
|
||||||
break;
|
break;
|
||||||
case DLL_THREAD_ATTACH:
|
case DLL_THREAD_ATTACH:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -388,22 +388,22 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive)
|
||||||
ok(CreateDirectoryA(tmpstr,NULL),"CreateDirectoryA failed");
|
ok(CreateDirectoryA(tmpstr,NULL),"CreateDirectoryA failed");
|
||||||
sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,SHORTFILE);
|
sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,SHORTFILE);
|
||||||
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
||||||
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,(HANDLE)NULL);
|
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
|
||||||
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
||||||
ok(CloseHandle(hndl),"CloseHandle failed");
|
ok(CloseHandle(hndl),"CloseHandle failed");
|
||||||
sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,LONGFILE);
|
sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,LONGFILE);
|
||||||
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
||||||
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,(HANDLE)NULL);
|
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
|
||||||
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
||||||
ok(CloseHandle(hndl),"CloseHandle failed");
|
ok(CloseHandle(hndl),"CloseHandle failed");
|
||||||
sprintf(tmpstr,"%s\\%s\\%s",newdir,LONGDIR,SHORTFILE);
|
sprintf(tmpstr,"%s\\%s\\%s",newdir,LONGDIR,SHORTFILE);
|
||||||
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
||||||
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,(HANDLE)NULL);
|
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
|
||||||
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
||||||
ok(CloseHandle(hndl),"CloseHandle failed");
|
ok(CloseHandle(hndl),"CloseHandle failed");
|
||||||
sprintf(tmpstr,"%s\\%s\\%s",newdir,LONGDIR,LONGFILE);
|
sprintf(tmpstr,"%s\\%s\\%s",newdir,LONGDIR,LONGFILE);
|
||||||
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,
|
||||||
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,(HANDLE)NULL);
|
CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
|
||||||
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
ok(hndl!=INVALID_HANDLE_VALUE,"CreateFileA failed");
|
||||||
ok(CloseHandle(hndl),"CloseHandle failed");
|
ok(CloseHandle(hndl),"CloseHandle failed");
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm);
|
||||||
|
|
||||||
/**********************************************************************/
|
/**********************************************************************/
|
||||||
|
|
||||||
HANDLE MSACM_hHeap = (HANDLE) NULL;
|
HANDLE MSACM_hHeap = NULL;
|
||||||
PWINE_ACMDRIVERID MSACM_pFirstACMDriverID = NULL;
|
PWINE_ACMDRIVERID MSACM_pFirstACMDriverID = NULL;
|
||||||
PWINE_ACMDRIVERID MSACM_pLastACMDriverID = NULL;
|
PWINE_ACMDRIVERID MSACM_pLastACMDriverID = NULL;
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
MSACM_UnregisterAllDrivers();
|
MSACM_UnregisterAllDrivers();
|
||||||
HeapDestroy(MSACM_hHeap);
|
HeapDestroy(MSACM_hHeap);
|
||||||
MSACM_hHeap = (HANDLE)NULL;
|
MSACM_hHeap = NULL;
|
||||||
MSACM_hInstance32 = NULL;
|
MSACM_hInstance32 = NULL;
|
||||||
break;
|
break;
|
||||||
case DLL_THREAD_ATTACH:
|
case DLL_THREAD_ATTACH:
|
||||||
|
|
|
@ -51,11 +51,11 @@ void msvcrt_init_console(void)
|
||||||
|
|
||||||
/* FIXME: Should be initialised with:
|
/* FIXME: Should be initialised with:
|
||||||
* CreateFileA("CONIN$", GENERIC_READ, FILE_SHARE_READ,
|
* CreateFileA("CONIN$", GENERIC_READ, FILE_SHARE_READ,
|
||||||
* NULL, OPEN_EXISTING, 0, (HANDLE)NULL);
|
* NULL, OPEN_EXISTING, 0, NULL);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE,
|
MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE,
|
||||||
NULL, OPEN_EXISTING, 0, (HANDLE)NULL);
|
NULL, OPEN_EXISTING, 0, NULL);
|
||||||
|
|
||||||
if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) ||
|
if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) ||
|
||||||
(MSVCRT_console_out== INVALID_HANDLE_VALUE))
|
(MSVCRT_console_out== INVALID_HANDLE_VALUE))
|
||||||
|
|
|
@ -687,7 +687,7 @@ HANDLE VFWAPI ICImageCompress(
|
||||||
FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n",
|
FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n",
|
||||||
hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize);
|
hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize);
|
||||||
|
|
||||||
return (HANDLE)NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
|
@ -398,7 +398,7 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj)
|
||||||
GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1)
|
GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1)
|
||||||
? szFmtName : "");
|
? szFmtName : "");
|
||||||
|
|
||||||
SetClipboardData( rgelt.cfFormat, (HANDLE)NULL);
|
SetClipboardData( rgelt.cfFormat, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
IEnumFORMATETC_Release(penumFormatetc);
|
IEnumFORMATETC_Release(penumFormatetc);
|
||||||
|
|
|
@ -42,8 +42,8 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(richedit);
|
WINE_DEFAULT_DEBUG_CHANNEL(richedit);
|
||||||
|
|
||||||
HANDLE RICHED32_hHeap = (HANDLE)NULL;
|
HANDLE RICHED32_hHeap = NULL;
|
||||||
/* LPSTR RICHED32_aSubclass = (LPSTR)NULL; */
|
/* LPSTR RICHED32_aSubclass = NULL; */
|
||||||
|
|
||||||
#define DPRINTF_EDIT_MSG32(str) \
|
#define DPRINTF_EDIT_MSG32(str) \
|
||||||
TRACE(\
|
TRACE(\
|
||||||
|
@ -81,7 +81,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
/* unregister all common control classes */
|
/* unregister all common control classes */
|
||||||
RICHED32_Unregister ();
|
RICHED32_Unregister ();
|
||||||
HeapDestroy (RICHED32_hHeap);
|
HeapDestroy (RICHED32_hHeap);
|
||||||
RICHED32_hHeap = (HANDLE)NULL;
|
RICHED32_hHeap = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -174,7 +174,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
|
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
CloseHandle(master_mutex);
|
CloseHandle(master_mutex);
|
||||||
master_mutex = (HANDLE) NULL;
|
master_mutex = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ HANDLE RPCRT4_RpcssNPConnect(void)
|
||||||
case WAIT_TIMEOUT:
|
case WAIT_TIMEOUT:
|
||||||
default:
|
default:
|
||||||
ERR("This should never happen: couldn't enter mutex.\n");
|
ERR("This should never happen: couldn't enter mutex.\n");
|
||||||
return (HANDLE) NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try to open the client side of the named pipe. */
|
/* try to open the client side of the named pipe. */
|
||||||
|
|
|
@ -189,7 +189,7 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
|
||||||
|
|
||||||
case 12288 :
|
case 12288 :
|
||||||
{
|
{
|
||||||
HMODULE hComdlg = (HMODULE)NULL ;
|
HMODULE hComdlg = NULL ;
|
||||||
LPFNOFN ofnProc = NULL ;
|
LPFNOFN ofnProc = NULL ;
|
||||||
static char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ;
|
static char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ;
|
||||||
static OPENFILENAMEA ofn =
|
static OPENFILENAMEA ofn =
|
||||||
|
@ -198,7 +198,7 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
"Executable Files\0*.exe\0All Files\0*.*\0\0\0\0",
|
"Executable Files\0*.exe\0All Files\0*.*\0\0\0\0",
|
||||||
(LPSTR)NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
szFName,
|
szFName,
|
||||||
|
@ -210,15 +210,15 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
|
||||||
OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST,
|
OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
(LPCSTR)NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
(LPOFNHOOKPROC)NULL,
|
(LPOFNHOOKPROC)NULL,
|
||||||
(LPCSTR)NULL
|
NULL
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
ofn.hwndOwner = hwnd ;
|
ofn.hwndOwner = hwnd ;
|
||||||
|
|
||||||
if ((HMODULE)NULL == (hComdlg = LoadLibraryExA ("comdlg32", (HANDLE)NULL, 0)))
|
if (NULL == (hComdlg = LoadLibraryExA ("comdlg32", NULL, 0)))
|
||||||
{
|
{
|
||||||
MessageBoxA (hwnd, "Unable to display dialog box (LoadLibraryEx) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ;
|
MessageBoxA (hwnd, "Unable to display dialog box (LoadLibraryEx) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ;
|
||||||
return TRUE ;
|
return TRUE ;
|
||||||
|
|
|
@ -96,7 +96,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
|
||||||
size*=2;
|
size*=2;
|
||||||
hargv=GlobalReAlloc(hargv, size, 0);
|
hargv=GlobalReAlloc(hargv, size, 0);
|
||||||
argv=GlobalLock(hargv);
|
argv=GlobalLock(hargv);
|
||||||
} while (GetModuleFileNameW((HMODULE)0, (LPWSTR)(argv+1), size-sizeof(LPWSTR)) == 0);
|
} while (GetModuleFileNameW(0, (LPWSTR)(argv+1), size-sizeof(LPWSTR)) == 0);
|
||||||
argv[0]=(LPWSTR)(argv+1);
|
argv[0]=(LPWSTR)(argv+1);
|
||||||
if (numargs)
|
if (numargs)
|
||||||
*numargs=2;
|
*numargs=2;
|
||||||
|
|
|
@ -563,7 +563,7 @@ BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execf
|
||||||
debugstr_a(sei->lpDirectory), sei->nShow,
|
debugstr_a(sei->lpDirectory), sei->nShow,
|
||||||
(sei->fMask & SEE_MASK_CLASSNAME) ? debugstr_a(sei->lpClass) : "not used");
|
(sei->fMask & SEE_MASK_CLASSNAME) ? debugstr_a(sei->lpClass) : "not used");
|
||||||
|
|
||||||
sei->hProcess = (HANDLE)NULL;
|
sei->hProcess = NULL;
|
||||||
ZeroMemory(szApplicationName,MAX_PATH);
|
ZeroMemory(szApplicationName,MAX_PATH);
|
||||||
if (sei->lpFile)
|
if (sei->lpFile)
|
||||||
strcpy(szApplicationName, sei->lpFile);
|
strcpy(szApplicationName, sei->lpFile);
|
||||||
|
|
|
@ -574,7 +574,7 @@ BOOL WINAPI SHInitRestricted(LPSTR inpRegKey, LPSTR parm2)
|
||||||
key string, then pass. Otherwise return 0.
|
key string, then pass. Otherwise return 0.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (inpRegKey != (LPSTR)NULL)
|
if (inpRegKey != NULL)
|
||||||
{
|
{
|
||||||
if (lstrcmpiA(inpRegKey, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies"))
|
if (lstrcmpiA(inpRegKey, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies"))
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@ void createTestFile(CHAR *name)
|
||||||
DWORD written;
|
DWORD written;
|
||||||
CHAR msg[MAX_PATH];
|
CHAR msg[MAX_PATH];
|
||||||
|
|
||||||
file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, (HANDLE)NULL);
|
file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
|
||||||
sprintf(msg, "Failure to open file %s", name);
|
sprintf(msg, "Failure to open file %s", name);
|
||||||
ok(file != INVALID_HANDLE_VALUE, msg);
|
ok(file != INVALID_HANDLE_VALUE, msg);
|
||||||
WriteFile(file, name, strlen(name), &written, NULL);
|
WriteFile(file, name, strlen(name), &written, NULL);
|
||||||
|
@ -109,7 +109,7 @@ void test_delete(void)
|
||||||
sprintf(buf, "%s\\%s", CURR_DIR, "test?.txt");
|
sprintf(buf, "%s\\%s", CURR_DIR, "test?.txt");
|
||||||
buf[strlen(buf) + 1] = '\0';
|
buf[strlen(buf) + 1] = '\0';
|
||||||
|
|
||||||
shfo.hwnd = (HANDLE)NULL;
|
shfo.hwnd = NULL;
|
||||||
shfo.wFunc = FO_DELETE;
|
shfo.wFunc = FO_DELETE;
|
||||||
shfo.pFrom = buf;
|
shfo.pFrom = buf;
|
||||||
shfo.pTo = "\0";
|
shfo.pTo = "\0";
|
||||||
|
@ -153,7 +153,7 @@ void test_rename()
|
||||||
CHAR from[MAX_PATH];
|
CHAR from[MAX_PATH];
|
||||||
CHAR to[MAX_PATH];
|
CHAR to[MAX_PATH];
|
||||||
|
|
||||||
shfo.hwnd = (HANDLE)NULL;
|
shfo.hwnd = NULL;
|
||||||
shfo.wFunc = FO_RENAME;
|
shfo.wFunc = FO_RENAME;
|
||||||
shfo.pFrom = from;
|
shfo.pFrom = from;
|
||||||
shfo.pTo = to;
|
shfo.pTo = to;
|
||||||
|
@ -212,7 +212,7 @@ void test_copy(void)
|
||||||
CHAR to[MAX_PATH];
|
CHAR to[MAX_PATH];
|
||||||
FILEOP_FLAGS tmp_flags;
|
FILEOP_FLAGS tmp_flags;
|
||||||
|
|
||||||
shfo.hwnd = (HANDLE)NULL;
|
shfo.hwnd = NULL;
|
||||||
shfo.wFunc = FO_COPY;
|
shfo.wFunc = FO_COPY;
|
||||||
shfo.pFrom = from;
|
shfo.pFrom = from;
|
||||||
shfo.pTo = to;
|
shfo.pTo = to;
|
||||||
|
@ -296,7 +296,7 @@ void test_move(void)
|
||||||
CHAR from[MAX_PATH];
|
CHAR from[MAX_PATH];
|
||||||
CHAR to[MAX_PATH];
|
CHAR to[MAX_PATH];
|
||||||
|
|
||||||
shfo.hwnd = (HANDLE)NULL;
|
shfo.hwnd = NULL;
|
||||||
shfo.wFunc = FO_MOVE;
|
shfo.wFunc = FO_MOVE;
|
||||||
shfo.pFrom = from;
|
shfo.pFrom = from;
|
||||||
shfo.pTo = to;
|
shfo.pTo = to;
|
||||||
|
|
|
@ -444,7 +444,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode,
|
||||||
|
|
||||||
/* Open HANDLE to file */
|
/* Open HANDLE to file */
|
||||||
hFile = CreateFileW(lpszPath, dwAccess, dwShare, NULL, dwCreate,
|
hFile = CreateFileW(lpszPath, dwAccess, dwShare, NULL, dwCreate,
|
||||||
dwAttributes, (HANDLE)0);
|
dwAttributes, 0);
|
||||||
|
|
||||||
if(hFile == INVALID_HANDLE_VALUE)
|
if(hFile == INVALID_HANDLE_VALUE)
|
||||||
{
|
{
|
||||||
|
|
|
@ -123,7 +123,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
|
|
||||||
PSDRV_Heap = HeapCreate(0, 0x10000, 0);
|
PSDRV_Heap = HeapCreate(0, 0x10000, 0);
|
||||||
if (PSDRV_Heap == (HANDLE)NULL)
|
if (PSDRV_Heap == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (PSDRV_GetFontMetrics() == FALSE) {
|
if (PSDRV_GetFontMetrics() == FALSE) {
|
||||||
|
@ -132,7 +132,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||||
}
|
}
|
||||||
|
|
||||||
PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
|
PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
|
||||||
if (PSDRV_DefaultFont == (HANDLE)NULL) {
|
if (PSDRV_DefaultFont == NULL) {
|
||||||
HeapDestroy(PSDRV_Heap);
|
HeapDestroy(PSDRV_Heap);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -192,7 +192,7 @@ BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
|
||||||
BOOL WINAPI FTP_FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
|
BOOL WINAPI FTP_FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile,
|
||||||
LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
|
LPCSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
|
||||||
{
|
{
|
||||||
HANDLE hFile = (HANDLE)NULL;
|
HANDLE hFile = NULL;
|
||||||
BOOL bSuccess = FALSE;
|
BOOL bSuccess = FALSE;
|
||||||
LPWININETAPPINFOA hIC = NULL;
|
LPWININETAPPINFOA hIC = NULL;
|
||||||
LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
|
LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
|
||||||
|
|
|
@ -579,7 +579,7 @@ static void StartServer (LPTHREAD_START_ROUTINE routine,
|
||||||
{
|
{
|
||||||
par->general = general;
|
par->general = general;
|
||||||
thread[0] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[0] );
|
thread[0] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[0] );
|
||||||
ok ( thread[0] != (HANDLE) NULL, "Failed to create server thread" );
|
ok ( thread[0] != NULL, "Failed to create server thread" );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void StartClients (LPTHREAD_START_ROUTINE routine,
|
static void StartClients (LPTHREAD_START_ROUTINE routine,
|
||||||
|
@ -591,7 +591,7 @@ static void StartClients (LPTHREAD_START_ROUTINE routine,
|
||||||
{
|
{
|
||||||
client_id = i - 1;
|
client_id = i - 1;
|
||||||
thread[i] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[i] );
|
thread[i] = CreateThread ( NULL, 0, routine, par, 0, &thread_id[i] );
|
||||||
ok ( thread[i] != (HANDLE) NULL, "Failed to create client thread" );
|
ok ( thread[i] != NULL, "Failed to create client thread" );
|
||||||
/* Make sure the client is up and running */
|
/* Make sure the client is up and running */
|
||||||
WaitForSingleObject ( client_ready[client_id], INFINITE );
|
WaitForSingleObject ( client_ready[client_id], INFINITE );
|
||||||
};
|
};
|
||||||
|
|
|
@ -3125,7 +3125,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
|
||||||
++cbMaxValueNameLen; /* allow for trailing '\0' */
|
++cbMaxValueNameLen; /* allow for trailing '\0' */
|
||||||
|
|
||||||
hHeap = GetProcessHeap ();
|
hHeap = GetProcessHeap ();
|
||||||
if (hHeap == (HANDLE) NULL)
|
if (hHeap == NULL)
|
||||||
{
|
{
|
||||||
ERR ("GetProcessHeap failed\n");
|
ERR ("GetProcessHeap failed\n");
|
||||||
r = RegCloseKey (hkSubKey);
|
r = RegCloseKey (hkSubKey);
|
||||||
|
@ -3314,7 +3314,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
|
||||||
}
|
}
|
||||||
|
|
||||||
hHeap = GetProcessHeap ();
|
hHeap = GetProcessHeap ();
|
||||||
if (hHeap == (HANDLE) NULL)
|
if (hHeap == NULL)
|
||||||
{
|
{
|
||||||
ERR ("GetProcessHeap failed\n");
|
ERR ("GetProcessHeap failed\n");
|
||||||
return ERROR_OUTOFMEMORY;
|
return ERROR_OUTOFMEMORY;
|
||||||
|
|
|
@ -475,7 +475,7 @@ LPVOID WINAPI GlobalLock16(
|
||||||
) {
|
) {
|
||||||
if (!handle) return 0;
|
if (!handle) return 0;
|
||||||
if (!VALID_HANDLE(handle))
|
if (!VALID_HANDLE(handle))
|
||||||
return (LPVOID)0;
|
return 0;
|
||||||
GET_ARENA_PTR(handle)->lockCount++;
|
GET_ARENA_PTR(handle)->lockCount++;
|
||||||
return (LPVOID)GET_ARENA_PTR(handle)->base;
|
return (LPVOID)GET_ARENA_PTR(handle)->base;
|
||||||
}
|
}
|
||||||
|
@ -1117,7 +1117,7 @@ LPVOID WINAPI GlobalLock(
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
WARN("invalid handle\n");
|
WARN("invalid handle\n");
|
||||||
palloc=(LPVOID) NULL;
|
palloc=NULL;
|
||||||
SetLastError(ERROR_INVALID_HANDLE);
|
SetLastError(ERROR_INVALID_HANDLE);
|
||||||
}
|
}
|
||||||
/* HeapUnlock(GetProcessHeap()); */;
|
/* HeapUnlock(GetProcessHeap()); */;
|
||||||
|
|
|
@ -363,7 +363,7 @@ void TestNotifyChangeKeyValue()
|
||||||
long lSts;
|
long lSts;
|
||||||
HANDLE hEvent;
|
HANDLE hEvent;
|
||||||
|
|
||||||
hEvent = (HANDLE)0;
|
hEvent = 0;
|
||||||
|
|
||||||
lSts = RegNotifyChangeKeyValue((HKEY)2, TRUE, REG_NOTIFY_CHANGE_NAME, 0, 0);
|
lSts = RegNotifyChangeKeyValue((HKEY)2, TRUE, REG_NOTIFY_CHANGE_NAME, 0, 0);
|
||||||
if (lSts != ERROR_INVALID_HANDLE) xERROR(1,lSts);
|
if (lSts != ERROR_INVALID_HANDLE) xERROR(1,lSts);
|
||||||
|
@ -695,4 +695,3 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -352,7 +352,7 @@ HANDLE RPCSS_NPConnect(void)
|
||||||
case WAIT_TIMEOUT:
|
case WAIT_TIMEOUT:
|
||||||
default:
|
default:
|
||||||
WINE_ERR("This should never happen: couldn't enter mutex.\n");
|
WINE_ERR("This should never happen: couldn't enter mutex.\n");
|
||||||
return (HANDLE) NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try to open the client side of the named pipe. */
|
/* try to open the client side of the named pipe. */
|
||||||
|
@ -516,7 +516,7 @@ BOOL RPCSS_BecomePipeServer(void)
|
||||||
NULL, /* no security attribute */
|
NULL, /* no security attribute */
|
||||||
0, /* default stack size */
|
0, /* default stack size */
|
||||||
(LPTHREAD_START_ROUTINE) NPMainWorkThread,
|
(LPTHREAD_START_ROUTINE) NPMainWorkThread,
|
||||||
(LPVOID) NULL, /* thread parameter */
|
NULL, /* thread parameter */
|
||||||
0, /* not suspended */
|
0, /* not suspended */
|
||||||
&threadid /* returns thread ID (not used) */
|
&threadid /* returns thread ID (not used) */
|
||||||
);
|
);
|
||||||
|
|
|
@ -210,7 +210,7 @@ BOOL RPCSS_Shutdown(void)
|
||||||
if (!CloseHandle(master_mutex))
|
if (!CloseHandle(master_mutex))
|
||||||
WINE_WARN("Failed to release master mutex\n");
|
WINE_WARN("Failed to release master mutex\n");
|
||||||
|
|
||||||
master_mutex = (HANDLE)NULL;
|
master_mutex = NULL;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1202,7 +1202,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile)
|
||||||
WINE_FIXME("Too high face ref (%u/%u)\n", idx, face_num);
|
WINE_FIXME("Too high face ref (%u/%u)\n", idx, face_num);
|
||||||
strcpy(hlpfile->fonts[i].LogFont.lfFaceName, "Helv");
|
strcpy(hlpfile->fonts[i].LogFont.lfFaceName, "Helv");
|
||||||
}
|
}
|
||||||
hlpfile->fonts[i].hFont = (HANDLE)0;
|
hlpfile->fonts[i].hFont = 0;
|
||||||
hlpfile->fonts[i].color = RGB(ref[dscr_offset + i * 11 + 5],
|
hlpfile->fonts[i].color = RGB(ref[dscr_offset + i * 11 + 5],
|
||||||
ref[dscr_offset + i * 11 + 6],
|
ref[dscr_offset + i * 11 + 6],
|
||||||
ref[dscr_offset + i * 11 + 7]);
|
ref[dscr_offset + i * 11 + 7]);
|
||||||
|
|
|
@ -297,7 +297,7 @@ HANDLE hExistingCompletionPort, DWORD dwCompletionKey,
|
||||||
DWORD dwNumberOfConcurrentThreads)
|
DWORD dwNumberOfConcurrentThreads)
|
||||||
{
|
{
|
||||||
FIXME("(%p, %p, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
|
FIXME("(%p, %p, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
|
||||||
return (HANDLE)NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
|
|
Loading…
Reference in New Issue