November 2008 - Wine-Commits

Michael Stefaniuc : comctl32: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: d4b8948ce35aaf2ae61dbff9b804f95856becee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b8948ce35aaf2ae61dbff9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:22:49 2008 +0100 comctl32: Do not cast NULL. --- dlls/comctl32/dpa.c | 2 +- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/tests/datetime.c | 4 ++-- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/status.c | 4 ++-- dlls/comctl32/tests/tab.c | 2 +- dlls/comctl32/tests/toolbar.c | 8 ++++---- dlls/comctl32/tests/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index e5f98b9..a14c530 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -106,7 +106,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, if (!phDpa || !loadProc || !pStream) return E_INVALIDARG; - *phDpa = (HDPA)NULL; + *phDpa = NULL; position.QuadPart = 0; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0c5ec3e..47d79d6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8056,7 +8056,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) if (!infoPtr->hwndHeader) return -1; /* set header unicode format */ - SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT, (WPARAM)TRUE, (LPARAM)NULL); + SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT, TRUE, 0); /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index e1abd16..0afcc77 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -459,7 +459,7 @@ static BOOL TAB_InternalGetItemRect( static inline BOOL TAB_GetItemRect(const TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - return TAB_InternalGetItemRect(infoPtr, (INT)wParam, (LPRECT)lParam, (LPRECT)NULL); + return TAB_InternalGetItemRect(infoPtr, wParam, (LPRECT)lParam, NULL); } /****************************************************************************** diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index d835e75..caef276 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -197,7 +197,7 @@ static void test_dtm_set_format(HWND hWndDateTime) SYSTEMTIME systime; LRESULT r; - r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL); + r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, 0); expect(1, r); r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, @@ -271,7 +271,7 @@ static void test_dtm_get_monthcal(HWND hWndDateTime) todo_wine { r = SendMessage(hWndDateTime, DTM_GETMONTHCAL, 0, 0); - ok(r == (LPARAM)NULL, "Expected NULL(no child month calendar control), got %ld\n", r); + ok(r == 0, "Expected NULL(no child month calendar control), got %ld\n", r); } ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_get_monthcal_seq, "test_dtm_get_monthcal", FALSE); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8aade81..a8861fd 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -639,7 +639,7 @@ static void test_monthcal_currDate(HWND hwnd) expect(st_original.wSecond, st_new.wSecond); /* lparam cannot be NULL */ - res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM) NULL); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, 0); expect(0, res); ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_curr_date_seq, "monthcal currDate", TRUE); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index e2ec11d..a7c80c6 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -318,7 +318,7 @@ static void test_status_control(void) /* Add an icon to the status bar */ hIcon = LoadIcon(NULL, IDI_QUESTION); - r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); + r = SendMessage(hWndStatus, SB_SETICON, 1, 0); ok(r != 0 || broken(r == 0), /* win95 */ "Expected non-zero, got %d\n", r); @@ -326,7 +326,7 @@ static void test_status_control(void) ok(r != 0 || broken(r == 0), /* win95 */ "Expected non-zero, got %d\n", r); - r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); + r = SendMessage(hWndStatus, SB_SETICON, 1, 0); ok(r != 0 || broken(r == 0), /* win95 */ "Expected non-zero, got %d\n", r); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index eba3f61..bd4919d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -846,7 +846,7 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) toolTip, 0); ok (toolTip == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly.\n"); - SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) NULL, 0); + SendMessage(hTab, TCM_SETTOOLTIPS, 0, 0); ok (NULL == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly.\n"); ok_sequence(sequences, TAB_SEQ_INDEX, getset_tooltip_seq, "Getset tooltip test sequence", TRUE); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 4b6d3c3..8e54a76 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1121,15 +1121,15 @@ static void test_getstring(void) hToolbar = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); ok(hToolbar != NULL, "Toolbar creation problem\n"); - r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), (LPARAM)NULL); + r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), 0); expect(-1, r); - r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), (LPARAM)NULL); + r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), 0); expect(-1, r); r = SendMessage(hToolbar, TB_ADDSTRING, 0, (LPARAM)answer); expect(0, r); - r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), (LPARAM)NULL); + r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), 0); expect(lstrlenA(answer), r); - r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), (LPARAM)NULL); + r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), 0); expect(lstrlenA(answer), r); r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(sizeof(str), 0), (LPARAM)str); expect(lstrlenA(answer), r); diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 00f7024..f69e286 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -871,7 +871,7 @@ static void test_tool_tips(HWND hWndTrackbar){ SendMessage(hWndTrackbar, TBM_SETTOOLTIPS, (LPARAM) hWndTooltip, 0); rTest = (HWND) SendMessage(hWndTrackbar, TBM_GETTOOLTIPS, 0,0); ok(rTest == hWndTooltip, "Expected hWndToolTip, got\n"); - SendMessage(hWndTrackbar, TBM_SETTOOLTIPS, (LPARAM) NULL, 0); + SendMessage(hWndTrackbar, TBM_SETTOOLTIPS, 0, 0); rTest = (HWND) SendMessage(hWndTrackbar, TBM_GETTOOLTIPS, 0,0); ok(rTest == NULL, "Expected NULL\n"); SendMessage(hWndTrackbar, TBM_SETTOOLTIPS, (LPARAM) hWndTooltip, 5); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6605060..dd0563a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5019,7 +5019,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); /* Deassociate treeview from the window before doing anything drastic. */ - SetWindowLongPtrW(infoPtr->hwnd, 0, (DWORD_PTR)NULL); + SetWindowLongPtrW(infoPtr->hwnd, 0, 0); DeleteObject(infoPtr->hDefaultFont);

