June 2008 - Wine-commits - list.winehq.org

Paul Vriens : urlmon/tests: Fix test on IE7.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 31678eff5057e35f4a27bc24af1b6f1c6939c666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31678eff5057e35f4a27bc24a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 6 13:47:13 2008 +0200 urlmon/tests: Fix test on IE7. --- dlls/mshtml/tests/protocol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index df3c337..9c09037 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -713,6 +713,7 @@ static void test_about_protocol(void) case QUERY_IS_CACHED_OR_MAPPED: case QUERY_IS_SECURE: case QUERY_IS_SAFE: + case QUERY_USES_HISTORYFOLDER: break; default: hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, i, 0,

1 0

Alexandre Julliard : fonts: Add a non-breaking space glyph to the Tahoma fonts.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 9e0d268d8c44dcd4d73efc52aa1811c46f3b715a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0d268d8c44dcd4d73efc52a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 6 15:26:41 2008 +0200 fonts: Add a non-breaking space glyph to the Tahoma fonts. --- fonts/tahoma.sfd | 31 ++++++++++++++++++++++++------- fonts/tahoma.ttf | Bin 85116 -> 85192 bytes fonts/tahomabd.sfd | 17 ++++++++++++++++- fonts/tahomabd.ttf | Bin 75296 -> 75364 bytes 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 27eb125..4b0c54d 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -108,7 +108,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 430 +BeginChars: 65537 431 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -9233,8 +9233,13 @@ Fore Refer: 425 806 S 1 0 0 1 -144 1 2 Refer: 85 116 N 1 0 0 1 0 0 2 EndChar +StartChar: uni00A0 +Encoding: 160 160 430 +Width: 639 +Flags: W +EndChar EndChars -BitmapFont: 9 430 7 2 1 +BitmapFont: 9 431 7 2 1 BDFChar: 0 0 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -10095,8 +10100,10 @@ BDFChar: 428 537 4 0 2 -2 4 @":Kb^]6V" BDFChar: 429 539 3 0 1 -2 5 JA?\cJ3X*b +BDFChar: 430 160 3 0 0 0 0 +z EndBitmapFont -BitmapFont: 11 430 9 2 1 FontForge +BitmapFont: 11 431 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -10992,8 +10999,10 @@ BDFChar: 428 537 5 0 3 -3 5 E.G_X&E!O25QCca BDFChar: 429 539 4 0 2 -3 7 J:QR.J:N/X!'l&7 +BDFChar: 430 160 3 0 0 0 0 +z EndBitmapFont -BitmapFont: 12 430 10 2 1 FontForge +BitmapFont: 12 431 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -11685,8 +11694,10 @@ BDFChar: 428 537 5 0 3 -3 6 E.EIH&.mb"+@#o, BDFChar: 429 539 4 0 3 -3 8 5X=g(5X7S"0E<4\ +BDFChar: 430 160 4 0 0 0 0 +z EndBitmapFont -BitmapFont: 13 430 10 3 1 FontForge +BitmapFont: 13 431 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -12378,8 +12389,10 @@ BDFChar: 428 537 6 0 4 -3 6 E/9$`#`*F"+CG0L BDFChar: 429 539 4 0 3 -3 8 5X=g(5X7S"0E<4\ +BDFChar: 430 160 4 0 0 0 0 +z EndBitmapFont -BitmapFont: 15 430 12 3 1 FontForge +BitmapFont: 15 431 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -13071,8 +13084,10 @@ BDFChar: 428 537 7 0 5 -3 7 G_CTT(^,M:!"^ga BDFChar: 429 539 5 0 4 -3 9 5X>*05X7S"5WA`T0E;(Q +BDFChar: 430 160 5 0 0 0 0 +z EndBitmapFont -BitmapFont: 16 430 13 3 1 FontForge +BitmapFont: 16 431 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -13764,5 +13779,7 @@ BDFChar: 428 537 7 0 5 -3 8 G_CTtGQ\/&GQ8:/ BDFChar: 429 539 5 0 4 -3 11 5X7U05X7S"5X7Ro!"^ga +BDFChar: 430 160 0 0 0 0 0 +z EndBitmapFont EndSplineFont diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 08ce349..2069753 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index e63e00d..0f39a66 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -107,7 +107,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 409 +BeginChars: 65537 410 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -8347,6 +8347,11 @@ HStem: 0 152<92 280 478 670> 1337 152<92 280 478 670> 1677 203<76 279 489 692> VStem: 76 203<1677 1880> 280 198<152 1337> 489 203<1677 1880> Refer: 140 207 N 1 0 0 1 0 0 2 EndChar +StartChar: uni00A0 +Encoding: 160 160 409 +Width: 600 +Flags: W +EndChar EndChars BitmapFont: 11 410 9 2 1 FontForge BDFStartProperties: 36 @@ -9202,6 +9207,8 @@ BDFChar: 407 1030 5 0 3 0 7 n6fX3?smC3 BDFChar: 408 1031 5 0 3 0 9 n,Vrc?smAM(a).4-r +BDFChar: 409 160 3 0 0 0 0 +z EndBitmapFont BitmapFont: 12 410 10 2 1 FontForge BDFStartProperties: 36 @@ -9855,6 +9862,8 @@ BDFChar: 407 1030 5 0 3 0 8 n6fX3?smAMn,NFg BDFChar: 408 1031 5 0 4 0 10 fDtDK?smAM?srI( +BDFChar: 409 160 4 0 0 0 0 +z EndBitmapFont BitmapFont: 13 410 10 3 1 FontForge BDFStartProperties: 36 @@ -10504,6 +10513,8 @@ BDFChar: 407 1030 4 0 2 0 8 i'9Om5X7S"huE`W BDFChar: 408 1031 4 0 2 0 10 TE*n85X7S"5X=6- +BDFChar: 409 160 4 0 0 0 0 +z EndBitmapFont BitmapFont: 15 410 12 3 1 FontForge BDFStartProperties: 36 @@ -11153,6 +11164,8 @@ BDFChar: 407 1030 6 1 3 0 10 i'9Om5X7S"5X=6- BDFChar: 408 1031 6 1 3 0 12 TE*n85X7S"5X7S"huE`W +BDFChar: 409 160 4 0 0 0 0 +z EndBitmapFont BitmapFont: 16 410 13 3 1 FontForge BDFStartProperties: 36 @@ -11802,5 +11815,7 @@ BDFChar: 407 1030 6 1 3 0 11 i'9Om5X7S"5X7Tm BDFChar: 408 1031 6 0 4 0 14 Lkl%M+<VdL+<VdL+<YV' +BDFChar: 409 160 5 0 0 0 0 +z EndBitmapFont EndSplineFont diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index ddd6d8f..6651ea0 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Marcus Meissner : include: Add winelib names for some dsound A/W function / types.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 375f8ba23761d75230805e86bc057ef7755cb57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=375f8ba23761d75230805e86b… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 6 11:54:33 2008 +0200 include: Add winelib names for some dsound A/W function / types. --- include/dsound.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index fc1eeff..b14229e 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -396,14 +396,16 @@ typedef const GUID *LPCGUID; typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID); typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID); +DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK); extern HRESULT WINAPI DirectSoundCreate(LPCGUID lpGUID,LPDIRECTSOUND *ppDS,LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA, LPVOID); extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW, LPVOID); - +#define DirectSoundEnumerate WINELIB_NAME_AW(DirectSoundEnumerate) extern HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE *ppDSC, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA, LPVOID); extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW, LPVOID); +#define DirectSoundCaptureEnumerate WINELIB_NAME_AW(DirectSoundCaptureEnumerate) extern HRESULT WINAPI DirectSoundCreate8(LPCGUID lpGUID,LPDIRECTSOUND8 *ppDS8,LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter);

