May 2009 - Wine-commits - list.winehq.org

Paul Vriens : mshtml: Match IE8 implementation.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 79fcaa78357b87e550f0d65fe832d300fd5ca694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fcaa78357b87e550f0d65fe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 27 13:21:25 2009 +0200 mshtml: Match IE8 implementation. --- dlls/mshtml/htmlnode.c | 5 +++++ dlls/mshtml/tests/dom.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 32b0801..720bbfe 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -157,6 +157,11 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection TRACE("(%p)->(%d %p)\n", This, index, ppItem); + if (ppItem) + *ppItem = NULL; + else + return E_POINTER; + nsIDOMNodeList_GetLength(This->nslist, &length); if(index < 0 || index >= length) return E_INVALIDARG; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aaf1a39..497fc0a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4456,15 +4456,17 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); } - disp = (void*)0xdeadbeef; + hres = IHTMLDOMChildrenCollection_item(child_col, length - 1, NULL); + ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + + hres = IHTMLDOMChildrenCollection_item(child_col, length, NULL); + ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + hres = IHTMLDOMChildrenCollection_item(child_col, 6000, &disp); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); - ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); - disp = (void*)0xdeadbeef; hres = IHTMLDOMChildrenCollection_item(child_col, length, &disp); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); - ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); test_child_col_disp(child_col);

1 0

Alexandre Julliard : rpcrt4: Internal functions don't need to be WINAPI.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 23e70e00ed00fe2b7ee24403515c3ae7e5d2661c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e70e00ed00fe2b7ee244035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 13:04:33 2009 +0200 rpcrt4: Internal functions don't need to be WINAPI. --- dlls/rpcrt4/cproxy.c | 14 +++++++------- dlls/rpcrt4/cpsf.h | 33 +++++++++++---------------------- dlls/rpcrt4/cstub.c | 26 +++++++++++++------------- 3 files changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6c26d18..a677ca0 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -112,13 +112,13 @@ struct StublessThunk { int dummy; }; #endif /* __i386__ */ -HRESULT WINAPI StdProxy_Construct(REFIID riid, - LPUNKNOWN pUnkOuter, - const ProxyFileInfo *ProxyInfo, - int Index, - LPPSFACTORYBUFFER pPSFactory, - LPRPCPROXYBUFFER *ppProxy, - LPVOID *ppvObj) +HRESULT StdProxy_Construct(REFIID riid, + LPUNKNOWN pUnkOuter, + const ProxyFileInfo *ProxyInfo, + int Index, + LPPSFACTORYBUFFER pPSFactory, + LPRPCPROXYBUFFER *ppProxy, + LPVOID *ppvObj) { StdProxyImpl *This; const MIDL_STUBLESS_PROXY_INFO *stubless = NULL; diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index d8867d4..9b401b8 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -21,28 +21,17 @@ #ifndef __WINE_CPSF_H #define __WINE_CPSF_H -HRESULT WINAPI StdProxy_Construct(REFIID riid, - LPUNKNOWN pUnkOuter, - const ProxyFileInfo *ProxyInfo, - int Index, - LPPSFACTORYBUFFER pPSFactory, - LPRPCPROXYBUFFER *ppProxy, - LPVOID *ppvObj); - -HRESULT WINAPI CStdStubBuffer_Construct(REFIID riid, - LPUNKNOWN pUnkServer, - PCInterfaceName name, - CInterfaceStubVtbl *vtbl, - LPPSFACTORYBUFFER pPSFactory, - LPRPCSTUBBUFFER *ppStub); - -HRESULT WINAPI CStdStubBuffer_Delegating_Construct(REFIID riid, - LPUNKNOWN pUnkServer, - PCInterfaceName name, - CInterfaceStubVtbl *vtbl, - REFIID delegating_iid, - LPPSFACTORYBUFFER pPSFactory, - LPRPCSTUBBUFFER *ppStub); +HRESULT StdProxy_Construct(REFIID riid, LPUNKNOWN pUnkOuter, const ProxyFileInfo *ProxyInfo, + int Index, LPPSFACTORYBUFFER pPSFactory, LPRPCPROXYBUFFER *ppProxy, + LPVOID *ppvObj); + +HRESULT CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, + CInterfaceStubVtbl *vtbl, LPPSFACTORYBUFFER pPSFactory, + LPRPCSTUBBUFFER *ppStub); + +HRESULT CStdStubBuffer_Delegating_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, + CInterfaceStubVtbl *vtbl, REFIID delegating_iid, + LPPSFACTORYBUFFER pPSFactory, LPRPCSTUBBUFFER *ppStub); const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 9708d18..aed1432 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -61,12 +61,12 @@ static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer return (cstdstubbuffer_delegating_t*)((char *)iface - FIELD_OFFSET(cstdstubbuffer_delegating_t, stub_buffer)); } -HRESULT WINAPI CStdStubBuffer_Construct(REFIID riid, - LPUNKNOWN pUnkServer, - PCInterfaceName name, - CInterfaceStubVtbl *vtbl, - LPPSFACTORYBUFFER pPSFactory, - LPRPCSTUBBUFFER *ppStub) +HRESULT CStdStubBuffer_Construct(REFIID riid, + LPUNKNOWN pUnkServer, + PCInterfaceName name, + CInterfaceStubVtbl *vtbl, + LPPSFACTORYBUFFER pPSFactory, + LPRPCSTUBBUFFER *ppStub) { CStdStubBuffer *This; IUnknown *pvServer; @@ -262,13 +262,13 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) LeaveCriticalSection(&delegating_vtbl_section); } -HRESULT WINAPI CStdStubBuffer_Delegating_Construct(REFIID riid, - LPUNKNOWN pUnkServer, - PCInterfaceName name, - CInterfaceStubVtbl *vtbl, - REFIID delegating_iid, - LPPSFACTORYBUFFER pPSFactory, - LPRPCSTUBBUFFER *ppStub) +HRESULT CStdStubBuffer_Delegating_Construct(REFIID riid, + LPUNKNOWN pUnkServer, + PCInterfaceName name, + CInterfaceStubVtbl *vtbl, + REFIID delegating_iid, + LPPSFACTORYBUFFER pPSFactory, + LPRPCSTUBBUFFER *ppStub) { cstdstubbuffer_delegating_t *This; IUnknown *pvServer;