1 0

Michael Stefaniuc : shell32: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: cc41ac4c165f9b9fbf7535e8e2d3bf49d2af0328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc41ac4c165f9b9fbf7535e8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:18 2008 +0100 shell32: Do not cast NULL. --- dlls/shell32/autocomplete.c | 4 ++-- dlls/shell32/shell.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5892b6d..6c02310 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -533,7 +533,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, WCHAR *msg; int len; - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); + len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); @@ -555,7 +555,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } if (This->options & ACO_AUTOAPPEND) { DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); + SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, 0); if (b>1) { hwndText[b-1] = '\0'; } else { diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 2cc0f54..3b88309 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -319,7 +319,7 @@ SEGPTR WINAPI FindEnvironmentString16(LPCSTR str) if( lpString ) /* offset should be small enough */ return spEnv + (lpString - lpEnv); - return (SEGPTR)NULL; + return 0; } /*************************************************************************

1 0

Michael Stefaniuc : winedos: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: ea3980974dbd3796a09d05b453b6b6401ed94f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3980974dbd3796a09d05b45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:38 2008 +0100 winedos: Do not cast NULL. --- dlls/winedos/devices.c | 2 +- dlls/winedos/ppdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 6246cf9..0ee6f6c 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -187,7 +187,7 @@ static void WINAPI con_interrupt(CONTEXT86*ctx) DOS_DATASEG *dataseg = (DOS_DATASEG *)lol; BYTE *linebuffer = dataseg->buffer; BYTE *curbuffer = (lol->offs_unread_CON) ? - (((BYTE*)dataseg) + lol->offs_unread_CON) : (BYTE*)NULL; + (((BYTE*)dataseg) + lol->offs_unread_CON) : NULL; DOS_DEVICE_HEADER *con = dataseg->dev; DWORD w; diff --git a/dlls/winedos/ppdev.c b/dlls/winedos/ppdev.c index 8c83f38..0c74ae6 100644 --- a/dlls/winedos/ppdev.c +++ b/dlls/winedos/ppdev.c @@ -139,7 +139,7 @@ char IO_pp_init(void) ERR("Is the ppdev module loaded?\n"); continue; } - userbase = strtol(name,(char **)NULL, 16); + userbase = strtol(name, NULL, 16); if ( errno == ERANGE) { WARN("Configuration: Invalid base %s for %s\n",name,buffer); @@ -193,7 +193,7 @@ char IO_pp_init(void) PPDeviceList[nports].lastaccess=GetTickCount(); if (timeout) { - PPDeviceList[nports].timeout = strtol(timeout,(char **)NULL, 10); + PPDeviceList[nports].timeout = strtol(timeout, NULL, 10); if (errno == ERANGE) { WARN("Configuration: Invalid timeout %s in configuration for %s, Setting to 0\n",

1 0

Michael Stefaniuc : dmloader: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: b609a5c037025a6383f09575566784735e18f45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b609a5c037025a6383f095755… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:39 2008 +0100 dmloader: Do not cast NULL. --- dlls/dmloader/classfactory.c | 4 ++-- dlls/dmloader/loader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/classfactory.c b/dlls/dmloader/classfactory.c index 9c7c68a..266e713 100644 --- a/dlls/dmloader/classfactory.c +++ b/dlls/dmloader/classfactory.c @@ -98,7 +98,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter); obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderCF)); if (NULL == obj) { - *ppobj = (LPCLASSFACTORY)NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicLoaderCF_Vtbl; @@ -187,7 +187,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppo TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter); obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerCF)); if (NULL == obj) { - *ppobj = (LPCLASSFACTORY)NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicContainerCF_Vtbl; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 8f1f2c2..1a6d095 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -798,7 +798,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderImpl)); if (NULL == obj) { - *ppobj = (LPDIRECTMUSICLOADER8)NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->LoaderVtbl = &DirectMusicLoader_Loader_Vtbl;

1 0

Michael Stefaniuc : oleaut32: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 25f33cb0bc7f9745c0923a576b677f220443fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f33cb0bc7f9745c0923a576… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:15 2008 +0100 oleaut32: Do not cast NULL. --- dlls/oleaut32/olepicture.c | 4 +--- dlls/oleaut32/ungif.c | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 93b932f..498ee53 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1610,9 +1610,7 @@ succ: end: if(png_ptr) - ppng_destroy_read_struct(&png_ptr, - (info_ptr ? &info_ptr : (png_infopp) NULL), - (png_infopp)NULL); + ppng_destroy_read_struct(&png_ptr, info_ptr ? &info_ptr : NULL, NULL); HeapFree(GetProcessHeap(), 0, row_pointers); HeapFree(GetProcessHeap(), 0, pngdata); return ret; diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index 9cb5693..79bad60 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -148,16 +148,16 @@ MakeMapObject(int ColorCount, /*** FIXME: Our ColorCount has to be a power of two. Is it necessary to * make the user know that or should we automatically round up instead? */ if (ColorCount != (1 << BitSize(ColorCount))) { - return ((ColorMapObject *) NULL); + return NULL; } Object = ungif_alloc(sizeof(ColorMapObject)); - if (Object == (ColorMapObject *) NULL) { - return ((ColorMapObject *) NULL); + if (Object == NULL) { + return NULL; } Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType)); - if (Object->Colors == (GifColorType *) NULL) { + if (Object->Colors == NULL) { return NULL; } @@ -413,9 +413,9 @@ DGifGetImageDesc(GifFileType * GifFile) { return GIF_ERROR; } } - sp->RasterBits = (unsigned char *)NULL; + sp->RasterBits = NULL; sp->ExtensionBlockCount = 0; - sp->ExtensionBlocks = (ExtensionBlock *) NULL; + sp->ExtensionBlocks = NULL; GifFile->ImageCount++;

