November 2008 - Wine-commits

Michael Stefaniuc : dmloader: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

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 : winedos: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

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 : shell32: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

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 : comctl32: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

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 : avifil32: Remove superfluous casts of void pointers.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 83c4ae561dac036cb9990be6930cf6f0b212e9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c4ae561dac036cb9990be69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:34:43 2008 +0100 avifil32: Remove superfluous casts of void pointers. --- dlls/avifil32/editstream.c | 2 +- dlls/avifil32/icmstream.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index f2c6e5d..f19f3ac 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -935,7 +935,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos, if (! This->bDecompress) return IAVIStream_ReadFormat(stream, n, format, fmtsize); - lp = (LPBITMAPINFOHEADER)AVIFILE_ReadFrame(This, stream, n); + lp = AVIFILE_ReadFrame(This, stream, n); if (lp == NULL) return AVIERR_ERROR; if (lp->biBitCount <= 8) { diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index cb79fa4..8276e41 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -393,7 +393,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, return hr; } - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, pos); + lpbi = AVIStreamGetFrame(This->pg, pos); if (lpbi == NULL) return AVIERR_MEMORY; @@ -611,7 +611,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, /* compress or decompress? */ if (This->hic == NULL) { /* decompress */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, start); + lpbi = AVIStreamGetFrame(This->pg, start); if (lpbi == NULL) return AVIERR_MEMORY; @@ -634,7 +634,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, while (start > This->lCurrent) { HRESULT hr; - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, ++This->lCurrent); + lpbi = AVIStreamGetFrame(This->pg, ++This->lCurrent); if (lpbi == NULL) { AVIFILE_Reset(This); return AVIERR_MEMORY; @@ -902,7 +902,7 @@ static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This) assert(This->lpbiOutput == NULL); /* get input format */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, This->sInfo.dwStart); + lpbi = AVIStreamGetFrame(This->pg, This->sInfo.dwStart); if (lpbi == NULL) return AVIERR_MEMORY;

1 0