1 0

Michael Stefaniuc : msvcrtd: Use size_t instead of unsigned long.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 37a62a643e457bf8259b2efa31b6939155018180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a62a643e457bf8259b2efa3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 11:36:50 2009 +0200 msvcrtd: Use size_t instead of unsigned long. --- dlls/msvcrtd/debug.c | 15 +++++++++------ dlls/msvcrtd/tests/debug.c | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index 0472058..7e2fa0d 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -31,16 +31,19 @@ int _crtAssertBusy = -1; int _crtBreakAlloc = -1; int _crtDbgFlag = 0; -extern int _callnewh(unsigned long); +#ifdef _WIN64 +typedef unsigned __int64 MSVCRT_size_t; +#else +typedef unsigned long MSVCRT_size_t; +#endif + +extern int _callnewh(MSVCRT_size_t); /********************************************************************* * ??2(a)YAPAXIHPBDH@Z (MSVCRTD.@) */ -void * CDECL MSVCRTD_operator_new_dbg( - unsigned long nSize, - int nBlockUse, - const char *szFileName, - int nLine) +void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse, + const char *szFileName, int nLine) { void *retval = NULL; diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index fbfcdc5..a7f7db1 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -30,7 +30,7 @@ /**********************************************************************/ -static void * (*pMSVCRTD_operator_new_dbg)(unsigned long, int, const char *, int) = NULL; +static void * (*pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL; /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y)

1 0

