October 2009 - Wine-Commits

Andrew Eikum : mshtml: Add DispatchEx support to HTMLImageElementFactory.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 90029d342934a8d8fb0a6e868f93770d2ea14cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=90029d342934a8d8fb0a6e868… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:05:03 2009 -0500 mshtml: Add DispatchEx support to HTMLImageElementFactory. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlimg.c | 20 ++++++++++++++++---- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 11 +++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f277e23..34865c2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -128,6 +128,7 @@ static REFIID tid_ids[] = { &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, + &IID_IHTMLImageElementFactory, &IID_IHTMLImgElement, &IID_IHTMLInputElement, &IID_IHTMLLocation, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index c7b03ea..cc999c0 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -624,13 +624,11 @@ static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFa if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_Unknown %p)\n", This, ppv); *ppv = HTMLIMGFACTORY(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLIMGFACTORY(This); }else if(IsEqualGUID(&IID_IHTMLImageElementFactory, riid)) { TRACE("(%p)->(IID_IHTMLImageElementFactory %p)\n", This, ppv); *ppv = HTMLIMGFACTORY(This); - } + }else if(dispex_query_interface(&This->dispex, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; if(*ppv) { IUnknown_AddRef((IUnknown*)*ppv); @@ -758,6 +756,18 @@ static const IHTMLImageElementFactoryVtbl HTMLImageElementFactoryVtbl = { HTMLImageElementFactory_create }; +static const tid_t HTMLImageElementFactory_iface_tids[] = { + IHTMLImageElementFactory_tid, + 0 +}; + +static dispex_static_data_t HTMLImageElementFactory_dispex = { + NULL, + IHTMLImageElementFactory_tid, + NULL, + HTMLImageElementFactory_iface_tids +}; + HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow *window) { HTMLImageElementFactory *ret; @@ -768,5 +778,7 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow *window) ret->ref = 1; ret->window = window; + init_dispex(&ret->dispex, (IUnknown*)HTMLIMGFACTORY(ret), &HTMLImageElementFactory_dispex); + return ret; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5111eb7..299f968 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -104,6 +104,7 @@ typedef enum { IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLGenericElement_tid, + IHTMLImageElementFactory_tid, IHTMLImgElement_tid, IHTMLInputElement_tid, IHTMLLocation_tid, @@ -182,6 +183,7 @@ typedef struct { } HTMLOptionElementFactory; typedef struct { + DispatchEx dispex; const IHTMLImageElementFactoryVtbl *lpHTMLImageElementFactoryVtbl; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3bce128..ba85130 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -342,6 +342,14 @@ static const IID * const cstyle_iids[] = { NULL }; +static const IID * const img_factory_iids[] = { + &IID_IUnknown, + &IID_IDispatch, + &IID_IDispatchEx, + &IID_IHTMLImageElementFactory, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -1118,6 +1126,9 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, IHTMLWindow2_Release(window); ok_(__FILE__,line) (hres == S_OK, "get_Image failed: %08x\n", hres); + test_ifaces((IUnknown*)factory, img_factory_iids); + test_disp((IUnknown*)factory, &IID_IHTMLImageElementFactory, "[object]"); + if(wdth >= 0){ snprintf(buf, 16, "%d", wdth); V_VT(&width) = VT_BSTR;

1 0