1 0

Paul Vriens : shlwapi/tests: Don't create testfile at a fixed location.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 6689994362e841b0a9c15f245d7d5deb3558a947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6689994362e841b0a9c15f245… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 6 13:20:26 2008 +0200 shlwapi/tests: Don't create testfile at a fixed location. --- dlls/shlwapi/tests/istream.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index ef7191c..d8aced5 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -197,10 +197,15 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) IStream * stream; HRESULT ret; ULONG refcount; - static const char * test_file = "c:\\test.txt"; + char test_file[MAX_PATH]; + static const CHAR testA_txt[] = "\\testA.txt"; trace("SHCreateStreamOnFileA: testing mode %d, STGM flags %08x\n", mode, stgm); + /* Don't used a fixed path for the testA.txt file */ + GetTempPathA(MAX_PATH, test_file); + lstrcatA(test_file, testA_txt); + /* invalid arguments */ stream = NULL; @@ -284,10 +289,15 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) IStream * stream; HRESULT ret; ULONG refcount; - static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't', '\0' }; + WCHAR test_file[MAX_PATH]; + static const WCHAR testW_txt[] = { '\\', 't', 'e', 's', 't', 'W', '.', 't', 'x', 't', '\0' }; trace("SHCreateStreamOnFileW: testing mode %d, STGM flags %08x\n", mode, stgm); + /* Don't used a fixed path for the testW.txt file */ + GetTempPathW(MAX_PATH, test_file); + lstrcatW(test_file, testW_txt); + /* invalid arguments */ stream = NULL;

