May 2008 - Wine-Commits - list.winehq.org

Paul Vriens : regedit: Sync Dutch resource with latest changes.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: b3e75eead97e715175f1c283d54c4f6bd3a9fc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e75eead97e715175f1c283d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 19 20:19:46 2008 +0200 regedit: Sync Dutch resource with latest changes. --- programs/regedit/Nl.rc | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index ffccd87..735c7ef 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -107,6 +107,7 @@ BEGIN MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE MENUITEM "&Naam wijzigen\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Exporteren . . .", ID_EDIT_EXPORT MENUITEM "&Sleutelnaam kopi�ren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -129,7 +130,7 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 102, 30, 164, 12 END -IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Zoeken" FONT 8, "MS Shell Dlg" @@ -141,8 +142,8 @@ BEGIN CHECKBOX "Waarden", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Gegevens", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Hele tekenreeks", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX - DEFPUSHBUTTON "Zoeken",IDOK,175,5,30,11,WS_GROUP - PUSHBUTTON "Sluiten",IDCANCEL,175,22,30,11, WS_GROUP + DEFPUSHBUTTON "Zoeken",IDOK,175,5,40,15,WS_GROUP + PUSHBUTTON "Sluiten",IDCANCEL,175,24,40,15, WS_GROUP END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 @@ -152,8 +153,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Naam:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,120,40,40,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,165,40,40,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,36,40,15, WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 @@ -163,8 +164,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Favorieten:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,120,73,40,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,165,73,40,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,72,40,15, WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 @@ -176,8 +177,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Waardegegevens:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,120,60,40,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,165,60,40,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,56,40,15,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -192,21 +193,21 @@ BEGIN GROUPBOX "Grondtal", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Hexadecimaal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Decimaal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,120,80,40,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,165,80,40,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,78,40,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Binaire waarde bewerken" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Waardenaam:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Waardegegevens:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,120,80,40,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,165,80,40,11,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,125,83,40,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 @@ -214,12 +215,12 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Multi-tekenreeks bewerken" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "waardename:",IDC_STATIC,5,5,119,8 + LTEXT "Waardenaam:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED - LTEXT "waardegegevens:",IDC_STATIC,5,30,119,8 + LTEXT "Waardegegevens:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP - PUSHBUTTON "Annuleren",IDCANCEL,175,160,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,165,156,40,15,WS_GROUP END /*

1 0

Paul Vriens : janitorial: Close COM after tests.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: 64444ebe9407b7b9795eba62b40ca9ccc3cb2b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64444ebe9407b7b9795eba62b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 19 17:04:48 2008 +0200 janitorial: Close COM after tests. --- dlls/quartz/tests/filtergraph.c | 1 + dlls/quartz/tests/memallocator.c | 2 ++ dlls/quartz/tests/misc.c | 2 ++ dlls/quartz/tests/referenceclock.c | 2 ++ dlls/quartz/tests/videorenderer.c | 2 ++ dlls/shell32/tests/string.c | 2 ++ dlls/shlwapi/tests/string.c | 2 ++ 7 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a82a685..400f7a6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -298,4 +298,5 @@ START_TEST(filtergraph) test_graph_builder_addfilter(); test_mediacontrol(); test_filter_graph2(); + CoUninitialize(); } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index b0638e8..c5313f7 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -87,4 +87,6 @@ START_TEST(memallocator) CoInitialize(NULL); CommitDecommitTest(); + + CoUninitialize(); } diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 7207814..bd902a8 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -173,4 +173,6 @@ START_TEST(misc) test_video_renderer_aggregations(); test_filter_graph_aggregations(); + + CoUninitialize(); } diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index a56fb25..164fc3d 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -110,4 +110,6 @@ START_TEST(referenceclock) CoInitialize(NULL); test_IReferenceClock_SystemClock(); + + CoUninitialize(); } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index d18620f..3fa7522 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -160,4 +160,6 @@ START_TEST(videorenderer) test_basefilter(); release_video_renderer(); + + CoUninitialize(); } diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index c748f35..61fab0f 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -110,4 +110,6 @@ START_TEST(string) else test_StrRetToStringNA(); } + + CoUninitialize(); } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 0b4f28b..79a645c 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -957,4 +957,6 @@ START_TEST(string) test_SHAnsiToAnsi(); test_SHUnicodeToUnicode(); test_StrXXX_overflows(); + + CoUninitialize(); }

1 0

Alexandre Julliard : user32: Moved the class extra bytes check to catch uninitialised data sooner.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: c362081a791632b88c96405cb66ae6347d391fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c362081a791632b88c96405cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 19 20:21:48 2008 +0200 user32: Moved the class extra bytes check to catch uninitialised data sooner. --- dlls/user32/class.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index ff0e1f8..1ca50f5 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -338,11 +338,6 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local /* Fix the extra bytes value */ - if (classExtra < 0 || winExtra < 0) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } if (classExtra > 40) /* Extra bytes are limited to 40 in Win32 */ WARN("Class extra bytes %d is > 40\n", classExtra); if (winExtra > 40) /* Extra bytes are limited to 40 in Win32 */ @@ -526,11 +521,11 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) CLASS *classPtr; HINSTANCE instance; - if (wc->hInstance == user32_module) + if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || + wc->hInstance == user32_module) /* we can't register a class for user32 */ { - /* we can't register a class for user32 */ - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); @@ -575,11 +570,11 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) CLASS *classPtr; HINSTANCE instance; - if (wc->hInstance == user32_module) + if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || + wc->hInstance == user32_module) /* we can't register a class for user32 */ { - /* we can't register a class for user32 */ - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL );

