April 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : x11drv: Update French keyboard layout to better match the X11 one.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 3afe42083355efb2390d35073427760676fc067a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3afe42083355efb2390d350… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 10 15:30:34 2006 +0900 x11drv: Update French keyboard layout to better match the X11 one. --- dlls/x11drv/keyboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index d9d843a..b500b26 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -292,12 +292,12 @@ static const char main_key_UK[MAIN_LEN][ "\\|" }; -/*** French keyboard layout (contributed by Eric Pouech) */ +/*** French keyboard layout (setxkbmap fr) */ static const char main_key_FR[MAIN_LEN][4] = { - "�","&1","�2~","\"3#","'4{","(5[","-6|","�7`","_8\\","�9^�","�0@",")�]","=+}", - "aA","zZ","eE�","rR","tT","yY","uU","iI","oO","pP","^�","$��", - "qQ","sS�","dD","fF","gG","hH","jJ","kK","lL","mM","�%","*�", + "�","&1","�2","\"3","'4","(5","-6","�7","_8","�9","�0",")�","=+", + "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^�","$�", + "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","�%","*�", "wW","xX","cC","vV","bB","nN",",?",";.",":/","!�", "<>" };

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian resources.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 6fdff26ca52934a7ff05b30c9af3d2751406dd9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fdff26ca52934a7ff05b30… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 9 23:56:50 2006 +0200 winecfg: Updated Norwegian resources. --- programs/winecfg/No.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 82354c3..a30f830 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -165,7 +165,11 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + LTEXT "Standard samplingsrate:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Standard biter per pr�ve:",IDC_STATIC,137,232,80,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Huw Davies : fonts: Add accented greek glyphs to System.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 90e04f94436b4373ea44df2dc2fd34bb625106fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90e04f94436b4373ea44df2… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Apr 9 20:15:51 2006 +0100 fonts: Add accented greek glyphs to System. --- fonts/system.sfd | 223 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 189 insertions(+), 34 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 474de5c..fa29b75 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -44,7 +44,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 0 20 18 OnlyBitmaps: 1 -BeginChars: 65536 414 +BeginChars: 65536 433 StartChar: space Encoding: 32 32 0 Width: 4 @@ -2060,37 +2060,44 @@ TeX: 117 0 0 0 EndChar StartChar: Iotadieresis Encoding: 938 938 381 -Width: 16 +Width: 7 +Flags: W TeX: 73 0 0 0 EndChar StartChar: Upsilondieresis Encoding: 939 939 382 -Width: 16 +Width: 9 +Flags: W TeX: 85 0 0 0 EndChar StartChar: alphatonos Encoding: 940 940 383 -Width: 16 +Width: 8 +Flags: W TeX: 97 0 0 0 EndChar StartChar: epsilontonos Encoding: 941 941 384 -Width: 16 +Width: 7 +Flags: W TeX: 101 0 0 0 EndChar StartChar: etatonos Encoding: 942 942 385 -Width: 16 +Width: 7 +Flags: W TeX: 101 0 0 0 EndChar StartChar: iotatonos Encoding: 943 943 386 -Width: 16 +Width: 4 +Flags: W TeX: 105 0 0 0 EndChar StartChar: upsilondieresistonos Encoding: 944 944 387 -Width: 16 +Width: 9 +Flags: W TeX: 117 0 0 0 EndChar StartChar: alpha @@ -2245,11 +2252,121 @@ TeX: 111 0 0 0 EndChar StartChar: iotadieresis Encoding: 970 970 413 +Width: 6 +Flags: W +TeX: 105 0 0 0 +EndChar +StartChar: Alphatonos +Encoding: 902 902 414 +Width: 10 +Flags: W +TeX: 65 0 0 0 +EndChar +StartChar: dieresistonos +Encoding: 901 901 415 +Width: 8 +Flags: W +TeX: 100 0 0 0 +EndChar +StartChar: tonos +Encoding: 900 900 416 +Width: 5 +Flags: W +TeX: 116 0 0 0 +EndChar +StartChar: anoteleia +Encoding: 903 903 417 +Width: 16 +TeX: 97 0 0 0 +EndChar +StartChar: Epsilontonos +Encoding: 904 904 418 +Width: 9 +Flags: W +TeX: 69 0 0 0 +EndChar +StartChar: Etatonos +Encoding: 905 905 419 +Width: 10 +Flags: W +TeX: 69 0 0 0 +EndChar +StartChar: Iotatonos +Encoding: 906 906 420 +Width: 5 +Flags: W +TeX: 73 0 0 0 +EndChar +StartChar: uni038B +Encoding: 907 907 421 +Width: 16 +TeX: 117 0 0 0 +EndChar +StartChar: Omicrontonos +Encoding: 908 908 422 +Width: 10 +Flags: W +TeX: 79 0 0 0 +EndChar +StartChar: uni038D +Encoding: 909 909 423 Width: 16 +TeX: 117 0 0 0 +EndChar +StartChar: Upsilontonos +Encoding: 910 910 424 +Width: 10 +Flags: W +TeX: 85 0 0 0 +EndChar +StartChar: Omegatonos +Encoding: 911 911 425 +Width: 11 +Flags: W +TeX: 79 0 0 0 +EndChar +StartChar: iotadieresistonos +Encoding: 912 912 426 +Width: 8 +Flags: W TeX: 105 0 0 0 EndChar +StartChar: upsilondieresis +Encoding: 971 971 427 +Width: 7 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: omicrontonos +Encoding: 972 972 428 +Width: 7 +Flags: W +TeX: 111 0 0 0 +EndChar +StartChar: upsilontonos +Encoding: 973 973 429 +Width: 7 +Flags: W +TeX: 117 0 0 0 +EndChar +StartChar: omegatonos +Encoding: 974 974 430 +Width: 9 +Flags: W +TeX: 111 0 0 0 +EndChar +StartChar: uni03CF +Encoding: 975 975 431 +Width: 16 +TeX: 117 0 0 0 +EndChar +StartChar: uni03D0 +Encoding: 976 976 432 +Width: 16 +TeX: 117 0 0 0 +EndChar EndChars -BitmapFont: 16 414 13 3 1 +BitmapFont: 16 433 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -2964,8 +3081,8 @@ BDFChar: 355 8213 8 0 7 11 11 rr<$! BDFChar: 356 913 9 1 8 0 9 (`5(a)tAnGY(_nuHS -BDFChar: 357 914 9 0 8 0 9 -IfNo-@=Vd:IfNo-@=Vd:@=Wh- +BDFChar: 357 914 9 1 8 0 9 +rklXkrklXk_u9W9 BDFChar: 358 915 8 1 7 0 9 rkQ=b^qdb$^q]pM BDFChar: 359 916 9 1 8 0 9 @@ -2986,16 +3103,16 @@ BDFChar: 366 923 9 1 8 0 9 (`5(a)tAnGYm_nuHS BDFChar: 367 924 10 1 9 0 9 _19(a)Pj+-0?pON!gh14=3aahK` -BDFChar: 368 925 9 0 8 0 9 -@=W?JEI`=bD1HJRB7OKB(a)t8!< +BDFChar: 368 925 9 1 8 0 9 +_rKeKgY:&pa27lW BDFChar: 369 926 8 1 7 0 9 rr)ltI!bnorr)lt -BDFChar: 370 927 9 0 8 0 9 -*WRtr@=Vd:@=Vd:@=Vd:1B8Hr +BDFChar: 370 927 9 1 8 0 9 +4D)LK_o'C0Aip%n BDFChar: 371 928 9 1 8 0 9 s22al_o'C0_nuHS -BDFChar: 372 929 9 0 8 0 9 -IfNo-@=Vd:@=Wh-?iXR7?iXR7 +BDFChar: 372 929 9 1 8 0 9 +rklXk_u(a)He^q]pM BDFChar: 373 930 16 0 0 0 0 z BDFChar: 374 931 8 1 7 0 9 @@ -3012,20 +3129,20 @@ BDFChar: 379 936 9 1 8 0 9 gY:K;gO9tV(`35Q BDFChar: 380 937 10 1 9 0 9 4of'm_19(a)P_19@P(a)fSCe2?<K% -BDFChar: 381 938 16 0 0 0 0 -z -BDFChar: 382 939 16 0 0 0 0 -z -BDFChar: 383 940 16 0 0 0 0 -z -BDFChar: 384 941 16 0 0 0 0 -z -BDFChar: 385 942 16 0 0 0 0 -z -BDFChar: 386 943 16 0 0 0 0 -z -BDFChar: 387 944 16 0 0 0 0 -z +BDFChar: 381 938 7 1 6 0 11 +bfhap0JG170JG17 +BDFChar: 382 939 9 1 8 0 11 +AnD%\_e)"J(`4), +BDFChar: 383 940 8 1 7 0 9 +$lAtjbfn;Tb^'6h +BDFChar: 384 941 7 1 6 0 9 +(bbr7beS25b]j*f +BDFChar: 385 942 7 1 6 -3 9 +(bbsbbfn;TbfgJ($ig8- +BDFChar: 386 943 4 1 3 0 9 +@))cX^qdb$^q]pM +BDFChar: 387 944 9 1 8 0 9 +gX?.7AnGXeAip%n BDFChar: 388 945 8 1 7 0 6 HHaUWbfkA5 BDFChar: 389 946 7 1 6 -3 9 @@ -3054,8 +3171,8 @@ BDFChar: 400 957 7 1 6 0 6 bfn;Tb]kfA BDFChar: 401 958 7 1 6 -3 9 r%MNo^i7*)^j$7rGQ7^D -BDFChar: 402 959 7 0 6 0 6 -4D&2;AnF.* +BDFChar: 402 959 7 1 6 0 6 +Gg+CUbfk;3 BDFChar: 403 960 7 1 6 0 6 r63C/bfn92 BDFChar: 404 961 7 1 6 -3 6 @@ -3076,7 +3193,45 @@ BDFChar: 411 968 9 1 8 -3 6 gY:K;gY7/o(`35Q BDFChar: 412 969 9 1 8 0 6 B#EBXgY6<? -BDFChar: 413 970 16 0 0 0 0 +BDFChar: 413 970 6 0 5 0 9 +bfg&@0JG170JEJ, +BDFChar: 414 902 10 0 8 0 9 +Mu\e:ScG>^1B9321B9W>@=Vd: +BDFChar: 415 901 8 0 7 8 9 +gX?-& +BDFChar: 416 900 5 1 4 8 10 +E+$H] +BDFChar: 417 903 16 0 0 0 0 +z +BDFChar: 418 904 9 0 8 0 9 +^OWNgYQ1m-56*A;0E<d,0E==f +BDFChar: 419 905 10 0 9 0 9 +Ye[KYYe[KY5JStg0YfBX0YfBX +BDFChar: 420 906 5 1 4 0 9 +Yct(a)90JG170JEJ, +BDFChar: 421 907 16 0 0 0 0 +z +BDFChar: 422 908 10 0 8 0 9 +ScH(siIKm;@=Vd:@=Vd:1B8Hr +BDFChar: 423 909 16 0 0 0 0 +z +BDFChar: 424 910 10 0 9 0 9 +Ye[KYYeZZW%fce6"oni-"oni- +BDFChar: 425 911 11 0 9 0 9 +T)c-Hi5"9d@)-0c0n:2C)ZY6# +BDFChar: 426 912 8 0 7 0 9 +gX?->(`4),(`35Q +BDFChar: 427 971 7 1 6 0 9 +bfg(2bfn;Tb]j*f +BDFChar: 428 972 7 1 6 0 9 +(bbr7bfn;Tb]j*f +BDFChar: 429 973 7 1 6 0 9 +(bbs6bfn;Tb]j*f +BDFChar: 430 974 9 1 8 0 9 +$lAtV_qWr#gL^Ec +BDFChar: 431 975 16 0 0 0 0 +z +BDFChar: 432 976 16 0 0 0 0 z EndBitmapFont EndSplineFont