1 0

Alexandre Julliard : ChangeLog: Moved to documentation/ChangeLog.BETA.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 935974e0030ae9b4336bf15d6f63352d17660598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935974e0030ae9b4336bf15d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 6 13:26:44 2008 +0200 ChangeLog: Moved to documentation/ChangeLog.BETA. --- ChangeLog => documentation/ChangeLog.BETA | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/documentation/ChangeLog.BETA similarity index 100% rename from ChangeLog rename to documentation/ChangeLog.BETA

1 0

Dmitry Timoshkov : d3d9: Avoid a not needed address-of operator.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 1c8994247e1b58fad176c4ce67dfd95394211b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8994247e1b58fad176c4ce6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 4 12:04:20 2008 +0900 d3d9: Avoid a not needed address-of operator. --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/d3d9/tests/shader.c | 2 +- dlls/d3d9/tests/stateblock.c | 2 +- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/texture.c | 2 +- dlls/d3d9/tests/vertexdeclaration.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/d3d9/tests/volume.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b364d33..6df4c45 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -34,7 +34,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; HWND ret; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 0465cee..07318e3 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -25,7 +25,7 @@ static HMODULE d3d9_handle = 0; static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 7efeb0c..ee5061f 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -28,7 +28,7 @@ static DWORD texture_stages; static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index d4c9c18..df328be 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -23,7 +23,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 72a0561..056d80f 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -22,7 +22,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index df8f162..292087f 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -30,7 +30,7 @@ static HMODULE d3d9_handle = 0; static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cc85eab..a328123 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -39,7 +39,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; HWND ret; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 3f31084..31066a6 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -22,7 +22,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d9_test_wc"; RegisterClass(&wc);

1 0

Dmitry Timoshkov : d3d8: Avoid a not needed address-of operator.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 92dfc02b01d1b127aa90d280aaa08eb2c896f679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dfc02b01d1b127aa90d280a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 4 12:04:00 2008 +0900 d3d8: Avoid a not needed address-of operator. --- dlls/d3d8/tests/surface.c | 2 +- dlls/d3d8/tests/texture.c | 2 +- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d8/tests/volume.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index da1f4d7..6e0d48c 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -22,7 +22,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d8_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index 5c92271..a002763 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -22,7 +22,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d8_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c0e00cf..4654842 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -30,7 +30,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; HWND ret; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d8_test_wc"; RegisterClass(&wc); diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index 66f5a3c..aee0c3a 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -22,7 +22,7 @@ static HWND create_window(void) { WNDCLASS wc = {0}; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d8_test_wc"; RegisterClass(&wc);

1 0