1 0

Michael Stefaniuc : Remove the remaining casts of NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 4f199a10adbedab97063efb0c0025de58111b1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f199a10adbedab97063efb0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:27:00 2008 +0100 Remove the remaining casts of NULL. --- dlls/atl/atl_ax.c | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/dmcompos/composer.c | 2 +- dlls/dmime/performance.c | 2 +- dlls/mpr/wnet.c | 2 +- dlls/msi/tests/automation.c | 2 +- dlls/msvcrt/tests/time.c | 2 +- dlls/rsaenh/rsaenh.c | 2 +- dlls/w32skrnl/win32s16.c | 2 +- dlls/winmm/mmsystem.c | 2 +- dlls/ws2_32/socket.c | 2 +- programs/regedit/treeview.c | 2 +- programs/taskmgr/taskmgr.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 1d8a67c..e20c342 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -752,7 +752,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, (LONG_PTR) NULL ); + SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); This->hWnd = NULL; } if ( This->control ) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e8df4f0..64e3b60 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1952,7 +1952,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 ifac IWineD3DPixelShader_Release(object); *ppShader = d3d8_shader->handle; } else { - *ppShader = (DWORD)NULL; + *ppShader = 0; } TRACE("(%p) : returning %#x\n", This, *ppShader); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dd59ef4..3caa08f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9603,7 +9603,7 @@ static void texop_range_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 1, (IDirect3DBaseTexture9 *)NULL); + hr = IDirect3DDevice9_SetTexture(device, 1, NULL); ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); IDirect3DTexture9_Release(texture); } diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index c6a7a12..9b5f768 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -117,7 +117,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* pp obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicComposerImpl)); if (NULL == obj) { - *ppobj = (LPDIRECTMUSICCOMPOSER) NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicComposer_Vtbl; diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2c4560e..66b1a02 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1020,7 +1020,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPerformanceImpl (LPCGUID lpcGUID, LPVOID obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPerformance8Impl)); if (NULL == obj) { - *ppobj = (LPDIRECTMUSICPERFORMANCE8)NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicPerformance8_Vtbl; diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 3b05ede..b2599e1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2147,7 +2147,7 @@ DWORD WINAPI WNetGetNetworkInformationW( LPCWSTR lpProvider, providerTable->table[providerIndex].dwSpecVersion; lpNetInfoStruct->dwStatus = NO_ERROR; lpNetInfoStruct->dwCharacteristics = 0; - lpNetInfoStruct->dwHandle = (ULONG_PTR)NULL; + lpNetInfoStruct->dwHandle = 0; lpNetInfoStruct->wNetType = HIWORD(providerTable->table[providerIndex].dwNetType); lpNetInfoStruct->dwPrinters = -1; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index b76aae1..4e82e9f 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1849,7 +1849,7 @@ static void test_Installer_RegistryValue(void) "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,szSix,0,REG_QWORD, (const BYTE *)qw, 8), "RegSetValueExW failed\n"); - ok(!RegSetValueExW(hkey,szSeven,0,REG_NONE, (const BYTE *)NULL, 0), + ok(!RegSetValueExW(hkey,szSeven,0,REG_NONE, NULL, 0), "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey,NULL,0,REG_SZ, (const BYTE *)szOne, sizeof(szOne)), diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 33b2e56..88564de 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -40,7 +40,7 @@ static void test_ctime(void) } static void test_gmtime(void) { - time_t gmt = (time_t)NULL; + time_t gmt = 0; struct tm* gmt_tm = gmtime(&gmt); if(gmt_tm == 0) { diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 6428ae1..40ca9e3 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1677,7 +1677,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, pCryptHash->hKey = hKey; pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; - pCryptHash->pHMACInfo = (PHMAC_INFO)NULL; + pCryptHash->pHMACInfo = NULL; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobSeed); diff --git a/dlls/w32skrnl/win32s16.c b/dlls/w32skrnl/win32s16.c index 3e983f0..4b3cb1d 100644 --- a/dlls/w32skrnl/win32s16.c +++ b/dlls/w32skrnl/win32s16.c @@ -45,7 +45,7 @@ void WINAPI BootTask16(void) SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2) { FIXME("(%d,%d):stub.\n",w1,w2); - return (SEGPTR)NULL; + return 0; } diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 76e42f1..f3046b6 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -2834,7 +2834,7 @@ HMMIO16 WINAPI mmioOpen16(LPSTR szFileName, MMIOINFO16* lpmmioinfo16, */ MMRESULT16 WINAPI mmioClose16(HMMIO16 hmmio, UINT16 uFlags) { - MMIO_SetSegmentedBuffer(HMMIO_32(hmmio), (SEGPTR)NULL, TRUE); + MMIO_SetSegmentedBuffer(HMMIO_32(hmmio), 0, TRUE); return mmioClose(HMMIO_32(hmmio), uFlags); } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b485777..afa33ac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4390,7 +4390,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, CallerId.len = sizeof(src_addr); CallerData.buf = NULL; - CallerData.len = (ULONG)NULL; + CallerData.len = 0; WS_getsockname(cs, &dst_addr, &size); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 2b6f176..f51ccfd 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -532,7 +532,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) tvins.u.item.iSelectedImage = Image_Root; tvins.u.item.cChildren = 5; /* Save the heading level in the item's application-defined data area. */ - tvins.u.item.lParam = (LPARAM)NULL; + tvins.u.item.lParam = 0; tvins.hInsertAfter = (HTREEITEM)TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */ diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index d2f88ec..c765b74 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -1076,7 +1076,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; /* Get the debug privilege for this process. */ - AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0); + AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, NULL, 0); } /* Load our settings from the registry */

