January 2009 - Wine-Commits

Michael Stefaniuc : dmcompos: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: fd0546bb0a15a1139d4eed6fe49b975ca18dc503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0546bb0a15a1139d4eed6fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:38:54 2009 +0100 dmcompos: Remove superfluous casts. --- dlls/dmcompos/chordmap.c | 8 ++++---- dlls/dmcompos/chordmaptrack.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 10 +++++----- dlls/dmcompos/signposttrack.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index fae1771..7529df6 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -36,19 +36,19 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IUnknown_QueryInterface (LPUNKNOW TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicChordMap)) { - *ppobj = (LPVOID)&This->ChordMapVtbl; + *ppobj = &This->ChordMapVtbl; IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef ((LPDIRECTMUSICCHORDMAP)&This->ChordMapVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicChordMapImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicChordMapImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 5fa462d..c7d2307 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNO TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicChordMapTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNO IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicChordMapTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index dec8a81..74b1ab4 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -318,23 +318,23 @@ HRESULT WINAPI DllCanUnloadNow(void) { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMap) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ChordMap_CF; + *ppv = &ChordMap_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicComposer) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Composer_CF; + *ppv = &Composer_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMapTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ChordMapTrack_CF; + *ppv = &ChordMapTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicTemplate) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Template_CF; + *ppv = &Template_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSignPostTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SignPostTrack_CF; + *ppv = &SignPostTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index bcea894..a913d6f 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNO TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNO IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicSignPostTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Michael Stefaniuc : dmband: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: b91f72ec9b4db154fca221cc343bc8d3e79b7508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91f72ec9b4db154fca221cc3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:38:34 2009 +0100 dmband: Remove superfluous casts. --- dlls/dmband/band.c | 8 ++++---- dlls/dmband/bandtrack.c | 4 ++-- dlls/dmband/dmband_main.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 891fb5a..c2e56f6 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -32,19 +32,19 @@ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN if TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicBand)) { - *ppobj = (LPVOID)&This->BandVtbl; + *ppobj = &This->BandVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index b328b1d..54496e1 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -31,7 +31,7 @@ static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN i TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -40,7 +40,7 @@ static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN i IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IUnknown_AddRef (iface); return S_OK; } diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 6a49f70..b99f64d 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -168,11 +168,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Band_CF; + *ppv = &Band_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &BandTrack_CF; + *ppv = &BandTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; }

1 0