1 0

Robert Reif : dsound: Fix 2 bugs in ds3d tests.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 1f882cd68db5827fd6677bcd5cd66923680ac6a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f882cd68db5827fd6677bc… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Apr 8 23:48:05 2006 -0400 dsound: Fix 2 bugs in ds3d tests. Fix 2 bugs in the error paths of the ds3d.c test (coverity). --- dlls/dsound/tests/ds3d.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 3d0c434..0825d68 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -739,9 +739,18 @@ static HRESULT test_secondary(LPGUID lpG &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " "failed: %s\n",DXGetErrorString8(rc)); + } else { + ok(listener==NULL, "IDirectSoundBuffer_QueryInterface() " + "failed but returned a listener anyway\n"); + ok(rc!=DS_OK, "IDirectSoundBuffer_QueryInterface() succeeded " + "but returned a NULL listener\n"); + if (listener) { + ref=IDirectSound3DListener_Release(listener); + ok(ref==0,"IDirectSound3dListener_Release() listener has " + "%d references, should have 0\n",ref); + } + goto EXIT2; } - else - goto EXIT; } init_format(&wfx,WAVE_FORMAT_PCM,22050,16,2); @@ -887,18 +896,28 @@ static HRESULT test_secondary(LPGUID lpG ref); } } - } EXIT1: - if (has_listener) { - ref=IDirectSound3DListener_Release(listener); - ok(ref==0,"IDirectSound3dListener_Release() listener has %d " - "references, should have 0\n",ref); + if (has_listener) { + ref=IDirectSound3DListener_Release(listener); + ok(ref==0,"IDirectSound3dListener_Release() listener has %d " + "references, should have 0\n",ref); + } else { + ref=IDirectSoundBuffer_Release(primary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " + "should have 0\n",ref); + } } else { - ref=IDirectSoundBuffer_Release(primary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " - "should have 0\n",ref); + ok(primary==NULL,"IDirectSound_CreateSoundBuffer(primary) failed " + "but primary created anyway\n"); + ok(rc!=DS_OK,"IDirectSound_CreateSoundBuffer(primary) succeeded " + "but primary not created\n"); + if (primary) { + ref=IDirectSoundBuffer_Release(primary); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " + "should have 0\n",ref); + } } - +EXIT2: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL);