1 0

Michael Stefaniuc : dmsynth: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: b963dd0076a886223d01af07ee48012c460d9abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b963dd0076a886223d01af07e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:07 2008 +0100 dmsynth: Do not cast NULL. --- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 26d66fe..c85b711 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -239,7 +239,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynth8Impl)); if (NULL == obj) { - *ppobj = (LPDIRECTMUSICSYNTH8) NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicSynth8_Vtbl; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index eb45839..c017957 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -132,7 +132,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* p TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynthSinkImpl)); if (NULL == obj) { - *ppobj = (LPDIRECTMUSICSYNTHSINK) NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicSynthSink_Vtbl;

1 0

Michael Stefaniuc : setupapi: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: d62b48df2acece81b533a92fbca566cc4023be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62b48df2acece81b533a92fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:48 2008 +0100 setupapi: Do not cast NULL. --- dlls/setupapi/stringtable.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 58a2530..59ad6ce 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -342,14 +342,14 @@ StringTableDuplicate(HSTRING_TABLE hStringTable) if (pSourceTable == NULL) { ERR("Invalid hStringTable!\n"); - return (HSTRING_TABLE)NULL; + return NULL; } pDestinationTable = MyMalloc(sizeof(STRING_TABLE)); if (pDestinationTable == NULL) { ERR("Could not allocate a new string table!\n"); - return (HSTRING_TABLE)NULL; + return NULL; } memset(pDestinationTable, 0, sizeof(STRING_TABLE)); @@ -358,7 +358,7 @@ StringTableDuplicate(HSTRING_TABLE hStringTable) if (pDestinationTable->pSlots == NULL) { MyFree(pDestinationTable); - return (HSTRING_TABLE)NULL; + return NULL; } memset(pDestinationTable->pSlots, 0, sizeof(TABLE_SLOT) * pSourceTable->dwMaxSlots);

1 0

Michael Stefaniuc : oleview: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 87785a2df0b7f31344252a6ea970fbbddcc8715b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87785a2df0b7f31344252a6ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:26:07 2008 +0100 oleview: Do not cast NULL. --- programs/oleview/tree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 70391d7..a6a992a 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -566,7 +566,7 @@ static void AddBaseEntries(void) LoadString(globals.hMainInst, IDS_TREE_OC, U(tvis).item.pszText, MAX_LOAD_STRING); - U(tvis).item.lParam = (LPARAM)NULL; + U(tvis).item.lParam = 0; tree.hOC = TreeView_InsertItem(globals.hTree, &tvis); @@ -582,7 +582,7 @@ static void AddBaseEntries(void) LoadString(globals.hMainInst, IDS_TREE_O1O, U(tvis).item.pszText, MAX_LOAD_STRING); - U(tvis).item.lParam = (LPARAM)NULL; + U(tvis).item.lParam = 0; tree.hO1O = TreeView_InsertItem(globals.hTree, &tvis); LoadString(globals.hMainInst, IDS_TREE_GBCC, U(tvis).item.pszText,

1 0

Michael Stefaniuc : ole32: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 79e31f6d40d1528a04f90a8955c6ec9ae9595b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e31f6d40d1528a04f90a895… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:25:54 2008 +0100 ole32: Do not cast NULL. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 180619a..3c88a36 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5895,7 +5895,7 @@ HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgf return STG_E_INVALIDPARAMETER; } - return StgOpenStorage(pwcsName, NULL, grfMode, (SNB)NULL, 0, (IStorage **)ppObjectOpen); + return StgOpenStorage(pwcsName, NULL, grfMode, NULL, 0, (IStorage **)ppObjectOpen); } @@ -6583,7 +6583,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM int max_try = 6; pData->pData = NULL; - pData->pstrOleObjFileName = (CHAR *) NULL; + pData->pstrOleObjFileName = NULL; for( nTryCnt=0;nTryCnt < max_try; nTryCnt++) {

1 0