1 0

Roderick Colenbrander : wined3d: Request a WGL depth stencil capable pixel format by default until we have proper SetDepthStencilSurface support .
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: bd5c02e24504470e0853096a2ef50120b4050b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5c02e24504470e0853096a2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun May 18 17:41:56 2008 +0000 wined3d: Request a WGL depth stencil capable pixel format by default until we have proper SetDepthStencilSurface support. --- dlls/wined3d/context.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 14d8fce..0811f12 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -126,6 +126,22 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF return 0; } + /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. + * You are able to add a depth + stencil surface at a later stage when you need it. + * In order to support this properly in WineD3D we need the ability to recreate the opengl context and + * drawable when this is required. This is very tricky as we need to reapply ALL opengl states for the new + * context, need torecreate shaders, textures and other resources. + * + * The context manager already takes care of the state problem and for the other tasks code from Reset + * can be used. These changes are way to risky during the 1.0 code freeze which is taking place right now. + * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the + * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this + * issue needs to be fixed. */ + if(DepthStencilFormat != WINED3DFMT_D24S8) + FIXME("Add OpenGL context recreation support to SetDepthStencilSurface\n"); + + DepthStencilFormat = WINED3DFMT_D24S8; + if(DepthStencilFormat) { getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); }

1 0

Juan Lang : snmpapi: Test and correct SnmpUtilOidNCmp when count is less than Oid length.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: 3108e3605cbf9a0cd0becaeeab9d976f3a7f298c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3108e3605cbf9a0cd0becaeea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 16 16:09:34 2008 -0700 snmpapi: Test and correct SnmpUtilOidNCmp when count is less than Oid length. --- dlls/snmpapi/main.c | 1 + dlls/snmpapi/tests/util.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 0e60d88..9e14a19 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -356,6 +356,7 @@ INT WINAPI SnmpUtilOidNCmp(AsnObjectIdentifier *oid1, AsnObjectIdentifier *oid2, if (oid1->ids[i] > oid2->ids[i]) return 1; if (oid1->ids[i] < oid2->ids[i]) return -1; } + if (i == count) return 0; if (oid1->idLength < oid2->idLength) return -1; if (oid1->idLength > oid2->idLength) return 1; return 0; diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 3d513bd..428040d 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -330,6 +330,11 @@ static void test_SnmpUtilOidNCmp(void) ok(ret == 1, "SnmpUtilOidNCmp failed: %d\n", ret); ret = SnmpUtilOidNCmp(&oid1, &oid2, 4); ok(ret == -1, "SnmpUtilOidNCmp failed: %d\n", ret); + + ret = SnmpUtilOidNCmp(&oid1, &oid2, 2); + ok(!ret, "SnmpUtilOidNCmp failed: %d\n", ret); + ret = SnmpUtilOidNCmp(&oid2, &oid1, 2); + ok(!ret, "SnmpUtilOidNCmp failed: %d\n", ret); } static void test_SnmpUtilOidCmp(void)

1 0