Michael Stefaniuc : msvcrt: Replace size_t with MSVCRT_size_t.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 5f0fb8350ff1f735e2d8609b5daad875b21b2a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0fb8350ff1f735e2d8609b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 11:38:58 2009 +0200 msvcrt: Replace size_t with MSVCRT_size_t. --- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/mbcs.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2da5e26..6671f2f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2925,7 +2925,7 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) { - size_t i, len = strlen(s); + MSVCRT_size_t i, len = strlen(s); if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT)) return MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; for (i=0; i<len; i++) @@ -2939,7 +2939,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) */ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) { - size_t i, len = strlenW(s); + MSVCRT_size_t i, len = strlenW(s); if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT)) return MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; for (i=0; i<len; i++) @@ -3027,7 +3027,7 @@ int CDECL MSVCRT_putchar(int c) */ int CDECL MSVCRT_puts(const char *s) { - size_t len = strlen(s); + MSVCRT_size_t len = strlen(s); if (MSVCRT_fwrite(s,sizeof(*s),len,MSVCRT_stdout) != len) return MSVCRT_EOF; return MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; } @@ -3038,7 +3038,7 @@ int CDECL MSVCRT_puts(const char *s) int CDECL _putws(const MSVCRT_wchar_t *s) { static const MSVCRT_wchar_t nl = '\n'; - size_t len = strlenW(s); + MSVCRT_size_t len = strlenW(s); if (MSVCRT_fwrite(s,sizeof(*s),len,MSVCRT_stdout) != len) return MSVCRT_EOF; return MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a6e0cca..f738bcf 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -74,12 +74,12 @@ static MSVCRT_wchar_t msvcrt_mbc_to_wc(unsigned int ch) return chW; } -static inline size_t u_strlen( const unsigned char *str ) +static inline MSVCRT_size_t u_strlen( const unsigned char *str ) { return strlen( (const char*) str ); } -static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* src, size_t len ) +static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* src, MSVCRT_size_t len ) { return (unsigned char*)strncat( (char*)dst, (const char*)src, len); } @@ -94,12 +94,12 @@ static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 return strcasecmp( (const char*)s1, (const char*)s2 ); } -static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, size_t len ) +static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) { return strncmp( (const char*)s1, (const char*)s2, len ); } -static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, size_t len ) +static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) { return strncasecmp( (const char*)s1, (const char*)s2, len ); } @@ -124,12 +124,12 @@ static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) return (unsigned char*) _strset( (char*)s, c); } -static inline unsigned char *u__strnset( unsigned char *s, unsigned char c, size_t len ) +static inline unsigned char *u__strnset( unsigned char *s, unsigned char c, MSVCRT_size_t len ) { return (unsigned char*) _strnset( (char*)s, c, len ); } -static inline size_t u_strcspn( const unsigned char *s, const unsigned char *rej ) +static inline MSVCRT_size_t u_strcspn( const unsigned char *s, const unsigned char *rej ) { return strcspn( (const char *)s, (const char*)rej ); }

1 0

Michael Stefaniuc : msvcrt: Avoid using size_t when not neededed.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 109f83614fa1d3b180873ab98e6972a5ec7f383d URL: http://source.winehq.org/git/wine.git/?a=commit;h=109f83614fa1d3b180873ab98… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 11:39:05 2009 +0200 msvcrt: Avoid using size_t when not neededed. --- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/undname.c | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 6bc6d3d..0ed28dd 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -136,7 +136,7 @@ static void EXCEPTION_ctor(exception *_this, const char** name) _this->vtable = &MSVCRT_exception_vtable; if (*name) { - size_t name_len = strlen(*name) + 1; + unsigned int name_len = strlen(*name) + 1; _this->name = MSVCRT_malloc(name_len); memcpy(_this->name, *name, name_len); _this->do_free = TRUE; diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index a031f16..1e4eafc 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -231,7 +231,7 @@ MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } /* INTERNAL: Create a wide string from an ascii string */ MSVCRT_wchar_t *msvcrt_wstrdupa(const char *str) { - const size_t len = strlen(str) + 1 ; + const unsigned int len = strlen(str) + 1 ; MSVCRT_wchar_t *wstr = MSVCRT_malloc(len* sizeof (MSVCRT_wchar_t)); if (!wstr) return NULL; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5d6e545..3e15abd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -78,7 +78,7 @@ static const char * const _country_synonyms[] = /* INTERNAL: Map a synonym to an ISO code */ static void remap_synonym(char *name) { - size_t i; + unsigned int i; for (i = 0; i < sizeof(_country_synonyms)/sizeof(char*); i += 2 ) { if (!strcasecmp(_country_synonyms[i],name)) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 3e1be47..d825cfc 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -113,7 +113,7 @@ struct datatype_t * where we use a poor-man allocator. It's fast, and since all * allocation is pool, memory management is easy (esp. freeing). */ -static void* und_alloc(struct parsed_symbol* sym, size_t len) +static void* und_alloc(struct parsed_symbol* sym, unsigned int len) { void* ptr; @@ -233,11 +233,11 @@ static char* str_array_get_ref(struct array* cref, unsigned idx) */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) { - va_list args; - size_t len = 1, i, sz; - char* tmp; - char* p; - char* t; + va_list args; + unsigned int len = 1, i, sz; + char* tmp; + char* p; + char* t; va_start(args, format); for (i = 0; format[i]; i++) @@ -587,9 +587,9 @@ static BOOL get_class(struct parsed_symbol* sym) */ static char* get_class_string(struct parsed_symbol* sym, int start) { - int i; - size_t len, sz; - char* ret; + int i; + unsigned int len, sz; + char* ret; struct array *a = &sym->stack; for (len = 0, i = start; i < a->num; i++)