Michael Stefaniuc : amstream: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: e0851fc1fafafb1a4deeb87deca3c6400f88e1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0851fc1fafafb1a4deeb87de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:38:16 2009 +0100 amstream: Remove superfluous casts. --- dlls/amstream/mediastreamfilter.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 7f57e60..73dcc3d 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -82,15 +82,15 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter * *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IMediaStreamFilter)) - *ppv = (LPVOID)This; + *ppv = This; if (*ppv) {

1 0

Michael Stefaniuc : cmdlgtst: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 568a8b845aacd0a8a24917ed0a715981cbf8c82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=568a8b845aacd0a8a24917ed0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:37:23 2009 +0100 cmdlgtst: Remove superfluous casts. --- programs/cmdlgtst/cmdlgtst.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index 0c8b2b1..a4d3204 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -288,7 +288,7 @@ static void paintMainWindow(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPar /* Commence painting! */ BeginPaint(hWnd, &ps); - GetClientRect(hWnd, (LPRECT) &rect); + GetClientRect(hWnd, &rect); pen = SelectObject(ps.hdc, CreatePen(0, 0, fgColor)); brush = SelectObject(ps.hdc, CreateSolidBrush(bgColor)); @@ -367,8 +367,8 @@ static void mw_ColorSetup(HWND hWnd) if(ChooseColor(&cc)) { RECT rect; - GetClientRect(hWnd, (LPRECT) &rect); - InvalidateRect(hWnd, (LPRECT) &rect, FALSE); + GetClientRect(hWnd, &rect); + InvalidateRect(hWnd, &rect, FALSE); bgColor = cc.rgbResult; } else mw_checkError(hWnd, FALSE); @@ -378,8 +378,8 @@ static void mw_FontSetup(HWND hWnd) { if(ChooseFont(&cf)) { RECT rect; - GetClientRect(hWnd, (LPRECT) &rect); - InvalidateRect(hWnd, (LPRECT) &rect, FALSE); + GetClientRect(hWnd, &rect); + InvalidateRect(hWnd, &rect, FALSE); txtColor = cf.rgbColors; } else mw_checkError(hWnd, FALSE); @@ -405,8 +405,8 @@ static void mw_OpenSetup(HWND hWnd) { if(GetOpenFileName(&ofn)) { RECT rect; - GetClientRect(hWnd, (LPRECT) &rect); - InvalidateRect(hWnd, (LPRECT) &rect, FALSE); + GetClientRect(hWnd, &rect); + InvalidateRect(hWnd, &rect, FALSE); } else mw_checkError(hWnd,FALSE); } @@ -415,8 +415,8 @@ static void mw_SaveSetup(HWND hWnd) { if(GetSaveFileName(&ofn)) { RECT rect; - GetClientRect(hWnd, (LPRECT) &rect); - InvalidateRect(hWnd, (LPRECT) &rect, FALSE); + GetClientRect(hWnd, &rect); + InvalidateRect(hWnd, &rect, FALSE); } else mw_checkError(hWnd,FALSE); }

1 0

Francois Gouget : winapi_test: The tests don' t support WIN64 yet so disable them there.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 581e390115e1706f938e64050cfbedd06dbad133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581e390115e1706f938e64050… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:24:16 2009 +0100 winapi_test: The tests don't support WIN64 yet so disable them there. --- dlls/gdi32/tests/generated.c | 4 ++++ dlls/kernel32/tests/generated.c | 4 ++++ dlls/ntdll/tests/generated.c | 4 ++++ dlls/rpcrt4/tests/generated.c | 4 ++++ dlls/shell32/tests/generated.c | 4 ++++ dlls/shlwapi/tests/generated.c | 4 ++++ dlls/urlmon/tests/generated.c | 4 ++++ dlls/user32/tests/generated.c | 4 ++++ dlls/wininet/tests/generated.c | 4 ++++ tools/winapi/winapi_test | 4 ++++ 10 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index d0f8d3d..2bd6376 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -7049,5 +7049,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 847a2cd..be68a08 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -2072,5 +2072,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index 479db65..89b2e05 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -3436,5 +3436,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index a97f032..77ddd85 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -1020,5 +1020,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 873a75e..76eec39 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -2013,5 +2013,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index 1ebf96d..db44d27 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -173,5 +173,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 293081c..8a2f353 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -379,5 +379,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 282e84d..d25de8f 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -3835,5 +3835,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 656b18b..ceb21de 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -1434,5 +1434,9 @@ static void test_pack(void) START_TEST(generated) { +#ifdef _WIN64 + ok(0, "The type size / alignment tests don't support Win64 yet\n"); +#else test_pack(); +#endif } diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index c1c742c..58333dc 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -586,7 +586,11 @@ sub output_footer($$$) { print OUT "START_TEST(generated)\n"; print OUT "{\n"; foreach my $test (@tests) { + print OUT "#ifdef _WIN64\n"; + print OUT " ok(0, \"The type size / alignment tests don't support Win64 yet\\n\");\n"; + print OUT "#else\n"; print OUT " test_$test();\n"; + print OUT "#endif\n"; } print OUT "}\n"; }

1 0

Francois Gouget : winapi_test: The real tests are done at compile time so use C_ASSERT() instead of ok(). Do only one test per line so one can know exactly what went wrong.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 411f5d22c0fe8a90b3150511c77a13c419639e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=411f5d22c0fe8a90b3150511c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:26:10 2009 +0100 winapi_test: The real tests are done at compile time so use C_ASSERT() instead of ok(). Do only one test per line so one can know exactly what went wrong. --- dlls/gdi32/tests/generated.c | 6135 ++++++++++++++++++++++++++++----------- dlls/kernel32/tests/generated.c | 1771 ++++++++---- dlls/ntdll/tests/generated.c | 2631 ++++++++++++----- dlls/rpcrt4/tests/generated.c | 718 ++++-- dlls/shell32/tests/generated.c | 1594 +++++++--- dlls/shlwapi/tests/generated.c | 123 +- dlls/urlmon/tests/generated.c | 202 +- dlls/user32/tests/generated.c | 3216 +++++++++++++++------ dlls/wininet/tests/generated.c | 1082 +++++--- tools/winapi/winapi_test | 88 +- 10 files changed, 12406 insertions(+), 5154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=411f5d22c0fe8a90b3150…

1 0

Michael Stefaniuc : qcap: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 6f49003106babfbc85063500f390bee61a0927e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f49003106babfbc85063500f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:37:09 2009 +0100 qcap: Remove superfluous casts. --- dlls/qcap/enummedia.c | 4 ++-- dlls/qcap/enumpins.c | 4 ++-- dlls/qcap/v4l.c | 2 +- dlls/qcap/vfwcapture.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index a4df6b3..cff4b9f 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -133,9 +133,9 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { diff --git a/dlls/qcap/enumpins.c b/dlls/qcap/enumpins.c index c57c043..a4b1a9f 100644 --- a/dlls/qcap/enumpins.c +++ b/dlls/qcap/enumpins.c @@ -69,9 +69,9 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumPins)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index d4f9417..7a131cd 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -568,7 +568,7 @@ static void V4l_FreeFrame(Capture * capBox) static DWORD WINAPI ReadThread(LPVOID lParam) { - Capture * capBox = (Capture *)lParam; + Capture * capBox = lParam; HRESULT hr; IMediaSample *pSample = NULL; unsigned long framecount = 0; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index cfb9487..07fba25 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -612,7 +612,7 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, TRACE("%p/%p-> (%p, %p)\n", iface, This, pPropBag, pErrorLog); V_VT(&var) = VT_I4; - hr = IPropertyBag_Read(pPropBag, (LPCOLESTR)VFWIndex, &var, pErrorLog); + hr = IPropertyBag_Read(pPropBag, VFWIndex, &var, pErrorLog); if (SUCCEEDED(hr)) { @@ -662,7 +662,7 @@ KSP_QueryInterface( IKsPropertySet * iface, REFIID riid, LPVOID * ppv ) if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IKsPropertySet)) { - *ppv = (LPVOID)iface; + *ppv = iface; IKsPropertySet_AddRef( iface ); return S_OK; } @@ -788,9 +788,9 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IKsPropertySet)) - *ppv = (LPVOID)&(This->KSP_VT); + *ppv = &(This->KSP_VT); else if (IsEqualIID(riid, &IID_IAMStreamConfig)) return IUnknown_QueryInterface((IUnknown *)This->parent, riid, ppv);

1 0

Michael Stefaniuc : fusion: Remove superfluous casts.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 1b092d7013a208fe46007db2e09a51e465d2f013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b092d7013a208fe46007db2e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 00:36:35 2009 +0100 fusion: Remove superfluous casts. --- dlls/fusion/asmname.c | 4 ++-- dlls/fusion/assembly.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 81a5b82..50ae05e 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -150,7 +150,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->name) { - lstrcpyW((LPWSTR)pvProperty, name->name); + lstrcpyW(pvProperty, name->name); *pcbProperty = (lstrlenW(name->name) + 1) * 2; } break; @@ -187,7 +187,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->culture) { - lstrcpyW((LPWSTR)pvProperty, name->culture); + lstrcpyW(pvProperty, name->culture); *pcbProperty = (lstrlenW(name->culture) + 1) * 2; } break; diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index dfa4492..7be541c 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -153,7 +153,7 @@ static BYTE *GetData(BYTE *pData, ULONG *pLength) static VOID *assembly_data_offset(ASSEMBLY *assembly, ULONG offset) { - return (VOID *)&assembly->data[offset]; + return &assembly->data[offset]; } #define MAX_TABLES_WORD 0xFFFF