Juan Lang : snmpapi: Test and correct SnmpUtilOidNCmp when Oid lengths don' t match.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: a96e118ddbc47f1567ae8c16f5f53ca9ab564f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96e118ddbc47f1567ae8c16f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 16 16:09:11 2008 -0700 snmpapi: Test and correct SnmpUtilOidNCmp when Oid lengths don't match. --- dlls/snmpapi/main.c | 8 ++++++-- dlls/snmpapi/tests/util.c | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 62e9ab3..0e60d88 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -343,17 +343,21 @@ VOID WINAPI SnmpUtilOidFree(AsnObjectIdentifier *oid) */ INT WINAPI SnmpUtilOidNCmp(AsnObjectIdentifier *oid1, AsnObjectIdentifier *oid2, UINT count) { - unsigned int i; + unsigned int i, len; TRACE("(%p, %p, %d)\n", oid1, oid2, count); if (!oid1 || !oid2) return 0; - for (i = 0; i < count; i++) + len = min(count, oid1->idLength); + len = min(len, oid2->idLength); + for (i = 0; i < len; i++) { if (oid1->ids[i] > oid2->ids[i]) return 1; if (oid1->ids[i] < oid2->ids[i]) return -1; } + if (oid1->idLength < oid2->idLength) return -1; + if (oid1->idLength > oid2->idLength) return 1; return 0; } diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 72bcdc8..3d513bd 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -321,6 +321,15 @@ static void test_SnmpUtilOidNCmp(void) ret = SnmpUtilOidNCmp(&oid2, &oid1, 4); ok(ret == 1, "SnmpUtilOidNCmp failed: %d\n", ret); + + oid1.idLength = 3; + memcpy(oid1.ids, oid2.ids, sizeof(UINT) * 4); + ret = SnmpUtilOidNCmp(&oid1, &oid1, 4); + ok(!ret, "SnmpUtilOidNCmp failed: %d\n", ret); + ret = SnmpUtilOidNCmp(&oid2, &oid1, 4); + ok(ret == 1, "SnmpUtilOidNCmp failed: %d\n", ret); + ret = SnmpUtilOidNCmp(&oid1, &oid2, 4); + ok(ret == -1, "SnmpUtilOidNCmp failed: %d\n", ret); } static void test_SnmpUtilOidCmp(void)

1 0

Kai Blin : ws2_32: Test for invalid hostnames again.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: d88ee55e686c647b372d82c1349b06205561878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88ee55e686c647b372d82c13… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu May 15 09:49:40 2008 +0200 ws2_32: Test for invalid hostnames again. --- dlls/ws2_32/tests/sock.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 13bb705..405b47e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1828,14 +1828,10 @@ static void test_gethostbyname_hack(void) } } -#if 0 - /* Can't expect ISPs to behave anymore; many send you to spam sites - * if you type in a bogus URL nowadays. - */ he = NULL; - he = gethostbyname("someweirdandbogusname"); - ok(he == NULL, "gethostbyname(\"someweirdandbogusname\") succeeded.\n"); -#endif + he = gethostbyname("nonexistent.winehq.org"); + /* Don't check for the return value, as some braindead ISPs will kindly + * resolve nonexistent host names to addresses of the ISP's spam pages. */ } static void test_inet_addr(void)

1 0

Michael Karcher : oleaut32: Cache localised number chars.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: abaac300d13e8e9e93f937a22f7eba9fffd154b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abaac300d13e8e9e93f937a22… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu May 15 00:13:55 2008 +0200 oleaut32: Cache localised number chars. --- dlls/oleaut32/variant.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 4eecfce..e6191d1 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1468,9 +1468,25 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; + static CRITICAL_SECTION csLastChars = { NULL, -1, 0, 0, 0, 0 }; + static VARIANT_NUMBER_CHARS lastChars; + static LCID lastLcid = -1; + static DWORD lastFlags = 0; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; + /* To make caching thread-safe, a critical section is needed */ + EnterCriticalSection(&csLastChars); + + /* Asking for default locale entries is very expensive: It is a registry + server call. So cache one locally, as Microsoft does it too */ + if(lcid == lastLcid && dwFlags == lastFlags) + { + memcpy(lpChars, &lastChars, sizeof(defaultChars)); + LeaveCriticalSection(&csLastChars); + return; + } + memcpy(lpChars, &defaultChars, sizeof(defaultChars)); GET_NUMBER_TEXT(LOCALE_SNEGATIVESIGN, cNegativeSymbol); GET_NUMBER_TEXT(LOCALE_SPOSITIVESIGN, cPositiveSymbol); @@ -1490,6 +1506,11 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID } TRACE("lcid 0x%x, cCurrencyLocal =%d,%d '%c','%c'\n", lcid, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2); + + memcpy(&lastChars, lpChars, sizeof(defaultChars)); + lastLcid = lcid; + lastFlags = dwFlags; + LeaveCriticalSection(&csLastChars); } /* Number Parsing States */

