November 2008 - Wine-commits

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

03 Nov '08

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

03 Nov '08

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

03 Nov '08

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

03 Nov '08

Module: wine Branch: master Commit: 706df65c5a02d6d889bfa7f4656b4738e3a97dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706df65c5a02d6d889bfa7f46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:27 2008 +0100 user32: Do not cast NULL. --- dlls/user32/comm16.c | 4 ++-- dlls/user32/tests/dde.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index c7f3ab2..46f72c6 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -752,14 +752,14 @@ SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask) TRACE("cid %d,mask %d\n",cid,fuEvtMask); if ((ptr = GetDeviceStruct(cid)) == NULL) { FIXME("no handle for cid = %0x!\n",cid); - return (SEGPTR)NULL; + return 0; } ptr->eventmask = fuEvtMask; if (cid&FLAG_LPT) { WARN(" cid %d not comm port\n",cid); - return (SEGPTR)NULL; + return 0; } /* it's a COM port ? -> modify flags */ stol = (unsigned char *)COM[cid].unknown + COMM_MSR_OFFSET; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 968cd26..14a52b5 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1726,7 +1726,7 @@ static void test_FreeDDElParam(void) HGLOBAL val, hglobal; BOOL ret; - ret = FreeDDElParam(WM_DDE_INITIATE, (LPARAM)NULL); + ret = FreeDDElParam(WM_DDE_INITIATE, 0); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); @@ -1975,7 +1975,7 @@ static void test_UnpackDDElParam(void) /* NULL lParam */ lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_INITIATE, (LPARAM)NULL, &lo, &hi); + ret = UnpackDDElParam(WM_DDE_INITIATE, 0, &lo, &hi); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0, "Expected 0, got %08lx\n", lo); ok(hi == 0, "Expected 0, got %08lx\n", hi); @@ -2012,7 +2012,7 @@ static void test_UnpackDDElParam(void) lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_ADVISE, (LPARAM)NULL, &lo, &hi); + ret = UnpackDDElParam(WM_DDE_ADVISE, 0, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(lo == 0 || broken(lo == 0xdead), /* win2k */

1 0

Michael Stefaniuc : riched20: Use MAKELPARAM instead of "(LPARAM) MAKELONG" .
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 2ae8511980596b7034ec7a817860aca24e7b5402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae8511980596b7034ec7a817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:22:27 2008 +0100 riched20: Use MAKELPARAM instead of "(LPARAM) MAKELONG". --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a55f845..bc93899 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3821,7 +3821,7 @@ static void test_WM_SETFONT(void) returnedCF2A.cbSize = sizeof(returnedCF2A); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x"); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont); @@ -3829,14 +3829,14 @@ static void test_WM_SETFONT(void) "EM_GETCHARFORMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n", sentLogFont.lfFaceName,returnedCF2A.szFaceName); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont); ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), "EM_GETCHARFORMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n", sentLogFont.lfFaceName,returnedCF2A.szFaceName); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont); ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), @@ -3923,7 +3923,7 @@ static void test_EM_GETMODIFY(void) /* setting font doesn't change modify flag */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont, MAKELPARAM(TRUE, 0)); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result == 0, "EM_GETMODIFY returned non-zero, instead of zero on setting font\n");

1 0

Michael Stefaniuc : winedbg: Use FIELD_OFFSET instead of reimplementing it.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 880d944ea0f02fb7c3f1c60ff6371555f29825ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=880d944ea0f02fb7c3f1c60ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:02 2008 +0100 winedbg: Use FIELD_OFFSET instead of reimplementing it. --- programs/winedbg/display.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/display.c b/programs/winedbg/display.c index 0901961..287d4ae 100644 --- a/programs/winedbg/display.c +++ b/programs/winedbg/display.c @@ -40,8 +40,6 @@ struct display static struct display *displaypoints = NULL; static unsigned int maxdisplays = 0, ndisplays = 0; -#define OFFSET_OF(_f,_s) ((unsigned)(&(((_s*)NULL)->_f))) - static inline BOOL cmp_symbol(const SYMBOL_INFO* si1, const SYMBOL_INFO* si2) { /* FIXME: !memcmp(si1, si2, sizeof(SYMBOL_INFO) + si1->NameLen) @@ -50,7 +48,7 @@ static inline BOOL cmp_symbol(const SYMBOL_INFO* si1, const SYMBOL_INFO* si2) * stack_get_frame, so that un-touched fields by stack_get_frame * get the same value!! */ - return !memcmp(si1, si2, OFFSET_OF(Name, SYMBOL_INFO)) && + return !memcmp(si1, si2, FIELD_OFFSET(SYMBOL_INFO, Name)) && !memcmp(si1->Name, si2->Name, si1->NameLen); }

1 0

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

03 Nov '08

Module: wine Branch: master Commit: 892f735930631a757aea84e9d7f5582d627a9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892f735930631a757aea84e9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:00 2008 +0100 dmusic: Do not cast NULL. --- dlls/dmusic/dmusic.c | 4 ++-- dlls/dmusic/port.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 34edce9..f37f8f6 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS if (IsEqualCLSID (rclsidPort, &PortCaps.guidPort)) { hr = DMUSIC_CreateDirectMusicPortImpl(&IID_IDirectMusicPort, (LPVOID*) &pNewPort, (LPUNKNOWN) This, pPortParams, &PortCaps); if (FAILED(hr)) { - *ppPort = (LPDIRECTMUSICPORT) NULL; + *ppPort = NULL; return hr; } This->nrofports++; @@ -255,7 +255,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPU dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); if (NULL == dmusic) { - *ppobj = (LPDIRECTMUSIC8) NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } dmusic->lpVtbl = &DirectMusic8_Vtbl; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 83fda74..c8cb20e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -243,8 +243,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPortImpl)); - if (NULL == obj) { - *ppobj = (LPDIRECTMUSICPORT) NULL; + if (NULL == obj) { + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicPort_Vtbl;

1 0

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

03 Nov '08

Module: wine Branch: master Commit: bfe6fe678aa39199f590ed92f9f8f9deae2ef1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe6fe678aa39199f590ed92f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:28 2008 +0100 cabinet: Do not cast NULL. --- dlls/cabinet/fdi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 35ad540..0825162 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -925,7 +925,7 @@ static void fdi_Ziphuft_free(HFDI hfdi, struct Ziphuft *t) /* Go through linked list, freeing from the allocated (t[-1]) address. */ p = t; - while (p != (struct Ziphuft *)NULL) + while (p != NULL) { q = (--p)->v.t; PFDI_FREE(hfdi, p); @@ -970,7 +970,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) } while (--i); if (ZIP(c)[0] == n) /* null input--all zero length codes */ { - *t = (struct Ziphuft *)NULL; + *t = NULL; *m = 0; return 0; } @@ -1018,8 +1018,8 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) p = ZIP(v); /* grab values in bit order */ h = -1; /* no tables yet--level -1 */ w = l[-1] = 0; /* no bits decoded yet */ - ZIP(u)[0] = (struct Ziphuft *)NULL; /* just to keep compilers happy */ - q = (struct Ziphuft *)NULL; /* ditto */ + ZIP(u)[0] = NULL; /* just to keep compilers happy */ + q = NULL; /* ditto */ z = 0; /* ditto */ /* go through the bit lengths (k already is bits in shortest code) */ @@ -1061,7 +1061,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) return 3; /* not enough memory */ } *t = q + 1; /* link to list for Ziphuft_free() */ - *(t = &(q->v.t)) = (struct Ziphuft *)NULL; + *(t = &(q->v.t)) = NULL; ZIP(u)[h] = ++q; /* table starts after link */ /* connect to last table, if there is one */