1 0

Hib Eris : msi: Add support for merging tables that are not in target database.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: ff5b29e5eb13366593418368afde918bc09ff947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5b29e5eb13366593418368a… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue May 26 22:32:24 2009 +0200 msi: Add support for merging tables that are not in target database. --- dlls/msi/database.c | 288 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 12 +- 2 files changed, 236 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff5b29e5eb13366593418…

1 0

Detlef Riekenberg : mlang/tests: Use a table for testing GetLcidFromRfc1766 .
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 7317a96616123a841e6d8e2be7e24f0b0b1ff345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7317a96616123a841e6d8e2be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 22:54:57 2009 +0200 mlang/tests: Use a table for testing GetLcidFromRfc1766. --- dlls/mlang/tests/mlang.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0f51df0..939f318 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -48,6 +48,19 @@ static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT); static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT); +typedef struct lcid_tag_table { + LPCSTR rfc1766; + LCID lcid; + HRESULT hr; +} lcid_table_entry; + +static const lcid_table_entry lcid_table[] = { + {"en", 9, S_OK}, /* only en is special (using PRIMARYLANGID) */ + {"en-gb", 0x809, S_OK}, + {"en-us", 0x409, S_OK} + +}; + static BOOL init_function_ptrs(void) { @@ -832,19 +845,33 @@ static void test_rfc1766(IMultiLanguage2 *iML2) static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) { + WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; LCID lcid; HRESULT ret; + DWORD i; static WCHAR e[] = { 'e',0 }; static WCHAR en[] = { 'e','n',0 }; static WCHAR empty[] = { 0 }; static WCHAR dash[] = { '-',0 }; static WCHAR e_dash[] = { 'e','-',0 }; - static WCHAR en_gb[] = { 'e','n','-','g','b',0 }; - static WCHAR en_us[] = { 'e','n','-','u','s',0 }; static WCHAR en_them[] = { 'e','n','-','t','h','e','m',0 }; static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; + + for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + lcid = -1; + MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); + + ok(ret == lcid_table[i].hr, + "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); + + ok(lcid == lcid_table[i].lcid, + "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); + } + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, NULL, en); ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); @@ -887,19 +914,6 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); } - lcid = 0; - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 9, "got wrong lcid: %04x\n", lcid); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_gb); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 0x809, "got wrong lcid: %04x\n", lcid); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_us); - ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); - ok(lcid == 0x409, "got wrong lcid: %04x\n", lcid); } static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2)

1 0

