December 2015 - Wine-Commits

Nikolay Sivov : ole32: Simplify OleRegGetMiscStatus() using existing helper, use read-only key permissions.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 1219abfd8c9727d27d1545e6dbaa0f8aec211e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1219abfd8c9727d27d1545e6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:36:11 2015 +0300 ole32: Simplify OleRegGetMiscStatus() using existing helper, use read-only key permissions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 40cb5b9..f28b9d0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -873,21 +873,13 @@ HRESULT WINAPI OleRegGetMiscStatus( { static const WCHAR miscstatusW[] = {'M','i','s','c','S','t','a','t','u','s',0}; static const WCHAR dfmtW[] = {'%','d',0}; - WCHAR keyName[60]; - HKEY clsidKey; + WCHAR keyName[16]; HKEY miscStatusKey; HKEY aspectKey; LONG result; + HRESULT hr; - /* - * Build the key name we're looking for - */ - sprintfW( keyName, clsidfmtW, - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); - - TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); + TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwAspect, pdwStatus); if (!pdwStatus) return E_INVALIDARG; @@ -895,26 +887,11 @@ HRESULT WINAPI OleRegGetMiscStatus( if (actctx_get_miscstatus(clsid, dwAspect, pdwStatus)) return S_OK; - /* - * Open the class id Key - */ - result = open_classes_key(HKEY_CLASSES_ROOT, keyName, MAXIMUM_ALLOWED, &clsidKey); - if (result != ERROR_SUCCESS) - return REGDB_E_CLASSNOTREG; - - /* - * Get the MiscStatus - */ - result = open_classes_key(clsidKey, miscstatusW, MAXIMUM_ALLOWED, &miscStatusKey); - if (result != ERROR_SUCCESS) - { - RegCloseKey(clsidKey); - return S_OK; - } + hr = COM_OpenKeyForCLSID(clsid, miscstatusW, KEY_READ, &miscStatusKey); + if (FAILED(hr)) + /* missing key is not a failure */ + return hr == REGDB_E_KEYMISSING ? S_OK : hr; - /* - * Read the default value - */ OLEUTL_ReadRegistryDWORDValue(miscStatusKey, pdwStatus); /* @@ -922,19 +899,14 @@ HRESULT WINAPI OleRegGetMiscStatus( */ sprintfW(keyName, dfmtW, dwAspect); - result = open_classes_key(miscStatusKey, keyName, MAXIMUM_ALLOWED, &aspectKey); + result = open_classes_key(miscStatusKey, keyName, KEY_READ, &aspectKey); if (result == ERROR_SUCCESS) { OLEUTL_ReadRegistryDWORDValue(aspectKey, pdwStatus); RegCloseKey(aspectKey); } - /* - * Cleanup - */ RegCloseKey(miscStatusKey); - RegCloseKey(clsidKey); - return S_OK; }

1 0