Nikolay Sivov : comctl32/syslink: Add a WM_ERASEBKGND handler.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 92c2d8afcd7b7fe17ebe2a9c30df4a5271478847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c2d8afcd7b7fe17ebe2a9c3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 21:47:50 2009 +0400 comctl32/syslink: Add a WM_ERASEBKGND handler. --- dlls/comctl32/syslink.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index f361779..1b940c0 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -906,6 +906,22 @@ static LRESULT SYSLINK_Paint (const SYSLINK_INFO *infoPtr, HDC hdcParam) return 0; } +/*********************************************************************** + * SYSLINK_EraseBkgnd + * Handles the WM_ERASEBKGND message. + */ +static LRESULT SYSLINK_EraseBkgnd (const SYSLINK_INFO *infoPtr, HDC hdc) +{ + HBRUSH hbr; + RECT r; + + GetClientRect(infoPtr->Self, &r); + hbr = CreateSolidBrush(comctl32_color.clrBtnFace); + FillRect(hdc, &r, hbr); + DeleteObject(hbr); + + return 1; +} /*********************************************************************** * SYSLINK_SetFont @@ -1551,6 +1567,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_PAINT: return SYSLINK_Paint (infoPtr, (HDC)wParam); + case WM_ERASEBKGND: + return SYSLINK_EraseBkgnd(infoPtr, (HDC)wParam); + case WM_SETCURSOR: { LHITTESTINFO ht;

1 0

Andrew Eikum : mshtml: Implement HTMLImageElementFactory::create.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 9c53e8d9352e32ed05c614c083b11b680aa4399e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c53e8d9352e32ed05c614c08… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:04:49 2009 -0500 mshtml: Implement HTMLImageElementFactory::create. --- dlls/mshtml/htmlimg.c | 42 +++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 2 +- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 56ec3cf..c7b03ea 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -702,11 +702,47 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i } static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *iface, - VARIANT width, VARIANT height, IHTMLImgElement **elem) + VARIANT width, VARIANT height, IHTMLImgElement **img_elem) { HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), elem); - return E_NOTIMPL; + HTMLElement *elem; + nsIDOMHTMLElement *nselem; + HRESULT hres; + + static const PRUnichar imgW[] = {'I','M','G',0}; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), + debugstr_variant(&height), img_elem); + + if(!This->window || !This->window->doc) { + WARN("NULL doc\n"); + return E_UNEXPECTED; + } + + *img_elem = NULL; + + hres = create_nselem(This->window->doc, imgW, &nselem); + if(FAILED(hres)) + return hres; + + elem = HTMLElement_Create(This->window->doc, (nsIDOMNode*)nselem, FALSE); + if(!elem) { + ERR("HTMLElement_Create failed\n"); + return E_FAIL; + } + + hres = IHTMLElement_QueryInterface(HTMLELEM(elem), &IID_IHTMLImgElement, (void**)img_elem); + if(FAILED(hres)) { + ERR("IHTMLElement_QueryInterface failed: 0x%08x\n", hres); + return hres; + } + + nsIDOMHTMLElement_Release(nselem); + + if(V_VT(&width) != VT_EMPTY || V_VT(&height) != VT_EMPTY) + FIXME("Not setting image dimensions\n"); + + return S_OK; } #undef HTMLIMGFACTORY_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 18f70ec..3bce128 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1137,7 +1137,7 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, } hres = IHTMLImageElementFactory_create(factory, width, height, &img); - todo_wine ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); IHTMLImageElementFactory_Release(factory); VariantClear(&width);

1 0

Andrew Eikum : mshtml: Add stub implementation for HTMLImageElementFactory.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 9579d64c6988465bf1c76bf8cb60d91bf800b327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9579d64c6988465bf1c76bf8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:04:34 2009 -0500 mshtml: Add stub implementation for HTMLImageElementFactory. --- dlls/mshtml/htmlimg.c | 123 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 17 +++++- dlls/mshtml/mshtml_private.h | 11 ++++ dlls/mshtml/tests/dom.c | 121 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 270 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9579d64c6988465bf1c76…

1 0

Andrew Eikum : mshtml.idl: Fix IHTMLImageElementFactory uuid.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 8872a14288cc24f64acf7e6653f255e8dce93ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8872a14288cc24f64acf7e665… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:04:16 2009 -0500 mshtml.idl: Fix IHTMLImageElementFactory uuid. --- include/mshtml.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 51088d1..f004e74 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6622,7 +6622,7 @@ interface IHTMLImgElement : IDispatch odl, oleautomation, dual, - uuid(3050F38E-98B5-11CF-BB82-00AAA0BDCE0B) + uuid(3050F38E-98B5-11CF-BB82-00AA00BDCE0B) ] interface IHTMLImageElementFactory : IDispatch {

1 0

Juan Lang : rsaenh: Store key when algid is a CALG_RSA_* algid, too.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 48975c38e02e0ccf57e2d9dcee6999442b59c1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48975c38e02e0ccf57e2d9dce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 20 15:22:21 2009 -0700 rsaenh: Store key when algid is a CALG_RSA_* algid, too. --- dlls/rsaenh/rsaenh.c | 16 ++++++---------- dlls/rsaenh/tests/rsaenh.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index de3125c..1b23391 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3059,11 +3059,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - if (Algid == AT_SIGNATURE) { - RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hSignatureKeyPair); - } + RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); + copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, + &pKeyContainer->hSignatureKeyPair); } break; @@ -3073,11 +3071,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - if (Algid == AT_KEYEXCHANGE) { - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); - } + RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); + copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, + &pKeyContainer->hKeyExchangeKeyPair); } break; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 8afa931..bfe2b5a 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2086,6 +2086,37 @@ static void test_null_provider(void) CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + /* Test for being able to get a key generated with CALG_RSA_SIGN. */ + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptGenKey(prov, CALG_RSA_SIGN, 0, &key); + ok(result, "CryptGenKey with CALG_RSA_SIGN failed with error %08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); + ok(!result, "expected CryptGetUserKey to fail\n"); + result = CryptGetUserKey(prov, AT_SIGNATURE, &key); + ok(result, "CryptGetUserKey with AT_SIGNATURE failed: %08x\n", GetLastError()); + CryptDestroyKey(key); + CryptReleaseContext(prov, 0); + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + + /* Test for being able to get a key generated with CALG_RSA_KEYX. */ + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptGenKey(prov, CALG_RSA_KEYX, 0, &key); + ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); + ok(result, "CryptGetUserKey with AT_KEYEXCHANGE failed: %08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_SIGNATURE, &key); + ok(!result, "expected CryptGetUserKey to fail\n"); + CryptDestroyKey(key); + CryptReleaseContext(prov, 0); + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); /* test for the bug in accessing the user key in a container */