Detlef Riekenberg : mlang/tests: Initial tests for Rfc1766ToLcid.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 7bc167ac153d792862ead54372bd26695bbc6b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc167ac153d792862ead5437… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 23:06:25 2009 +0200 mlang/tests: Initial tests for Rfc1766ToLcid. --- dlls/mlang/tests/Makefile.in | 2 +- dlls/mlang/tests/mlang.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in index 1a5aceb..ed8d9b7 100644 --- a/dlls/mlang/tests/Makefile.in +++ b/dlls/mlang/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mlang.dll -IMPORTS = oleaut32 ole32 gdi32 kernel32 +IMPORTS = mlang oleaut32 ole32 gdi32 kernel32 CTESTS = \ mlang.c diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 939f318..df2ecb7 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -916,6 +916,28 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) } +static void test_Rfc1766ToLcid(void) +{ + LCID lcid; + HRESULT ret; + DWORD i; + + for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + lcid = -1; + ret = Rfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); + + ok(ret == lcid_table[i].hr, + "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); + + + ok(lcid == lcid_table[i].lcid, + "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); + + } + +} + + static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) { HRESULT hr; @@ -1502,6 +1524,8 @@ START_TEST(mlang) return; CoInitialize(NULL); + test_Rfc1766ToLcid(); + ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMultiLanguage2, (void **)&iML2); if (ret != S_OK || !iML2) return;

1 0

Detlef Riekenberg : mlang/tests: Return correct result in Rfc1766ToLcidA on failure.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: f4def21f57df4c3d33ff975e82f3020d01000714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4def21f57df4c3d33ff975e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 23:17:46 2009 +0200 mlang/tests: Return correct result in Rfc1766ToLcidA on failure. --- dlls/mlang/mlang.c | 3 +++ dlls/mlang/tests/mlang.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 5deb87b..bd6a7f5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1238,6 +1238,9 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) { WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; + if (!rfc1766A) + return E_INVALIDARG; + MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME); rfc1766W[MAX_RFC1766_NAME] = 0; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index df2ecb7..d39e0e3 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -935,6 +935,12 @@ static void test_Rfc1766ToLcid(void) } + ret = Rfc1766ToLcidA(&lcid, NULL); + ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + + ret = Rfc1766ToLcidA(NULL, "en"); + ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + }

1 0

Detlef Riekenberg : mlang/tests: Rfc1766ToLcid must not touch the LCID output on failure.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 98435dc7ed6b90ea6802864e79b74875eb8d3664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98435dc7ed6b90ea6802864e7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 26 23:34:44 2009 +0200 mlang/tests: Rfc1766ToLcid must not touch the LCID output on failure. --- dlls/mlang/mlang.c | 2 -- dlls/mlang/tests/mlang.c | 21 +++++---------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bd6a7f5..14122c8 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1222,8 +1222,6 @@ HRESULT WINAPI Rfc1766ToLcidW(LCID *pLocale, LPCWSTR pszRfc1766) if (!pLocale || !pszRfc1766) return E_INVALIDARG; - *pLocale = 0; - hr = EnumRfc1766_create(0, &enumrfc1766); if (FAILED(hr)) return hr; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index d39e0e3..b0b4743 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -55,6 +55,11 @@ typedef struct lcid_tag_table { } lcid_table_entry; static const lcid_table_entry lcid_table[] = { + {"e", -1, E_FAIL}, + {"", -1, E_FAIL}, + {"-", -1, E_FAIL}, + {"e-", -1, E_FAIL}, + {"en", 9, S_OK}, /* only en is special (using PRIMARYLANGID) */ {"en-gb", 0x809, S_OK}, {"en-us", 0x409, S_OK} @@ -850,11 +855,7 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) HRESULT ret; DWORD i; - static WCHAR e[] = { 'e',0 }; static WCHAR en[] = { 'e','n',0 }; - static WCHAR empty[] = { 0 }; - static WCHAR dash[] = { '-',0 }; - static WCHAR e_dash[] = { 'e','-',0 }; static WCHAR en_them[] = { 'e','n','-','t','h','e','m',0 }; static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; @@ -878,18 +879,6 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, NULL); ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, e); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, empty); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, dash); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); - - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, e_dash); - ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); - ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_them); ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08x\n", ret); if (ret == S_FALSE)

1 0