1 0

Michael Stefaniuc : winex11.drv: ImmLockIMCC() returns a void pointer; no need to cast that.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 66006129afaf30c7ca7d9f098a30128c63b6637c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66006129afaf30c7ca7d9f098… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:21:05 2008 +0100 winex11.drv: ImmLockIMCC() returns a void pointer; no need to cast that. --- dlls/winex11.drv/ime.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index b934035..e07321e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -164,7 +164,7 @@ static HIMCC ImeCreateBlankCompStr(void) HIMCC rc; LPCOMPOSITIONSTRING ptr; rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); - ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); + ptr = ImmLockIMCC(rc); memset(ptr,0,sizeof(COMPOSITIONSTRING)); ptr->dwSize = sizeof(COMPOSITIONSTRING); ImmUnlockIMCC(rc); @@ -485,7 +485,7 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, if (!lpIMC->hMsgBuf) return; - lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); if (!lpTransMsg) return; @@ -520,7 +520,7 @@ static void GenerateIMECHARMessages(HIMC hIMC, LPWSTR String, DWORD length) if (!lpIMC->hMsgBuf) return; - lpTransMsg = (LPTRANSMSG)ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); if (!lpTransMsg) return; @@ -649,7 +649,7 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) if (lpIMC != NULL) { LPIMEPRIVATE myPrivate; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; myPrivate->bInternalState = FALSE; myPrivate->textfont = NULL; @@ -707,7 +707,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) LPIMEPRIVATE myPrivate; TRACE("IMC_SETCOMPOSITIONFONT\n"); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->textfont) { DeleteObject(myPrivate->textfont); @@ -722,7 +722,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) LPIMEPRIVATE myPrivate; TRACE("IMC_SETOPENSTATUS\n"); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (lpIMC->fOpen != myPrivate->bInternalState && myPrivate->bInComposition) { @@ -793,7 +793,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); @@ -814,7 +814,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition) { GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); @@ -902,7 +902,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, if (lpIMC == NULL) return FALSE; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (dwIndex == SCS_SETSTR) { @@ -963,7 +963,7 @@ void IME_SetOpenStatus(BOOL fOpen) if (lpIMC == NULL) return; - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInternalState && fOpen == FALSE) { @@ -1013,7 +1013,7 @@ INT IME_GetCursorPos(void) lpIMC = LockRealIMC(FROM_X11); if (lpIMC) { - compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); + compstr = ImmLockIMCC(lpIMC->hCompStr); rc = compstr->dwCursorPos; ImmUnlockIMCC(lpIMC->hCompStr); } @@ -1033,7 +1033,7 @@ void IME_SetCursorPos(DWORD pos) if (!lpIMC) return; - compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); + compstr = ImmLockIMCC(lpIMC->hCompStr); if (!compstr) { UnlockRealIMC(FROM_X11); @@ -1106,7 +1106,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd) LPIMEPRIVATE myPrivate; CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->textfont) oldfont = SelectObject(hdc,myPrivate->textfont); @@ -1376,7 +1376,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, lpIMC = LockRealIMC(hIMC); if (lpIMC) { - myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->hwndDefault = hwnd; ImmUnlockIMCC(lpIMC->hPrivate); }