1 0

Paul Vriens : ntdll/tests: Free library after use.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: 446243b1d97f0a42f14df1f1179898166c692f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446243b1d97f0a42f14df1f11… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 19 14:00:10 2008 +0200 ntdll/tests: Free library after use. --- dlls/ntdll/tests/port.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 9715917..a4d3348 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -118,26 +118,27 @@ static BOOL init_function_ptrs(void) { hntdll = LoadLibraryA("ntdll.dll"); - if (hntdll) - { - pNtCompleteConnectPort = (void *)GetProcAddress(hntdll, "NtCompleteConnectPort"); - pNtAcceptConnectPort = (void *)GetProcAddress(hntdll, "NtAcceptConnectPort"); - pNtReplyPort = (void *)GetProcAddress(hntdll, "NtReplyPort"); - pNtReplyWaitReceivePort = (void *)GetProcAddress(hntdll, "NtReplyWaitReceivePort"); - pNtCreatePort = (void *)GetProcAddress(hntdll, "NtCreatePort"); - pNtRequestWaitReplyPort = (void *)GetProcAddress(hntdll, "NtRequestWaitReplyPort"); - pNtRequestPort = (void *)GetProcAddress(hntdll, "NtRequestPort"); - pNtRegisterThreadTerminatePort = (void *)GetProcAddress(hntdll, "NtRegisterThreadTerminatePort"); - pNtConnectPort = (void *)GetProcAddress(hntdll, "NtConnectPort"); - pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); - pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); - } + if (!hntdll) + return FALSE; + + pNtCompleteConnectPort = (void *)GetProcAddress(hntdll, "NtCompleteConnectPort"); + pNtAcceptConnectPort = (void *)GetProcAddress(hntdll, "NtAcceptConnectPort"); + pNtReplyPort = (void *)GetProcAddress(hntdll, "NtReplyPort"); + pNtReplyWaitReceivePort = (void *)GetProcAddress(hntdll, "NtReplyWaitReceivePort"); + pNtCreatePort = (void *)GetProcAddress(hntdll, "NtCreatePort"); + pNtRequestWaitReplyPort = (void *)GetProcAddress(hntdll, "NtRequestWaitReplyPort"); + pNtRequestPort = (void *)GetProcAddress(hntdll, "NtRequestPort"); + pNtRegisterThreadTerminatePort = (void *)GetProcAddress(hntdll, "NtRegisterThreadTerminatePort"); + pNtConnectPort = (void *)GetProcAddress(hntdll, "NtConnectPort"); + pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); if (!pNtCompleteConnectPort || !pNtAcceptConnectPort || !pNtReplyWaitReceivePort || !pNtCreatePort || !pNtRequestWaitReplyPort || !pNtRequestPort || !pNtRegisterThreadTerminatePort || !pNtConnectPort || !pRtlInitUnicodeString) { + FreeLibrary(hntdll); return FALSE; } @@ -309,4 +310,6 @@ START_TEST(port) test_ports_server(); CloseHandle(thread); + + FreeLibrary(hntdll); }

1 0

Paul Vriens : ntdll/tests: Skip test when we don't have enough rights.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: b65c1d47eb4888a0d8caf850fafda8c94ccaf173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65c1d47eb4888a0d8caf850f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 19 14:01:26 2008 +0200 ntdll/tests: Skip test when we don't have enough rights. --- dlls/ntdll/tests/port.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index a4d3348..f30cdc8 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -245,6 +245,11 @@ static void test_ports_server(void) obj.ObjectName = &port; status = pNtCreatePort(&PortHandle, &obj, 100, 100, 0); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not enough rights\n"); + return; + } todo_wine { ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status);

1 0