1 0

Aurimas Fišeras : kernel32/nls: Add genitive forms for Lithuanian locale.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 65fc5aa57e2012eab79cccdd79f17dbea9890da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65fc5aa57e2012eab79cccdd7… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 21 10:57:10 2009 +0300 kernel32/nls: Add genitive forms for Lithuanian locale. --- dlls/kernel32/nls/lth.nls | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 6ee5f86..40944c1 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -107,18 +107,18 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SLONGDATE "yyyy 'm.' MMMM d 'd.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "sausis" - LOCALE_SMONTHNAME2 "vasaris" - LOCALE_SMONTHNAME3 "kovas" - LOCALE_SMONTHNAME4 "balandis" - LOCALE_SMONTHNAME5 "gegužė" - LOCALE_SMONTHNAME6 "birželis" - LOCALE_SMONTHNAME7 "liepa" - LOCALE_SMONTHNAME8 "rugpjūtis" - LOCALE_SMONTHNAME9 "rugsėjis" - LOCALE_SMONTHNAME10 "spalis" - LOCALE_SMONTHNAME11 "lapkritis" - LOCALE_SMONTHNAME12 "gruodis" + LOCALE_SMONTHNAME1 "sausis\0sausio" + LOCALE_SMONTHNAME2 "vasaris\0vasario" + LOCALE_SMONTHNAME3 "kovas\0kovo" + LOCALE_SMONTHNAME4 "balandis\0balandžio" + LOCALE_SMONTHNAME5 "gegužė\0gegužės" + LOCALE_SMONTHNAME6 "birželis\0birželio" + LOCALE_SMONTHNAME7 "liepa\0liepos" + LOCALE_SMONTHNAME8 "rugpjūtis\0rugpjūčio" + LOCALE_SMONTHNAME9 "rugsėjis\0rugsėjo" + LOCALE_SMONTHNAME10 "spalis\0spalio" + LOCALE_SMONTHNAME11 "lapkritis\0lapkričio" + LOCALE_SMONTHNAME12 "gruodis\0gruodžio" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "lt-LT"