1 0

Francois Gouget : winapi_test: FIELD_ALIGNMENT() is redundant so remove it.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 43c18c132183a55dcf0454ffd3600f76e94b5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c18c132183a55dcf0454ffd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:18:48 2009 +0100 winapi_test: FIELD_ALIGNMENT() is redundant so remove it. --- dlls/gdi32/tests/generated.c | 16 ++++------------ dlls/kernel32/tests/generated.c | 16 ++++------------ dlls/ntdll/tests/generated.c | 16 ++++------------ dlls/rpcrt4/tests/generated.c | 16 ++++------------ dlls/shell32/tests/generated.c | 16 ++++------------ dlls/shlwapi/tests/generated.c | 16 ++++------------ dlls/urlmon/tests/generated.c | 16 ++++------------ dlls/user32/tests/generated.c | 16 ++++------------ dlls/wininet/tests/generated.c | 16 ++++------------ tools/winapi/winapi_test | 16 ++++------------ 10 files changed, 40 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43c18c132183a55dcf045…

1 0

Francois Gouget : winapi_test: Fix TEST_FIELD() so it correctly tests the field size.
by Alexandre Julliard Jan. 8, 2009

Jan. 8, 2009

Module: wine Branch: master Commit: 9f62c9b7a878b4a0017843e5d23c3a31165e3b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f62c9b7a878b4a0017843e5d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:23:22 2009 +0100 winapi_test: Fix TEST_FIELD() so it correctly tests the field size. --- dlls/gdi32/tests/generated.c | 2068 +++++++++++++++++++------------------- dlls/kernel32/tests/generated.c | 606 ++++++------ dlls/ntdll/tests/generated.c | 768 ++++++++-------- dlls/rpcrt4/tests/generated.c | 240 +++--- dlls/shell32/tests/generated.c | 532 +++++----- dlls/shlwapi/tests/generated.c | 24 +- dlls/urlmon/tests/generated.c | 54 +- dlls/user32/tests/generated.c | 1012 ++++++++++---------- dlls/wininet/tests/generated.c | 306 +++--- tools/winapi/winapi_test | 12 +- 10 files changed, 2811 insertions(+), 2811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f62c9b7a878b4a001784…

1 0