Michael Stefaniuc : uxtheme: Remove superflous casts.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 373f8ff1033cf50281e8f83446fc818b4bfe5fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=373f8ff1033cf50281e8f8344… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:35:17 2008 +0100 uxtheme: Remove superflous casts. --- dlls/uxtheme/draw.c | 12 ++++++------ dlls/uxtheme/msstyles.c | 6 +++--- dlls/uxtheme/system.c | 4 ++-- dlls/uxtheme/uxini.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index ff0ac9e..8280c66 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1177,8 +1177,8 @@ static HRESULT draw_diag_edge (HDC hdc, HTHEME theme, int part, int state, + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); /* Init some vars */ - OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, InnerPen); + OuterPen = InnerPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, InnerPen); spx = spy = epx = epy = 0; /* Satisfy the compiler... */ /* Determine the colors of the edges */ @@ -1373,8 +1373,8 @@ static HRESULT draw_diag_edge (HDC hdc, HTHEME theme, int part, int state, HPEN hpsave; HPEN hp = get_edge_pen ((uFlags & BF_MONO) ? EDGE_WINDOW : EDGE_FILL, theme, part, state); - hbsave = (HBRUSH)SelectObject(hdc, hb); - hpsave = (HPEN)SelectObject(hdc, hp); + hbsave = SelectObject(hdc, hb); + hpsave = SelectObject(hdc, hp); Polygon(hdc, Points, 4); SelectObject(hdc, hbsave); SelectObject(hdc, hpsave); @@ -1426,8 +1426,8 @@ static HRESULT draw_rect_edge (HDC hdc, HTHEME theme, int part, int state, && !(uFlags & (BF_FLAT|BF_MONO)) ) ? E_FAIL : S_OK; /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, LTInnerPen); + LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, LTInnerPen); /* Determine the colors of the edges */ if(uFlags & BF_MONO) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index d0fbb11..8aa67fd 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -132,14 +132,14 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszColors = (LPWSTR)LoadResource(hTheme, hrsc); + pszColors = LoadResource(hTheme, hrsc); if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szSizeNamesResource))) { TRACE("Size names resource not found\n"); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszSizes = (LPWSTR)LoadResource(hTheme, hrsc); + pszSizes = LoadResource(hTheme, hrsc); /* Validate requested color against what's available from the theme */ if(pszColorName) { @@ -298,7 +298,7 @@ static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) TRACE("FILERESNAMES map not found\n"); return NULL; } - tmp = (LPWSTR)LoadResource(tf->hTheme, hrsc); + tmp = LoadResource(tf->hTheme, hrsc); dwResourceIndex = (dwSizeCount * dwColorNum) + dwSizeNum; for(i=0; i < dwResourceIndex; i++) { tmp += lstrlenW(tmp)+1; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3630a6d..d213ba2 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -122,7 +122,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, WCHAR cNull = '\0'; nBytesToAlloc = dwUnExpDataLen; - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); @@ -131,7 +131,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, else { nBytesToAlloc = (lstrlenW(pvData) + 1) * sizeof(WCHAR); - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); lstrcpyW(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, MAX_PATH ); if (dwExpDataLen > MAX_PATH) dwRet = ERROR_MORE_DATA; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 85efdb1..02c5443 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -68,7 +68,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { TRACE("Loading resource INI %s\n", debugstr_w(lpName)); if((hrsc = FindResourceW(hTheme, lpName, szTextFileResource))) { - if(!(lpThemesIni = (LPCWSTR)LoadResource(hTheme, hrsc))) { + if(!(lpThemesIni = LoadResource(hTheme, hrsc))) { TRACE("%s resource not found\n", debugstr_w(lpName)); return NULL; }

1 0

Michael Stefaniuc : d3dx8: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: c6a9182a8340a538e5cfee5f018051471723ba35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a9182a8340a538e5cfee5f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:38 2008 +0100 d3dx8: Do not cast NULL. --- dlls/d3dx8/d3dx8_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index ee897a8..aa186a0 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -39,7 +39,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); if (NULL == object) { - *ppBuffer = (LPD3DXBUFFER)NULL; + *ppBuffer = NULL; return E_OUTOFMEMORY; } object->lpVtbl = &D3DXBuffer_Vtbl; @@ -48,7 +48,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); if (NULL == object->buffer) { HeapFree(GetProcessHeap(), 0, object); - *ppBuffer = (LPD3DXBUFFER)NULL; + *ppBuffer = NULL; return E_OUTOFMEMORY; } *ppBuffer = (LPD3DXBUFFER)object;

1 0

Michael Stefaniuc : dnsapi: Transform two for loops into while loops.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 42c733cd3b74631ae6966ef539fb3ca00f44f1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c733cd3b74631ae6966ef53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:20 2008 +0100 dnsapi: Transform two for loops into while loops. --- dlls/dnsapi/ns_name.c | 2 +- dlls/dnsapi/ns_parse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index 4bb3e4a..9822578 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -103,7 +103,7 @@ dns_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { if (dn + n >= eom) { return (-1); } - for ((void)NULL; n > 0; n--) { + while (n-- > 0) { c = *cp++; if (special(c)) { if (dn + 1 >= eom) { diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index b5884bf..cb9aa62 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -74,7 +74,7 @@ static int dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { const u_char *optr = ptr; - for ((void)NULL; count > 0; count--) { + while (count-- > 0) { int b, rdlength; b = dn_skipname(ptr, eom);

1 0

Michael Stefaniuc : netapi32/tests: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: df4cb76100bfcceb6805976464c1ca99cd234e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4cb76100bfcceb680597646… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:59 2008 +0100 netapi32/tests: Do not cast NULL. --- dlls/netapi32/tests/apibuf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 5589c18..fa29fc4 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -74,13 +74,13 @@ static void run_apibuf_tests(void) /* NULL-Pointer */ /* NT: ERROR_INVALID_PARAMETER, lasterror is untouched) */ SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(0, (LPVOID *)NULL); + res = pNetApiBufferAllocate(0, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); + res = pNetApiBufferAllocate(1024, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError());

1 0

Michael Stefaniuc : ole32: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

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