1 0

Nikolay Sivov : kernel32/tests: Add tests for LOCALE_RETURN_GENITIVE_NAMES flag for GetLocaleInfoW.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 15c0f0a42de47f5c055cbc24e9d9127ab4c721f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c0f0a42de47f5c055cbc24e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 20 23:46:34 2009 +0400 kernel32/tests: Add tests for LOCALE_RETURN_GENITIVE_NAMES flag for GetLocaleInfoW. --- dlls/kernel32/tests/locale.c | 64 ++++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 7 ++-- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fe54907..f4db1ba 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -183,6 +183,69 @@ static void test_GetLocaleInfoA(void) ok(!strcmp(buffer, "Monday"), "Expected 'Monday', got '%s'\n", buffer); } +static void test_GetLocaleInfoW(void) +{ + LCID lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); + WCHAR bufferW[80], buffer2W[80]; + CHAR bufferA[80]; + DWORD ret; + INT i; + + ret = GetLocaleInfoW(lcid_en, LOCALE_SMONTHNAME1, bufferW, COUNTOF(bufferW)); + if (!ret) { + win_skip("GetLocaleInfoW() isn't implemented\n"); + return; + } + ret = GetLocaleInfoW(lcid_ru, LOCALE_SMONTHNAME1, bufferW, COUNTOF(bufferW)); + if (!ret) { + win_skip("LANG_RUSSIAN locale data unavailable\n"); + return; + } + ret = GetLocaleInfoW(lcid_ru, LOCALE_SMONTHNAME1|LOCALE_RETURN_GENITIVE_NAMES, + bufferW, COUNTOF(bufferW)); + if (!ret) { + win_skip("LOCALE_RETURN_GENITIVE_NAMES isn't supported\n"); + return; + } + + /* LOCALE_RETURN_GENITIVE_NAMES isn't supported for GetLocaleInfoA */ + bufferA[0] = 'a'; + ret = GetLocaleInfoA(lcid_ru, LOCALE_SMONTHNAME1|LOCALE_RETURN_GENITIVE_NAMES, + bufferA, COUNTOF(bufferA)); +todo_wine { + ok(ret == 0, "LOCALE_RETURN_GENITIVE_NAMES should fail with GetLocaleInfoA\n"); + ok(bufferA[0] == 'a', "Expected buffer to be untouched\n"); +} + + bufferW[0] = 'a'; + ret = GetLocaleInfoW(lcid_ru, LOCALE_RETURN_GENITIVE_NAMES, + bufferW, COUNTOF(bufferW)); +todo_wine { + ok(ret == 0, + "LOCALE_RETURN_GENITIVE_NAMES itself doesn't return anything, got %d\n", ret); + ok(bufferW[0] == 'a', "Expected buffer to be untouched\n"); +} + + for (i = 0; i < 12; i++) { + bufferW[0] = 0; + ret = GetLocaleInfoW(lcid_ru, (LOCALE_SMONTHNAME1+i)|LOCALE_RETURN_GENITIVE_NAMES, + bufferW, COUNTOF(bufferW)); + ok(ret, "Expected non zero result\n"); + ok(ret == lstrlenW(bufferW)+1, "Expected actual length, got %d, length %d\n", + ret, lstrlenW(bufferW)); + buffer2W[0] = 0; + ret = GetLocaleInfoW(lcid_ru, LOCALE_SMONTHNAME1+i, + buffer2W, COUNTOF(buffer2W)); + ok(ret, "Expected non zero result\n"); + ok(ret == lstrlenW(buffer2W)+1, "Expected actual length, got %d, length %d\n", + ret, lstrlenW(buffer2W)); + + todo_wine ok(lstrcmpW(bufferW, buffer2W) != 0, + "Expected genitive name to differ, got the same for month %d\n", i+1); + } +} + static void test_GetTimeFormatA(void) { int ret; @@ -2471,6 +2534,7 @@ START_TEST(locale) test_EnumTimeFormatsA(); test_EnumDateFormatsA(); test_GetLocaleInfoA(); + test_GetLocaleInfoW(); test_GetTimeFormatA(); test_GetDateFormatA(); test_GetDateFormatW(); diff --git a/include/winnls.h b/include/winnls.h index 50d6389..9f2d9ca 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -151,9 +151,10 @@ extern "C" { #define LCID_ALTERNATE_SORTS 0x4 /* Locale flags */ -#define LOCALE_NOUSEROVERRIDE 0x80000000 -#define LOCALE_USE_CP_ACP 0x40000000 -#define LOCALE_RETURN_NUMBER 0x20000000 +#define LOCALE_NOUSEROVERRIDE 0x80000000 +#define LOCALE_USE_CP_ACP 0x40000000 +#define LOCALE_RETURN_NUMBER 0x20000000 +#define LOCALE_RETURN_GENITIVE_NAMES 0x10000000 /* Locale information types */ #define LOCALE_ILANGUAGE 0x0001

1 0

Nikolay Sivov : kernel32/locale: Add support for LOCALE_RETURN_GENITIVE_NAMES for LOCALE_SMONTHNAME* locale data , update Russian nls resource accordingly.
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: 2b7a3657f7cb9ace7482cca8aeececeb83d65cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7a3657f7cb9ace7482cca8a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 21 05:34:59 2009 +0400 kernel32/locale: Add support for LOCALE_RETURN_GENITIVE_NAMES for LOCALE_SMONTHNAME* locale data, update Russian nls resource accordingly. --- dlls/kernel32/locale.c | 60 +++++++++++++++++++++++++++++++++++++++-- dlls/kernel32/nls/rus.nls | 24 ++++++++-------- dlls/kernel32/tests/locale.c | 32 ++++++++++++++++++---- 3 files changed, 95 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9071ff9..dcbef36 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -53,7 +53,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); -#define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|LOCALE_RETURN_NUMBER) +#define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|\ + LOCALE_RETURN_NUMBER|LOCALE_RETURN_GENITIVE_NAMES) /* current code pages */ static const union cptable *ansi_cptable; @@ -579,6 +580,33 @@ static LCID convert_default_lcid( LCID lcid, LCTYPE lctype ) return ConvertDefaultLocale( lcid ); } +/*********************************************************************** + * is_genitive_name_supported + * + * Determine could LCTYPE basically support genitive name form or not. + */ +static BOOL is_genitive_name_supported( LCTYPE lctype ) +{ + switch(lctype & 0xffff) + { + case LOCALE_SMONTHNAME1: + case LOCALE_SMONTHNAME2: + case LOCALE_SMONTHNAME3: + case LOCALE_SMONTHNAME4: + case LOCALE_SMONTHNAME5: + case LOCALE_SMONTHNAME6: + case LOCALE_SMONTHNAME7: + case LOCALE_SMONTHNAME8: + case LOCALE_SMONTHNAME9: + case LOCALE_SMONTHNAME10: + case LOCALE_SMONTHNAME11: + case LOCALE_SMONTHNAME12: + case LOCALE_SMONTHNAME13: + return TRUE; + default: + return FALSE; + } +} /*********************************************************************** * create_registry_key @@ -1163,6 +1191,12 @@ INT WINAPI GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len ) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (lctype & LOCALE_RETURN_GENITIVE_NAMES ) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!len) buffer = NULL; if (!(lenW = GetLocaleInfoW( lcid, lctype, NULL, 0 ))) return 0; @@ -1221,6 +1255,13 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (lctype & LOCALE_RETURN_GENITIVE_NAMES && + !is_genitive_name_supported( lctype )) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (!len) buffer = NULL; lcid = convert_default_lcid( lcid, lctype ); @@ -1289,7 +1330,20 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) for (i = 0; i < (lctype & 0x0f); i++) p += *p + 1; if (lcflags & LOCALE_RETURN_NUMBER) ret = sizeof(UINT)/sizeof(WCHAR); - else ret = (lctype == LOCALE_FONTSIGNATURE) ? *p : *p + 1; + else if (is_genitive_name_supported( lctype ) && *p) + { + /* genitive form's stored after a null separator from a nominative */ + for (i = 1; i <= *p; i++) if (!p[i]) break; + + if (i <= *p && (lcflags & LOCALE_RETURN_GENITIVE_NAMES)) + { + ret = *p - i - 1; + p += i; + } + else ret = i; + } + else + ret = (lctype == LOCALE_FONTSIGNATURE) ? *p : *p + 1; if (!buffer) return ret; @@ -1321,7 +1375,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) } else { - memcpy( buffer, p + 1, *p * sizeof(WCHAR) ); + memcpy( buffer, p + 1, ret * sizeof(WCHAR) ); if (lctype != LOCALE_FONTSIGNATURE) buffer[ret-1] = 0; TRACE( "(lcid=0x%x,lctype=0x%x,%p,%d) returning %d %s\n", diff --git a/dlls/kernel32/nls/rus.nls b/dlls/kernel32/nls/rus.nls index fdda023..5cead81 100644 --- a/dlls/kernel32/nls/rus.nls +++ b/dlls/kernel32/nls/rus.nls @@ -107,18 +107,18 @@ STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy 'г.'" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "Январь" - LOCALE_SMONTHNAME2 "Февраль" - LOCALE_SMONTHNAME3 "Март" - LOCALE_SMONTHNAME4 "Апрель" - LOCALE_SMONTHNAME5 "Май" - LOCALE_SMONTHNAME6 "Июнь" - LOCALE_SMONTHNAME7 "Июль" - LOCALE_SMONTHNAME8 "Август" - LOCALE_SMONTHNAME9 "Сентябрь" - LOCALE_SMONTHNAME10 "Октябрь" - LOCALE_SMONTHNAME11 "Ноябрь" - LOCALE_SMONTHNAME12 "Декабрь" + LOCALE_SMONTHNAME1 "Январь\0января" + LOCALE_SMONTHNAME2 "Февраль\0февраля" + LOCALE_SMONTHNAME3 "Март\0марта" + LOCALE_SMONTHNAME4 "Апрель\0апреля" + LOCALE_SMONTHNAME5 "Май\0мая" + LOCALE_SMONTHNAME6 "Июнь\0июня" + LOCALE_SMONTHNAME7 "Июль\0июля" + LOCALE_SMONTHNAME8 "Август\0августа" + LOCALE_SMONTHNAME9 "Сентябрь\0сентября" + LOCALE_SMONTHNAME10 "Октябрь\0октября" + LOCALE_SMONTHNAME11 "Ноябрь\0ноября" + LOCALE_SMONTHNAME12 "Декабрь\0декабря" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "ru-RU" diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f4db1ba..77fae8b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -211,22 +211,25 @@ static void test_GetLocaleInfoW(void) /* LOCALE_RETURN_GENITIVE_NAMES isn't supported for GetLocaleInfoA */ bufferA[0] = 'a'; + SetLastError(0xdeadbeef); ret = GetLocaleInfoA(lcid_ru, LOCALE_SMONTHNAME1|LOCALE_RETURN_GENITIVE_NAMES, bufferA, COUNTOF(bufferA)); -todo_wine { ok(ret == 0, "LOCALE_RETURN_GENITIVE_NAMES should fail with GetLocaleInfoA\n"); ok(bufferA[0] == 'a', "Expected buffer to be untouched\n"); -} + ok(GetLastError() == ERROR_INVALID_FLAGS, + "Expected ERROR_INVALID_FLAGS, got %x\n", GetLastError()); bufferW[0] = 'a'; + SetLastError(0xdeadbeef); ret = GetLocaleInfoW(lcid_ru, LOCALE_RETURN_GENITIVE_NAMES, bufferW, COUNTOF(bufferW)); -todo_wine { ok(ret == 0, "LOCALE_RETURN_GENITIVE_NAMES itself doesn't return anything, got %d\n", ret); ok(bufferW[0] == 'a', "Expected buffer to be untouched\n"); -} + ok(GetLastError() == ERROR_INVALID_FLAGS, + "Expected ERROR_INVALID_FLAGS, got %x\n", GetLastError()); + /* yes, test empty 13 month entry too */ for (i = 0; i < 12; i++) { bufferW[0] = 0; ret = GetLocaleInfoW(lcid_ru, (LOCALE_SMONTHNAME1+i)|LOCALE_RETURN_GENITIVE_NAMES, @@ -241,8 +244,25 @@ todo_wine { ok(ret == lstrlenW(buffer2W)+1, "Expected actual length, got %d, length %d\n", ret, lstrlenW(buffer2W)); - todo_wine ok(lstrcmpW(bufferW, buffer2W) != 0, - "Expected genitive name to differ, got the same for month %d\n", i+1); + ok(lstrcmpW(bufferW, buffer2W) != 0, + "Expected genitive name to differ, got the same for month %d\n", i+1); + + /* for locale without genitive names nominative returned in both cases */ + bufferW[0] = 0; + ret = GetLocaleInfoW(lcid_en, (LOCALE_SMONTHNAME1+i)|LOCALE_RETURN_GENITIVE_NAMES, + bufferW, COUNTOF(bufferW)); + ok(ret, "Expected non zero result\n"); + ok(ret == lstrlenW(bufferW)+1, "Expected actual length, got %d, length %d\n", + ret, lstrlenW(bufferW)); + buffer2W[0] = 0; + ret = GetLocaleInfoW(lcid_en, LOCALE_SMONTHNAME1+i, + buffer2W, COUNTOF(buffer2W)); + ok(ret, "Expected non zero result\n"); + ok(ret == lstrlenW(buffer2W)+1, "Expected actual length, got %d, length %d\n", + ret, lstrlenW(buffer2W)); + + ok(lstrcmpW(bufferW, buffer2W) == 0, + "Expected same names, got different for month %d\n", i+1); } }

1 0

Henri Verbeet : winex11.drv: Properly free "visinfo" in get_formats() ( Valgrind).
by Alexandre Julliard Oct. 21, 2009

Oct. 21, 2009

Module: wine Branch: master Commit: ac14a2eec8851e349215eb7612295ed04ebe08d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac14a2eec8851e349215eb761… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:34:01 2009 +0200 winex11.drv: Properly free "visinfo" in get_formats() (Valgrind). --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4e4a3a0..9f97099 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -906,7 +906,10 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc * with a depth of 32 in addition to the default 24 bit. In order to prevent BadMatch errors we only * list formats with the same depth. */ if(visinfo->depth != screen_depth) + { + XFree(visinfo); continue; + } TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].iPixelFormat = size+1; /* The index starts at 1 */ @@ -931,8 +934,6 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc size++; onscreen_size++; } - - XFree(visinfo); } else if(run && !visinfo) { TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].iPixelFormat = size+1; /* The index starts at 1 */ @@ -943,6 +944,8 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc list[size].dwFlags = 0; size++; } + + if (visinfo) XFree(visinfo); } }

1 0