1 0

Michael Stefaniuc : winedump: Remove casts of void pointers to other pointer types.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 922a3360635fb3455552819d046d79118039a58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=922a3360635fb3455552819d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:20:49 2008 +0100 winedump: Remove casts of void pointers to other pointer types. --- tools/winedump/debug.c | 4 ++-- tools/winedump/emf.c | 8 ++++---- tools/winedump/minidump.c | 2 +- tools/winedump/misc.c | 6 +++--- tools/winedump/pe.c | 5 ++--- tools/winedump/search.c | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 86ffd14..0920786 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -514,7 +514,7 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) { - const IMAGE_COFF_SYMBOLS_HEADER *coff = (const IMAGE_COFF_SYMBOLS_HEADER *)PRD(coffbase, len); + const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_sym; const IMAGE_SYMBOL *coff_symbols = (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); @@ -592,7 +592,7 @@ void dump_frame_pointer_omission(unsigned long base, unsigned long len) printf("Range #loc #pmt Prlg #reg Info\n" "-----------------+----+----+----+----+------------\n"); - fpo = (const FPO_DATA*)PRD(base, len); + fpo = PRD(base, len); if (!fpo) {printf("Couldn't get FPO blob\n"); return;} last = (const FPO_DATA*)((const char*)fpo + len); diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f3b6f50..a2ea1c7 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -115,7 +115,7 @@ static int dump_emfrecord(void) case EMR_INTERSECTCLIPRECT: { - const EMRINTERSECTCLIPRECT *clip = (const EMRINTERSECTCLIPRECT *)PRD(offset, sizeof(*clip)); + const EMRINTERSECTCLIPRECT *clip = PRD(offset, sizeof(*clip)); printf("%-20s %08x\n", "EMR_INTERSECTCLIPRECT", length); printf("rect %d,%d - %d, %d\n", @@ -170,7 +170,7 @@ static int dump_emfrecord(void) case EMR_EXTSELECTCLIPRGN: { - const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)PRD(offset, sizeof(*clip)); + const EMREXTSELECTCLIPRGN *clip = PRD(offset, sizeof(*clip)); const RGNDATA *data = (RGNDATA *)clip->RgnData; DWORD i, rc_count = 0; RECT *rc; @@ -195,7 +195,7 @@ static int dump_emfrecord(void) case EMR_EXTCREATEFONTINDIRECTW: { - const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, sizeof(*pf)); + const EMREXTCREATEFONTINDIRECTW *pf = PRD(offset, sizeof(*pf)); const LOGFONTW *plf = &pf->elfw.elfLogFont; printf("%-20s %08x\n", "EMR_EXTCREATEFONTINDIRECTW", length); @@ -216,7 +216,7 @@ static int dump_emfrecord(void) case EMR_EXTTEXTOUTW: { - const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, sizeof(*etoW)); + const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index b411c36..76aaa58 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -72,7 +72,7 @@ enum FileSig get_kind_mdmp(void) void mdmp_dump(void) { - const MINIDUMP_HEADER* hdr = (const MINIDUMP_HEADER*)PRD(0, sizeof(MINIDUMP_HEADER)); + const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); ULONG idx, ndir = 0; const MINIDUMP_DIRECTORY* dir; const void* stream; diff --git a/tools/winedump/misc.c b/tools/winedump/misc.c index 82e0bd8..17c35cc 100644 --- a/tools/winedump/misc.c +++ b/tools/winedump/misc.c @@ -41,7 +41,7 @@ char *str_create(size_t num_str, ...) len += strlen (t); va_end (args); - if (!(tmp = (char *) malloc (len))) + if (!(tmp = malloc (len))) fatal ("Out of memory"); tmp[0] = '\0'; @@ -72,7 +72,7 @@ char *str_create_num(size_t num_str, int num, ...) len += strlen (t); va_end (args); - if (!(tmp = (char *) malloc (len))) + if (!(tmp = malloc (len))) fatal ("Out of memory"); tmp[0] = '\0'; @@ -98,7 +98,7 @@ char *str_substring(const char *start, const char *end) assert (start && end && end > start); - if (!(newstr = (char *) malloc (end - start + 1))) + if (!(newstr = malloc (end - start + 1))) fatal ("Out of memory"); memcpy (newstr, start, end - start); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 955d627..31a744e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -664,7 +664,7 @@ static void dump_dir_delay_imported_functions(void) printf(" Ordn Name\n"); - il = (const IMAGE_THUNK_DATA32 *)RVA(importDesc->pINT - offset, sizeof(DWORD)); + il = RVA(importDesc->pINT - offset, sizeof(DWORD)); if (!il) printf("Can't grab thunk data, going to next imported DLL\n"); @@ -1321,8 +1321,7 @@ static void do_grab_sym( void ) /* dll_close(); */ - if (!(dll_symbols = (dll_symbol *) malloc((exportDir->NumberOfFunctions + 1) * - sizeof (dll_symbol)))) + if (!(dll_symbols = malloc((exportDir->NumberOfFunctions + 1) * sizeof(dll_symbol)))) fatal ("Out of memory"); if (exportDir->AddressOfFunctions != exportDir->NumberOfNames || exportDir->Base > 1) globals.do_ordinals = 1; diff --git a/tools/winedump/search.c b/tools/winedump/search.c index aa89fc9..2893697 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -50,10 +50,10 @@ int symbol_search (parsed_symbol *sym) return - 1; if (!grep_buff) - grep_buff = (char *) malloc (MAX_RESULT_LEN); + grep_buff = malloc (MAX_RESULT_LEN); if (!fgrep_buff) - fgrep_buff = (char *) malloc (MAX_RESULT_LEN); + fgrep_buff = malloc (MAX_RESULT_LEN); if (!grep_buff || !fgrep_buff) fatal ("Out of Memory");

1 0