1 0

Hans Leidekker : ntdll: The closing brace of a guid string is at index 37.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: ec6a5175b4e56e17e866291610bd8bdef270ee29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec6a5175b4e56e17e866291… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 10:31:18 2006 +0200 ntdll: The closing brace of a guid string is at index 37. --- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/tests/rtlstr.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index dab5bc8..75ff360 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1997,7 +1997,7 @@ NTSTATUS WINAPI RtlGUIDFromString(PUNICO /* Convert string: {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} * to memory: DWORD... WORD WORD BYTES............ */ - while (i < 37) + while (i <= 37) { switch (i) { diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 84bf83d..9afe9aa 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1672,6 +1672,9 @@ static void test_RtlIntegerToChar(void) static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-', '0','5','0','6','-' ,'0','7','0','8','-','0','9','0','A','-', '0','B','0','C','0','D','0','E','0','F','0','A','}','\0' }; +static const WCHAR szGuid2[] = { '{','0','1','0','2','0','3','0','4','-', + '0','5','0','6','-' ,'0','7','0','8','-','0','9','0','A','-', + '0','B','0','C','0','D','0','E','0','F','0','A',']','\0' }; DEFINE_GUID(IID_Endianess, 0x01020304, 0x0506, 0x0708, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x0A); @@ -1687,6 +1690,12 @@ static void test_RtlGUIDFromString(void) ret = pRtlGUIDFromString(&str, &guid); ok(ret == 0, "expected ret=0, got 0x%0lx\n", ret); ok(memcmp(&guid, &IID_Endianess, sizeof(guid)) == 0, "Endianess broken\n"); + + str.Length = str.MaximumLength = (sizeof(szGuid2) - 1) / sizeof(WCHAR); + str.Buffer = (LPWSTR)szGuid2; + + ret = pRtlGUIDFromString(&str, &guid); + ok(ret, "expected ret!=0\n"); } static void test_RtlStringFromGUID(void)

1 0

Jeff Latimer : usp10: Terminate some strings in fixmes and traces.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: df4b0a831e3f6cf62a99bce74c7d87e32899d929 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df4b0a831e3f6cf62a99bce… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Apr 9 09:15:41 2006 +1000 usp10: Terminate some strings in fixmes and traces. --- dlls/usp10/usp10.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7299968..030498f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -228,7 +228,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR /* Set SCRIPT_ITEM */ pItems[1].iCharPos = cInChars - pItems[0].iCharPos ; /* the last + 1 item contains the ptr to the lastchar */ - TRACE("%s,%d,%d,%p,%p,%p,%p,%d\n", debugstr_w(pwcInChars), cInChars, cMaxItems, + TRACE("%s,%d,%d,%p,%p,%p,%p,%d\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems, *pcItems); TRACE("Start Pos in string: %d, Stop Pos %d\n", pItems[0].iCharPos, pItems[1].iCharPos); return 0; @@ -279,7 +279,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_S * */ HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags) { - FIXME("(%s,%d,0x%lx): stub\n", debugstr_w(pwcInChars), cInChars, dwFlags); + FIXME("(%s,%d,0x%lx): stub\n", debugstr_wn(pwcInChars, cInChars), cInChars, dwFlags); return E_NOTIMPL; } /*********************************************************************** @@ -371,7 +371,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI LPABC lpABC; Scriptcache *pScriptcache; FIXME("(%p, %p, %p, %s, %d, %p, %p, %p): semi-stub\n", hdc, psc, pwGlyphs, - debugstr_w(pwGlyphs), + debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance);

1 0

Jacek Caban : shdocvw: Set active document of both frame and doc window.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 26f6a30f583cfae083a0856e18ee466093a7d67f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26f6a30f583cfae083a0856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 8 20:51:37 2006 +0200 shdocvw: Set active document of both frame and doc window. --- dlls/shdocvw/oleobject.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index fa3e9dc..32d7452 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -298,7 +298,10 @@ static HRESULT WINAPI OleObject_DoVerb(I IOleInPlaceSite_OnUIActivate(inplace); IOleInPlaceSite_Release(inplace); - IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + if(This->frame) + IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem); /* TODO: * IOleInPlaceFrmae_SetMenu

1 0

Detlef Riekenberg : winspool: Avoid reading from NULL (GetPrinterDriver).
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 9243cb349ef806898bb5c3a1f25fc4527fc24855 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9243cb349ef806898bb5c3a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 9 01:11:35 2006 +0200 winspool: Avoid reading from NULL (GetPrinterDriver). --- dlls/winspool/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index e98e78e..124970b 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -3438,7 +3438,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HA RegCloseKey(hkeyDrivers); if(pcbNeeded) *pcbNeeded = size + needed; - TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded); + TRACE("buffer space %ld required %ld\n", cbBuf, size + needed); if(cbBuf >= needed) return TRUE; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE;

1 0

Jacek Caban : shdocvw: Use IOleInPlaceObjectWindowless interface of document in deactivate_document .
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: ce2f142bf14afdf4fa241e7db1272492983cf186 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce2f142bf14afdf4fa241e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 8 20:10:10 2006 +0200 shdocvw: Use IOleInPlaceObjectWindowless interface of document in deactivate_document. --- dlls/shdocvw/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 07c9522..01f7a88 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -164,7 +164,7 @@ void deactivate_document(WebBrowser *Thi if(This->view) IOleDocumentView_UIActivate(This->view, FALSE); - hres = IUnknown_QueryInterface(This->client, &IID_IOleInPlaceObjectWindowless, + hres = IUnknown_QueryInterface(This->document, &IID_IOleInPlaceObjectWindowless, (void**)&winobj); if(SUCCEEDED(hres)) { IOleInPlaceObjectWindowless_InPlaceDeactivate(winobj);

1 0

Jacek Caban : mshtml: Make sure to use initialized variables.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: e189b54687ced0a86e5cdf4651f82997fba2c48d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e189b54687ced0a86e5cdf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 8 20:00:09 2006 +0200 mshtml: Make sure to use initialized variables. --- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4473f38..03e8529 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -173,7 +173,7 @@ static HRESULT WINAPI HTMLInputElement_g { HTMLInputElement *This = HTMLINPUT_THIS(iface); nsAString value_str; - const PRUnichar *value; + const PRUnichar *value = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 088af5d..817802f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLSelectElement_ { HTMLSelectElement *This = HTMLSELECT_THIS(iface); nsAString name_str; - const PRUnichar *name; + const PRUnichar *name = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -243,7 +243,7 @@ static HRESULT WINAPI HTMLSelectElement_ { HTMLSelectElement *This = HTMLSELECT_THIS(iface); nsAString value_str; - const PRUnichar *value; + const PRUnichar *value = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p);

1 0