Nikolay Sivov : msxml3: Clear request headers on Open().
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: f6bfc309ed5fa911c08db41bc30045f3bb693fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bfc309ed5fa911c08db41bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:43:15 2015 +0300 msxml3: Clear request headers on Open(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index aab41f7..e0f08ea 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -176,6 +176,19 @@ static void free_response_headers(httprequest *This) This->raw_respheaders = NULL; } +static void free_request_headers(httprequest *This) +{ + struct httpheader *header, *header2; + + LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct httpheader, entry) + { + list_remove(&header->entry); + SysFreeString(header->header); + SysFreeString(header->value); + heap_free(header); + } +} + struct BindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; @@ -888,6 +901,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, SysFreeString(This->user); SysFreeString(This->password); This->user = This->password = NULL; + free_request_headers(This); if (!strcmpiW(method, MethodGetW)) { @@ -1273,8 +1287,6 @@ static HRESULT httprequest_put_onreadystatechange(httprequest *This, IDispatch * static void httprequest_release(httprequest *This) { - struct httpheader *header, *header2; - if (This->site) IUnknown_Release( This->site ); if (This->uri) @@ -1286,15 +1298,8 @@ static void httprequest_release(httprequest *This) SysFreeString(This->user); SysFreeString(This->password); - /* request headers */ - LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct httpheader, entry) - { - list_remove(&header->entry); - SysFreeString(header->header); - SysFreeString(header->value); - heap_free(header); - } - /* response headers */ + /* cleanup headers lists */ + free_request_headers(This); free_response_headers(This); SysFreeString(This->status_text);

1 0

Alex Henrie : kernel32: Add TRACE to SetCommState.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 60226ee37de52b470b98efa13f9a5e065cedc77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60226ee37de52b470b98efa13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 18 21:51:21 2015 -0700 kernel32: Add TRACE to SetCommState. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 1c6f1af..f6c1270 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -808,6 +808,8 @@ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) SERIAL_CHARS sc; DWORD dwBytesReturned; + TRACE("handle %p, ptr %p\n", handle, lpdcb); + if (lpdcb == NULL) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Nikolay Sivov : ole32: Fix parameter validation for CoGetMalloc().
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 12d73316e475202803680a59ab60939d234120f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d73316e475202803680a59a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:36:45 2015 +0300 ole32: Fix parameter validation for CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 15 ++++++++++----- dlls/ole32/tests/compobj.c | 15 +++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 696a7b8..18fd1fd 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -368,17 +368,22 @@ static const IMallocVtbl VT_IMalloc32 = * Retrieves the current IMalloc interface for the process. * * PARAMS - * dwMemContext [I] - * lpMalloc [O] Address where memory allocator object will be stored. + * context [I] Should always be MEMCTX_TASK. + * imalloc [O] Address where memory allocator object will be stored. * * RETURNS * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) +HRESULT WINAPI CoGetMalloc(DWORD context, IMalloc **imalloc) { - *lpMalloc = &Malloc32.IMalloc_iface; - return S_OK; + if (context != MEMCTX_TASK) { + *imalloc = NULL; + return E_INVALIDARG; + } + + *imalloc = &Malloc32.IMalloc_iface; + return S_OK; } /*********************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 10eb2fa..1913e1f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2629,34 +2629,29 @@ if (0) /* crashes on native */ imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(0, &imalloc); -todo_wine { ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(imalloc == NULL, "got %p\n", imalloc); -} + imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(MEMCTX_SHARED, &imalloc); -todo_wine { ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(imalloc == NULL, "got %p\n", imalloc); -} + imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(MEMCTX_MACSYSTEM, &imalloc); -todo_wine { ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(imalloc == NULL, "got %p\n", imalloc); -} + imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(MEMCTX_UNKNOWN, &imalloc); -todo_wine { ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(imalloc == NULL, "got %p\n", imalloc); -} + imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(MEMCTX_SAME, &imalloc); -todo_wine { ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(imalloc == NULL, "got %p\n", imalloc); -} + imalloc = NULL; hr = CoGetMalloc(MEMCTX_TASK, &imalloc); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DefaultIPGateway.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: ee81036a16dc6d0c1ab49c28d9b0810066221971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee81036a16dc6d0c1ab49c28d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:38 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DefaultIPGateway. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 53 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8642e3f..345437d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -165,6 +165,8 @@ static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_datawidthW[] = {'D','a','t','a','W','i','d','t','h',0}; +static const WCHAR prop_defaultipgatewayW[] = + {'D','e','f','a','u','l','t','I','P','G','a','t','e','w','a','y',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = @@ -471,6 +473,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, @@ -862,12 +865,13 @@ struct record_networkadapter }; struct record_networkadapterconfig { - const WCHAR *description; - const WCHAR *dnshostname; - UINT32 index; - UINT32 ipconnectionmetric; - int ipenabled; - const WCHAR *mac_address; + const struct array *defaultipgateway; + const WCHAR *description; + const WCHAR *dnshostname; + UINT32 index; + UINT32 ipconnectionmetric; + int ipenabled; + const WCHAR *mac_address; }; struct record_operatingsystem { @@ -2112,6 +2116,38 @@ static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) 0, NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } +static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) +{ + IP_ADAPTER_GATEWAY_ADDRESS *gateway; + struct array *ret; + ULONG buflen, i = 0, count = 0; + WCHAR **ptr, buf[54]; /* max IPv6 address length */ + + if (!list) return NULL; + for (gateway = list; gateway; gateway = gateway->Next) count++; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + { + heap_free( ret ); + return NULL; + } + for (gateway = list; gateway; gateway = gateway->Next) + { + buflen = sizeof(buf)/sizeof(buf[0]); + if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, + NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) + { + for (; i > 0; i--) heap_free( ptr[i - 1] ); + heap_free( ptr ); + heap_free( ret ); + return NULL; + } + } + ret->count = count; + ret->ptr = ptr; + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2121,11 +2157,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2144,6 +2180,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex;

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.Description.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 9982b16837397cdacabb87823c6586936994afe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9982b16837397cdacabb87823… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:37 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.Description. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b7db266..8642e3f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -471,6 +471,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, @@ -861,6 +862,7 @@ struct record_networkadapter }; struct record_networkadapterconfig { + const WCHAR *description; const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; @@ -2142,6 +2144,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->description = heap_strdupW( aa->Description ); rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Nikolay Sivov : msvcrt: Fix cwscanf* prototypes.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 7e86ab3df61589509feb20363920b45285646a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e86ab3df61589509feb20363… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 01:14:29 2015 +0300 msvcrt: Fix cwscanf* prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/scanf.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index a19d450..8c9cd87 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -550,7 +550,7 @@ int CDECL _cscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) /********************************************************************* * _cwscanf (MSVCRT.@) */ -int CDECL _cwscanf(const char *format, ...) +int CDECL _cwscanf(const MSVCRT_wchar_t *format, ...) { __ms_va_list valist; int res; @@ -564,7 +564,7 @@ int CDECL _cwscanf(const char *format, ...) /********************************************************************* * _cwscanf_l (MSVCRT.@) */ -int CDECL _cwscanf_l(const char *format, MSVCRT__locale_t locale, ...) +int CDECL _cwscanf_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) { __ms_va_list valist; int res; @@ -578,7 +578,7 @@ int CDECL _cwscanf_l(const char *format, MSVCRT__locale_t locale, ...) /********************************************************************* * _cwscanf_s (MSVCRT.@) */ -int CDECL _cwscanf_s(const char *format, ...) +int CDECL _cwscanf_s(const MSVCRT_wchar_t *format, ...) { __ms_va_list valist; int res; @@ -592,7 +592,7 @@ int CDECL _cwscanf_s(const char *format, ...) /********************************************************************* * _cwscanf_s_l (MSVCRT.@) */ -int CDECL _cwscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) +int CDECL _cwscanf_s_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) { __ms_va_list valist; int res; diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 5bf91a6..b2e6bd7 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -52,9 +52,9 @@ #define _UNLOCK_FILE_(file) MSVCRT__unlock_file(MSVCRT_stdin) #ifdef WIDE_SCANF #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #ifdef SECURE

1 0

André Hentschel : winmm: Respect return value from joyGetPos (Coverity).
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 64f600fe2266f964c912eb4d08a6fc1247a47eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f600fe2266f964c912eb4d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:52 2015 +0100 winmm: Respect return value from joyGetPos (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 6ac67f4..8a52942 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -84,6 +84,7 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi { int i; WINE_JOYSTICK* joy; + MMRESULT res; JOYINFO ji; LONG pos; unsigned buttonChange; @@ -93,7 +94,12 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi if (joy->hCapture != hWnd) continue; - joyGetPos(i, &ji); + res = joyGetPos(i, &ji); + if (res != JOYERR_NOERROR) { + WARN("joyGetPos failed: %08x\n", res); + continue; + } + pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged ||

1 0

Nikolay Sivov : msvcrt: Fix char to int promotion that breaks pattern lookup.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: d99727bcb3f211b39421b1d738a3d3165fb82d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99727bcb3f211b39421b1d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 01:14:28 2015 +0300 msvcrt: Fix char to int promotion that breaks pattern lookup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 8 ++++++++ dlls/msvcrt/tests/scanf.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 9322704..5bf91a6 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -68,7 +68,11 @@ #undef _EOF_ #define _EOF_ 0 #ifdef STRING_LEN +#ifdef WIDE_CHAR #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) +#else /* WIDE_CHAR */ +#define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) +#endif /* WIDE_CHAR */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -86,7 +90,11 @@ #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ +#ifdef WIDE_CHAR #define _GETC_(file) (consumed++, *file++) +#else /* WIDE_CHAR */ +#define _GETC_(file) (consumed++, (unsigned char)*file++) +#endif /* WIDE_CHAR */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 3c5a05e..6cb85fa 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -244,6 +244,13 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far); ok(ret == 2, "Wrong number of arguments read: %d\n", ret); ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); + + buffer[0] = 0; + buffer1[0] = 0; + ret = sscanf("test=value\xda", "%[^=] = %[^;]", buffer, buffer1); + ok(ret == 2, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "buf %s\n", buffer); + ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); } static void test_sscanf_s(void)

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 05b623e7749cc33c7078dfdc38f91d744612e1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b623e7749cc33c7078dfdc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 01:23:25 2015 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 81e39d5..905394c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-18 20:30+0300\n" +"PO-Revision-Date: 2015-12-23 01:22+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -1042,7 +1042,7 @@ msgstr "Выберите папку" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Размер шрифта должен быть числом." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Sebastian Lackner : tools: Remove redundant check for request size in make_requests.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 6d2169649e7d6dd5eb84a7eb4ae1ca57db9daedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2169649e7d6dd5eb84a7eb4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 23 03:09:39 2015 +0100 tools: Remove redundant check for request size in make_requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_requests | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/make_requests b/tools/make_requests index bceef70..6e4a537 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -171,7 +171,6 @@ sub PARSE_REQUESTS() print SERVER_PROT "};\n"; print SERVER_PROT "struct ${name}_reply\n{\n"; print SERVER_PROT " struct reply_header __header;\n"; - die "request $name too large ($offset)" if ($offset > $max_req_size); $offset = 8; $state++; next;

1 0

André Hentschel : msvcrt: Don' t continue on demangle failure (Coverity).
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 51098fcd94457b46945a03131c4cd1f049682d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51098fcd94457b46945a03131… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:35:04 2015 +0100 msvcrt: Don't continue on demangle failure (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index beaec4f..097f036 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1379,6 +1379,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

Jactry Zeng : riched32/tests: Test EM_GETTEXTRANGE with multibyte character.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 4871b0236bca93e33b8e89bbdf18471f264cbf4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4871b0236bca93e33b8e89bbd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:42 2015 +0800 riched32/tests: Test EM_GETTEXTRANGE with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index ff37750..e200ff3 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -566,6 +566,18 @@ static void test_EM_GETTEXTRANGE(void) ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

Hans Leidekker : dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: e10c48143aadc9fbec7677847d3d9eab66bf441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10c48143aadc9fbec7677847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:05:30 2015 +0100 dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 6 +++--- dlls/dnsapi/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/name.c | 21 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 4f6f1c8..de0ed1d 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -32,9 +32,9 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFlushResolverCacheEntry_A(str) +@ stdcall DnsFlushResolverCacheEntry_UTF8(str) +@ stdcall DnsFlushResolverCacheEntry_W(wstr) @ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index d4f716a..93528a2 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -93,6 +93,38 @@ VOID WINAPI DnsFlushResolverCache(void) FIXME(": stub\n"); } +/****************************************************************************** + * DnsFlushResolverCacheEntry_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_A( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_UTF8 [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_UTF8( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_w(entry) ); + if (!entry) return FALSE; + return TRUE; +} /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fba6955..3e54355 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -27,6 +27,8 @@ #include "wine/test.h" +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); + static const struct { LPCSTR name; @@ -202,8 +204,27 @@ static void test_DnsNameCompare_A( void ) ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); + test_DnsFlushResolverCacheEntry_A(); }

1 0

Hans Leidekker : wbemdisp: Calculate the object count returned from ISWbemObjectSet:: get_Count just once.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 4cce8cbd5f300edc59bc0d79fea5ee1f662b13df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cce8cbd5f300edc59bc0d79f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:06:57 2015 +0100 wbemdisp: Calculate the object count returned from ISWbemObjectSet::get_Count just once. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 3465eb1..d1f2609 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -356,6 +356,7 @@ struct objectset ISWbemObjectSet ISWbemObjectSet_iface; LONG refs; IEnumWbemClassObject *objectenum; + LONG count; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -517,20 +518,10 @@ static HRESULT WINAPI objectset_get_Count( LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; - - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; - - count = total - count; - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); - - *iCount = total; + *iCount = objectset->count; return S_OK; } @@ -567,6 +558,14 @@ static const ISWbemObjectSetVtbl objectset_vtbl = objectset_ItemIndex }; +static LONG get_object_count( IEnumWbemClassObject *iter ) +{ + LONG count = 0; + while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -578,6 +577,7 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW objectset->refs = 1; objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); + objectset->count = get_object_count( objectset->objectenum ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: dd04d232d3610bb5c8d7734ab3c38604091cb4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd04d232d3610bb5c8d7734ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:40 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 345437d..baa161b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -173,6 +173,8 @@ static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; +static const WCHAR prop_dhcpenabledW[] = + {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = @@ -475,6 +477,7 @@ static const struct column col_networkadapterconfig[] = { { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dhcpenabledW, CIM_BOOLEAN }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, @@ -867,6 +870,7 @@ struct record_networkadapterconfig { const struct array *defaultipgateway; const WCHAR *description; + int dhcpenabled; const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; @@ -2182,6 +2186,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec = (struct record_networkadapterconfig *)(table->data + offset); rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); + rec->dhcpenabled = -1; rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Riccardo Bortolato : ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority ().
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 97f0345f71679570d4eedb4ab750158d1a80001c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f0345f71679570d4eedb4ab… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Dec 21 18:38:39 2015 +0100 ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c303ed0..8a91d4b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2377,9 +2377,12 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) + || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) + || ((surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + && !(surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_POSITIVEX))) { - WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); + WARN("Called on non-managed texture, mipmap sublevel or non +X toplevel surface, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; } else

1 0

André Hentschel : mmdevapi: Skip device if GetId fails (Coverity).
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: bbc42a2341c9eb3181d3b9e845bb3c551667a95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc42a2341c9eb3181d3b9e84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:46 2015 +0100 mmdevapi: Skip device if GetId fails (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d50d206..e63a199 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1065,9 +1065,15 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { + HRESULT hr; WCHAR *str; dev = &MMDevice_head[i]->IMMDevice_iface; - IMMDevice_GetId(dev, &str); + hr = IMMDevice_GetId(dev, &str); + if (FAILED(hr)) + { + WARN("GetId failed: %08x\n", hr); + continue; + } if (str && !lstrcmpW(str, name)) {

1 0

Hans Leidekker : wbemprox: Set correct variant type if array property value is NULL.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 086a1a4ed2cf776c01130c02a13565fff9cbcf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1a4ed2cf776c01130c02a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:39 2015 +0100 wbemprox: Set correct variant type if array property value is NULL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7fedf89..53e1044 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -841,7 +841,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK; val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); - if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; + if (!val_ptr) vartype = VT_NULL; + else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; goto done; } switch (view->table->columns[column].type & COL_TYPE_MASK)

1 0

Hans Leidekker : qmgr: Use the full path for HTTP downloads.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 69d0764196506da7405a401c1feb0216b278ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d0764196506da7405a401c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:04:57 2015 +0100 qmgr: Use the full path for HTTP downloads. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 70d3a50..2525caf 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -477,7 +477,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; - WCHAR host[MAX_PATH], path[MAX_PATH]; + WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; BOOL ret; @@ -519,10 +519,8 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszHostName = host; uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); uc.nPort = 0; - uc.lpszUrlPath = path; - uc.dwUrlPathLength = sizeof(path)/sizeof(path[0]); - uc.lpszExtraInfo = NULL; - uc.dwExtraInfoLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) {

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.SettingID.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: fafab917517bc76909d9a24383531710be92139a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fafab917517bc76909d9a2438… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:42 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.SettingID. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 3b17afb..f411898 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d20ef82..a3cf673 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -305,6 +305,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_settingidW[] = + {'S','e','t','t','i','n','g','I','D',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = @@ -485,7 +487,8 @@ static const struct column col_networkadapterconfig[] = { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_settingidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -880,6 +883,7 @@ struct record_networkadapterconfig UINT32 ipconnectionmetric; int ipenabled; const WCHAR *mac_address; + const WCHAR *settingid; }; struct record_operatingsystem { @@ -2189,6 +2193,17 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li ret->ptr = ptr; return ret; } +static WCHAR *get_settingid( UINT32 index ) +{ + GUID guid; + WCHAR *ret, *str; + memset( &guid, 0, sizeof(guid) ); + guid.Data1 = index; + UuidToStringW( &guid, &str ); + ret = heap_strdupW( str ); + RpcStringFreeW( &str ); + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2230,6 +2245,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec->ipconnectionmetric = 20; rec->ipenabled = -1; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->settingid = get_settingid( rec->index ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSServerSearchOrder.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 0c38f7083e84b26eeff33747c085a00a2dcb0586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c38f7083e84b26eeff33747c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:41 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSServerSearchOrder. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 70 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index baa161b..d20ef82 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -183,6 +183,8 @@ static const WCHAR prop_diskindexW[] = {'D','i','s','k','I','n','d','e','x',0}; static const WCHAR prop_dnshostnameW[] = {'D','N','S','H','o','s','t','N','a','m','e',0}; +static const WCHAR prop_dnsserversearchorderW[] = + {'D','N','S','S','e','r','v','e','r','S','e','a','r','c','h','O','r','d','e','r',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -475,14 +477,15 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { - { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_dhcpenabledW, CIM_BOOLEAN }, - { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, - { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, - { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dhcpenabledW, CIM_BOOLEAN }, + { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dnsserversearchorderW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, + { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -872,6 +875,7 @@ struct record_networkadapterconfig const WCHAR *description; int dhcpenabled; const WCHAR *dnshostname; + const struct array *dnsserversearchorder; UINT32 index; UINT32 ipconnectionmetric; int ipenabled; @@ -2152,6 +2156,39 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) ret->ptr = ptr; return ret; } +static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *list ) +{ + IP_ADAPTER_DNS_SERVER_ADDRESS *server; + struct array *ret; + ULONG buflen, i = 0, count = 0; + WCHAR **ptr, *p, buf[54]; /* max IPv6 address length */ + + if (!list) return NULL; + for (server = list; server; server = server->Next) count++; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + { + heap_free( ret ); + return NULL; + } + for (server = list; server; server = server->Next) + { + buflen = sizeof(buf)/sizeof(buf[0]); + if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, + NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) + { + for (; i > 0; i--) heap_free( ptr[i - 1] ); + heap_free( ptr ); + heap_free( ret ); + return NULL; + } + if ((p = strrchrW( ptr[i - 1], ':' ))) *p = 0; + } + ret->count = count; + ret->ptr = ptr; + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2184,14 +2221,15 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); - rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); - rec->description = heap_strdupW( aa->Description ); - rec->dhcpenabled = -1; - rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); - rec->index = aa->u.s.IfIndex; - rec->ipconnectionmetric = 20; - rec->ipenabled = -1; - rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); + rec->description = heap_strdupW( aa->Description ); + rec->dhcpenabled = -1; + rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); + rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress ); + rec->index = aa->u.s.IfIndex; + rec->ipconnectionmetric = 20; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Hans Leidekker : wbemprox: Support string literals in comparisons with integer properties.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: df42519cb220877783b8be753660358c951efa27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df42519cb220877783b8be753… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:36 2015 +0100 wbemprox: Support string literals in comparisons with integer properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 74 +++++++++++++++++++++++++++++++++++++++++---- dlls/wbemprox/tests/query.c | 7 ++++- dlls/wbemprox/wql.y | 12 +++----- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f01155a..7fedf89 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -108,10 +108,31 @@ static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGL return S_OK; } -static inline BOOL is_strcmp( const struct complex_expr *expr ) +static BOOL is_int( CIMTYPE type ) { - return ((expr->left->type == EXPR_PROPVAL && expr->right->type == EXPR_SVAL) || - (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); + switch (type) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + return TRUE; + default: + return FALSE; + } +} + +static inline BOOL is_strcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if ((ltype == CIM_STRING || is_int( ltype )) && expr->left->type == EXPR_PROPVAL && + expr->right->type == EXPR_SVAL) return TRUE; + else if ((rtype == CIM_STRING || is_int( rtype )) && expr->right->type == EXPR_PROPVAL && + expr->left->type == EXPR_SVAL) return TRUE; + return FALSE; } static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) @@ -186,6 +207,41 @@ static UINT resolve_type( UINT left, UINT right ) return CIM_ILLEGAL; } +static const WCHAR *format_int( WCHAR *buf, CIMTYPE type, LONGLONG val ) +{ + static const WCHAR fmt_signedW[] = {'%','d',0}; + static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; + static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; + + switch (type) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + sprintfW( buf, fmt_signedW, val ); + return buf; + + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + sprintfW( buf, fmt_unsignedW, val ); + return buf; + + case CIM_SINT64: + wsprintfW( buf, fmt_signed64W, val ); + return buf; + + case CIM_UINT64: + wsprintfW( buf, fmt_unsigned64W, val ); + return buf; + + default: + ERR( "unhandled type %u\n", type ); + return NULL; + } +} + static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, LONGLONG *val, UINT *type ) { @@ -202,10 +258,16 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co if (is_boolcmp( expr, ltype, rtype )) return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); - if (is_strcmp( expr )) + if (is_strcmp( expr, ltype, rtype )) { - const WCHAR *lstr = (const WCHAR *)(INT_PTR)lval; - const WCHAR *rstr = (const WCHAR *)(INT_PTR)rval; + const WCHAR *lstr, *rstr; + WCHAR lbuf[21], rbuf[21]; + + if (is_int( ltype )) lstr = format_int( lbuf, ltype, lval ); + else lstr = (const WCHAR *)(INT_PTR)lval; + + if (is_int( rtype )) rstr = format_int( rbuf, ltype, rval ); + else rstr = (const WCHAR *)(INT_PTR)rval; return eval_strcmp( expr->op, lstr, rstr, val ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 3138c7a..9dc0db4 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -102,7 +102,12 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', 'L','I','K','E',' ','"','%','f','i','r','e','f','o','x','.','e','x','e','"',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10 }; + static const WCHAR query11[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', + 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, + query11 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 734c4da..98b0378 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -647,15 +647,13 @@ static int get_token( const WCHAR *s, int *token ) return 1; case '\"': case '\'': + for (i = 1; s[i]; i++) { - for (i = 1; s[i]; i++) - { - if (s[i] == s[0]) break; - } - if (s[i]) i++; - *token = TK_STRING; - return i; + if (s[i] == s[0]) break; } + if (s[i]) i++; + *token = TK_STRING; + return i; case '.': if (!isdigitW( s[1] )) {

1 0

Hans Leidekker : winhttp: Don' t drain content until authorization is handled successfully.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: d3f7519035966dc07d71599262f27e2775411fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f7519035966dc07d7159926… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:06:01 2015 +0100 winhttp: Don't drain content until authorization is handled successfully. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/tests/winhttp.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79a319a..b2b72c7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2421,8 +2421,8 @@ static BOOL receive_response( request_t *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; - drain_content( request ); if (!handle_authorization( request, status )) break; + drain_content( request ); /* recurse synchronously */ if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; @@ -3062,7 +3062,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials( DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ DWORD err = ERROR_SUCCESS; - TRACE("%p, %s, %p\n", request, debugstr_w(username), password); + TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password, flags); EnterCriticalSection( &request->cs ); if (request->state < REQUEST_STATE_OPEN) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9442085..d676dd8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2317,9 +2317,7 @@ static void test_basic_authentication(int port) ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); if (ret) { -todo_wine ok(size == 12, "expected 12, got %u\n", size); -todo_wine ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); } @@ -3651,7 +3649,6 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); -todo_wine ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response );

1 0

Jactry Zeng : riched32/tests: Test WM_GETTEXTLENGTH with multibyte character.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 439e9c6a31422fa3c4d336d5f7d6c1e54d890b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439e9c6a31422fa3c4d336d5f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:39 2015 +0800 riched32/tests: Test WM_GETTEXTLENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 62c0d00..c299348 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -130,22 +130,33 @@ static void test_WM_SETTEXT(void) static void test_WM_GETTEXTLENGTH(void) { HWND hwndRichEdit = new_richedit(NULL); - static const char text3[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; - static const char text4[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; int result; /* Test for WM_GETTEXTLENGTH */ - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text3), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text3)); + ok(result == lstrlenA(text1), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text1)); - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text4); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text4), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text4)); + ok(result == lstrlenA(text2), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } DestroyWindow(hwndRichEdit); }

1 0