Dmitry Timoshkov : ddraw: Avoid a not needed address-of operator.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 2cf47c00f2902967ce7c7554bac94a00c0cf3990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf47c00f2902967ce7c7554b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 4 12:03:39 2008 +0900 ddraw: Avoid a not needed address-of operator. --- dlls/ddraw/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 5b67d45..ede24eb 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -55,7 +55,7 @@ static BOOL createObjects(void) ok(hr==DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", hr); if(!DirectDraw) goto err; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "d3d7_test_wc"; RegisterClass(&wc); window = CreateWindow("d3d7_test_wc", "d3d7_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); @@ -824,7 +824,7 @@ static BOOL D3D1_createObjects(void) return FALSE; } - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "texturemapblend_test_wc"; RegisterClass(&wc); window = CreateWindow("texturemapblend_test_wc", "texturemapblend_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); @@ -1910,7 +1910,7 @@ static void D3D3_ViewportClearTest(void) WORD Indices[] = {0, 1, 2, 2, 3, 0}; DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "D3D3_ViewportClearTest_wc"; RegisterClass(&wc); window = CreateWindow("D3D3_ViewportClearTest_wc", "D3D3_ViewportClearTest", @@ -2176,7 +2176,7 @@ static void p8_primary_test() goto out; } - wc.lpfnWndProc = &DefWindowProc; + wc.lpfnWndProc = DefWindowProc; wc.lpszClassName = "p8_primary_test_wc"; RegisterClass(&wc); window = CreateWindow("p8_primary_test_wc", "p8_primary_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0);

1 0

Dan Kegel : msxml/tests: Use VariantInit, not VariantClear, to initialize new variants.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: d38dc0233a60d516f90a0626c3fd7b3a68281a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38dc0233a60d516f90a0626c… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jun 5 17:07:40 2008 -0700 msxml/tests: Use VariantInit, not VariantClear, to initialize new variants. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cd50215..820a37a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1934,7 +1934,7 @@ static void test_XPath(void) ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); - VariantClear(&var); + VariantInit(&var); todo_wine ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); todo_wine expect_eq(V_VT(&var), VT_BSTR, int, "%x"); if (V_VT(&var) == VT_BSTR)

1 0

Dan Kegel : oleaut32/tests: VariantInit() isn't enough, you have to give a value, too.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 3fa578220e848a930bfa4aa2124fa3ad08c80bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa578220e848a930bfa4aa21… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jun 5 17:30:32 2008 -0700 oleaut32/tests: VariantInit() isn't enough, you have to give a value, too. --- dlls/oleaut32/tests/vartest.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c21e28a..f2640cc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5318,18 +5318,27 @@ static void test_VarCat(void) V_VT(&left) = leftvt; V_VT(&right) = rightvt; - if (leftvt == VT_BSTR) - V_BSTR(&left) = SysAllocString(sz_empty); - if (rightvt == VT_BSTR) - V_BSTR(&right) = SysAllocString(sz_empty); - if (leftvt == VT_DATE) - V_DATE(&left) = 0.0; - if (rightvt == VT_DATE) - V_DATE(&right) = 0.0; - if (leftvt == VT_DECIMAL) - VarDecFromR8(0.0, &V_DECIMAL(&left)); - if (rightvt == VT_DECIMAL) - VarDecFromR8(0.0, &V_DECIMAL(&right)); + switch (leftvt) { + case VT_BSTR: + V_BSTR(&left) = SysAllocString(sz_empty); break; + case VT_DATE: + V_DATE(&left) = 0.0; break; + case VT_DECIMAL: + VarDecFromR8(0.0, &V_DECIMAL(&left)); break; + default: + V_I8(&left) = 0; + } + + switch (rightvt) { + case VT_BSTR: + V_BSTR(&right) = SysAllocString(sz_empty); break; + case VT_DATE: + V_DATE(&right) = 0.0; break; + case VT_DECIMAL: + VarDecFromR8(0.0, &V_DECIMAL(&right)); break; + default: + V_I8(&right) = 0; + } hres = VarCat(&left, &right, &result);

1 0