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

Jactry Zeng : riched20/tests: Add tests for WM_GETTEXTLENGTH.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: bb5974987e66de2386d45f87c75912aae233f3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5974987e66de2386d45f87c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:19 2015 +0800 riched20/tests: Add tests for WM_GETTEXTLENGTH. 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/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bfd9ba5..8e93ba8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8241,6 +8241,37 @@ static void test_alignment_style(void) DestroyWindow(richedit); } +static void test_WM_GETTEXTLENGTH(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + 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; + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text1), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text1)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text2), "WM_GETTEXTLENGTH returned %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); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -8285,6 +8316,7 @@ START_TEST( editor ) test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); + test_WM_GETTEXTLENGTH(); test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY();

1 0

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

Dec. 23, 2015

Module: wine Branch: master Commit: 2226358773b2c268d8e8c3de0571308622acd9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2226358773b2c268d8e8c3de0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:11 2015 +0800 riched32/tests: Test EM_GETSELTEXT 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 | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index e200ff3..62c0d00 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -596,17 +596,27 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 12); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 8, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect1, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - - ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect2, buffer), "EM_GETSELTEXT 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"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

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

Dec. 23, 2015

Module: wine Branch: master Commit: 30049ba798ab9c758f6f7c0bfca22ef82c5b8366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30049ba798ab9c758f6f7c0bf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:54 2015 +0800 riched20/tests: Test EM_GETSELTEXT 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/riched20/tests/editor.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index dabe104..bfd9ba5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1571,15 +1571,27 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect, buffer), "EM_GETSELTEXT 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"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

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

Dec. 23, 2015

Module: wine Branch: master Commit: fb304e0e4e5594c327482e8f1b5eeed01ee72bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb304e0e4e5594c327482e8f1… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:13:16 2015 +0800 riched20/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/riched20/tests/editor.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1b2a257..dabe104 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1542,6 +1542,19 @@ static void test_EM_GETTEXTRANGE(void) ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(text2, 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); + todo_wine ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } + DestroyWindow(hwndRichEdit); }

1 0

Riccardo Bortolato : ddraw7/tests: Test GetPriority() on cubemap surfaces.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: b0d4502c29941c31108a53d6c23f9e23196fb7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d4502c29941c31108a53d6c… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Dec 21 18:38:40 2015 +0100 ddraw7/tests: Test GetPriority() on cubemap surfaces. 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/tests/ddraw7.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 577ee42..0fd6999 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8436,7 +8436,10 @@ static void test_lost_device(void) static void test_resource_priority(void) { IDirectDrawSurface7 *surface, *mipmap; + D3DDEVICEDESC7 device_desc; DDSURFACEDESC2 surface_desc; + IDirect3D7 *d3d; + IDirect3DDevice7 *device; IDirectDraw7 *ddraw; ULONG refcount; HWND window; @@ -8460,16 +8463,28 @@ static void test_resource_priority(void) {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, "sysmem texture", DDERR_INVALIDPARAMS, FALSE}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DD_OK, FALSE}, {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_TEXTUREMANAGE, + "cubemap", DD_OK, FALSE}, {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, "vidmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, "sysmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); memset(&hal_caps, 0, sizeof(hal_caps)); hal_caps.dwSize = sizeof(hal_caps); @@ -8490,6 +8505,12 @@ static void test_resource_priority(void) surface_desc.dwWidth = 32; surface_desc.dwHeight = 32; surface_desc.ddsCaps.dwCaps = test_data[i].caps; + if ((test_data[i].caps2 & DDSCAPS2_CUBEMAP) + && !(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Device does not support cubemaps.\n"); + continue; + } surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); if (is_ddraw64 && (test_data[i].caps & DDSCAPS_TEXTURE)) @@ -8526,6 +8547,20 @@ static void test_resource_priority(void) ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); } + if (test_data[i].caps2 & DDSCAPS2_CUBEMAP) + { + caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); + /* IDirectDrawSurface7_SetPriority crashes when called on non-positive X surfaces on Windows */ + hr = IDirectDrawSurface7_GetPriority(mipmap, &priority); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + + IDirectDrawSurface7_Release(mipmap); + } + IDirectDrawSurface7_Release(surface); } @@ -8542,6 +8577,7 @@ static void test_resource_priority(void) U2(surface_desc).dwMipMapCount = 2; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + caps.dwCaps2 = 0; hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); @@ -8559,7 +8595,8 @@ static void test_resource_priority(void) ok(!refcount, "Got unexpected refcount %u.\n", refcount); done: - refcount = IDirectDraw7_Release(ddraw); + IDirectDraw7_Release(ddraw); + refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); }

1 0

Alistair Leslie-Hughes : oledb32: GetConversionSize shouldn' t fail for null variants.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: e5daf3397839a7527a921a8edb9091e1655e484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5daf3397839a7527a921a8ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 17:47:48 2015 +1100 oledb32: GetConversionSize shouldn't fail for null variants. If we have a NULL variant which will be converted to a non-fixed sized type (DBTYPE_WSTR) then we just return S_OK. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 3 +++ dlls/oledb32/tests/convert.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 891b31c..0a1518d 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1344,6 +1344,9 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, if ((*dst_len = get_length(dst_type))) return S_OK; + if(src_type == DBTYPE_VARIANT && V_VT((VARIANT*)src) == VT_NULL) + return S_OK; + switch (dst_type) { case DBTYPE_STR: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a785457..46719b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2631,16 +2631,25 @@ static void test_getconversionsize(void) src_len = 20; V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(strW); - hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 5, "%ld\n", dst_len); + VariantClear(&var); + + src_len = 20; + V_VT(&var) = VT_I4; + V_I4(&var) = 4; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(dst_len == 2, "%ld\n", dst_len); VariantClear(&var); dst_len = 0; src_len = 20; - V_VT(&var) = VT_NULL; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 2, "%ld\n", dst_len); VariantClear(&var); dst_len = 0; @@ -2655,6 +2664,30 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 1802, "%ld\n", dst_len); VariantClear(&var); + + /* On Windows, NULL variants being convert to a non-fixed sized type will return a dst_len of + * 110 but we aren't testing for this value. + */ + dst_len = 32; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_I4, NULL, &dst_len, &var); + ok(dst_len == 4, "%ld\n", dst_len); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + src_len = 20; + V_VT(&var) = VT_NULL; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + } static void test_converttobytes(void)

1 0

André Hentschel : wininet: Return the correct error code (Clang).
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: f3e3c895c7bed704796c9d500ff98b428ddd58c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e3c895c7bed704796c9d500… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 22:00:36 2015 +0100 wininet: Return the correct error code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 4784b33..36346d5 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -720,7 +720,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) } LeaveCriticalSection(&cookie_cs); - return ERROR_SUCCESS; + return res; } /***********************************************************************

1 0

André Hentschel : winmm: Remove a dead assignment ( Clang).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 798fd5bf2715ec881fb8563aa22bf7dc765e2150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798fd5bf2715ec881fb8563aa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:29 2015 +0100 winmm: Remove a dead assignment (Clang). 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/mmio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index bc69f9e..d8af787 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -814,7 +814,6 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) if (wm->info.cchBuffer) { LONG bytesW = 0; - count = 0; while (cch) { if (wm->info.pchNext != wm->info.pchEndWrite) { count = wm->info.pchEndWrite - wm->info.pchNext;

1 0

André Hentschel : shell32: Minor cleanup of SHELL_execute (Clang).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 2cff59ed5cc4ce1e76577e8e16398b75aacd7fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cff59ed5cc4ce1e76577e8e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:30:57 2015 +0100 shell32: Minor cleanup of SHELL_execute (Clang). 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/shell32/shlexec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ba83a57..5fcbe03 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1565,7 +1565,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); - DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR); DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ @@ -1625,11 +1624,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (sei_tmp.lpDirectory) { len = lstrlenW(sei_tmp.lpDirectory) + 1; - if (len > dirLen) - { + if (len > sizeof(dirBuffer) / sizeof(WCHAR)) wszDir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - dirLen = len; - } strcpyW(wszDir, sei_tmp.lpDirectory); } else

1 0

André Hentschel : xaudio2_7: Check return of IAudioClient_Start (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 35eebeef0fe0b3f03f44731f805c447b2342acfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35eebeef0fe0b3f03f44731f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:34:57 2015 +0100 xaudio2_7: Check return of IAudioClient_Start (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/xaudio2_7/xaudio_dll.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 04f975c..e7176b2 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1689,7 +1689,13 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - IAudioClient_Start(This->aclient); + hr = IAudioClient_Start(This->aclient); + if (FAILED(hr)) + { + WARN("Start(IAudioClient) failed: %08x\n", hr); + hr = COMPAT_E_DEVICE_INVALIDATED(This->version); + goto exit; + } if(This->version <= 20) *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface;

1 0

Piotr Caban : msvcrt: Add _wtmpnam_s implementation.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 77feb6938d98df205a386ad9a11a3106756168a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77feb6938d98df205a386ad9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 22 17:47:21 2015 +0100 msvcrt: Add _wtmpnam_s implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/file.c | 76 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 4 +- dlls/ucrtbase/ucrtbase.spec | 4 +- 12 files changed, 77 insertions(+), 35 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 5e0c3c9..223aa7c 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -111,7 +111,7 @@ @ cdecl _wsopen_s(ptr wstr long long long) ucrtbase._wsopen_s @ cdecl _wtempnam(wstr wstr) ucrtbase._wtempnam @ cdecl _wtmpnam(ptr) ucrtbase._wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam_s(ptr long) ucrtbase._wtmpnam_s @ cdecl clearerr(ptr) ucrtbase.clearerr @ stub clearerr_s @ cdecl fclose(ptr) ucrtbase.fclose diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7fd53ea..c87a03d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1607,8 +1607,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8c5e694..c1bf369 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1965,8 +1965,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 56f213b..3bddaf7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1989,8 +1989,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dd62c6a..5883d32 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1656,7 +1656,7 @@ @ cdecl _wstrtime_s(ptr long) msvcr120._wstrtime_s @ cdecl _wtempnam(wstr wstr) msvcr120._wtempnam @ cdecl _wtmpnam(ptr) msvcr120._wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam_s(ptr long) msvcr120._wtmpnam_s @ cdecl _wtof(wstr) msvcr120._wtof @ cdecl _wtof_l(wstr ptr) msvcr120._wtof_l @ cdecl _wtoi(wstr) msvcr120._wtoi diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 3382652..026d657 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -668,7 +668,7 @@ @ cdecl _wstrtime(ptr) MSVCRT__wstrtime @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index fbdf839..6ebaa32 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -664,7 +664,7 @@ @ cdecl _wstrtime(ptr) MSVCRT__wstrtime @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 479051b..1d2e533 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1290,8 +1290,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 01800c8..e660c37 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1262,8 +1262,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a708c67..9f35a62 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4852,15 +4852,68 @@ char * CDECL MSVCRT_tmpnam(char *s) return tmpnam_helper(s, -1, &tmpnam_unique, MSVCRT_TMP_MAX) ? NULL : s; } +static int wtmpnam_helper(MSVCRT_wchar_t *s, MSVCRT_size_t size, int *tmpnam_unique, int tmp_max) +{ + MSVCRT_wchar_t tmpstr[8]; + MSVCRT_wchar_t *p = s; + int digits; + + if (!MSVCRT_CHECK_PMT(s != NULL)) return MSVCRT_EINVAL; + + if (size < 3) { + if (size) *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + *p++ = '\\'; + *p++ = 's'; + size -= 2; + digits = msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); + if (digits+1 > size) { + *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + memcpy(p, tmpstr, digits*sizeof(tmpstr[0])); + p += digits; + *p++ = '.'; + size -= digits+1; + + while(1) { + while ((digits = *tmpnam_unique)+1 < tmp_max) { + if (InterlockedCompareExchange(tmpnam_unique, digits+1, digits) == digits) + break; + } + + digits = msvcrt_int_to_base32_w(digits, tmpstr); + if (digits+1 > size) { + *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + memcpy(p, tmpstr, digits*sizeof(tmpstr[0])); + p[digits] = 0; + + if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && + GetLastError() == ERROR_FILE_NOT_FOUND) + break; + } + return 0; +} + +/********************************************************************* + * _wtmpnam_s (MSVCRT.@) + */ +int CDECL MSVCRT__wtmpnam_s(MSVCRT_wchar_t *s, MSVCRT_size_t size) +{ + return wtmpnam_helper(s, size, &tmpnam_s_unique, MSVCRT_TMP_MAX_S); +} + /********************************************************************* * _wtmpnam (MSVCRT.@) */ -MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) +MSVCRT_wchar_t * CDECL MSVCRT__wtmpnam(MSVCRT_wchar_t *s) { - static const MSVCRT_wchar_t format[] = {'\\','s','%','s','.',0}; - MSVCRT_wchar_t tmpstr[16]; - MSVCRT_wchar_t *p; - int count, size; if (!s) { thread_data_t *data = msvcrt_get_thread_data(); @@ -4870,18 +4923,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) s = data->wtmpnam_buffer; } - msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); - p = s + MSVCRT__snwprintf(s, MAX_PATH, format, tmpstr); - for (count = 0; count < MSVCRT_TMP_MAX; count++) - { - size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); - memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); - p[size] = '\0'; - if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && - GetLastError() == ERROR_FILE_NOT_FOUND) - break; - } - return s; + return wtmpnam_helper(s, -1, &tmpnam_unique, MSVCRT_TMP_MAX) ? NULL : s; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e2c3e62..dd451a3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1224,8 +1224,8 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam # stub _wtempnam_dbg(wstr wstr long str long) -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -# stub _wtmpnam_s(ptr long) +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 604cc78..6079bc4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2131,8 +2131,8 @@ @ cdecl _wstrtime_s(ptr long) @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -@ stub _wtmpnam_s +@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam +@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi

1 0

Piotr Caban : msvcrt: Add tmpnam_s implementation.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 9b6c93f6f2b151f5b619e0365257135860d3d048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6c93f6f2b151f5b619e0365… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 22 17:43:20 2015 +0100 msvcrt: Add tmpnam_s implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 72 +++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 66 insertions(+), 25 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 30570da..5e0c3c9 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -154,6 +154,6 @@ @ cdecl tmpfile() ucrtbase.tmpfile @ cdecl tmpfile_s(ptr) ucrtbase.tmpfile_s @ cdecl tmpnam(ptr) ucrtbase.tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) ucrtbase.tmpnam_s @ cdecl ungetc(long ptr) ucrtbase.ungetc @ cdecl ungetwc(long ptr) ucrtbase.ungetwc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 666432a..7fd53ea 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1833,7 +1833,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) MSVCRT_towlower diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ca7ed6f..8c5e694 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2192,7 +2192,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) MSVCRT_towlower diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6fe21c8..56f213b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2411,7 +2411,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ stub towctrans diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c104a7b..dd62c6a 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2073,7 +2073,7 @@ @ cdecl tmpfile() msvcr120.tmpfile @ cdecl tmpfile_s(ptr) msvcr120.tmpfile_s @ cdecl tmpnam(ptr) msvcr120.tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) msvcr120.tmpnam_s @ cdecl tolower(long) msvcr120.tolower @ cdecl toupper(long) msvcr120.toupper @ stub towctrans diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7b50534..479051b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1514,7 +1514,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) MSVCRT_towlower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6afb092..01800c8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1486,7 +1486,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) MSVCRT_towlower diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 22bb925..a708c67 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -128,6 +128,7 @@ static int MSVCRT_umask = 0; /* INTERNAL: static data for tmpnam and _wtmpname functions */ static int tmpnam_unique; +static int tmpnam_s_unique; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -4780,15 +4781,65 @@ void CDECL MSVCRT_setbuf(MSVCRT_FILE* file, char *buf) MSVCRT_setvbuf(file, buf, buf ? MSVCRT__IOFBF : MSVCRT__IONBF, MSVCRT_BUFSIZ); } +static int tmpnam_helper(char *s, MSVCRT_size_t size, int *tmpnam_unique, int tmp_max) +{ + char tmpstr[8]; + char *p = s; + int digits; + + if (!MSVCRT_CHECK_PMT(s != NULL)) return MSVCRT_EINVAL; + + if (size < 3) { + if (size) *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + *p++ = '\\'; + *p++ = 's'; + size -= 2; + digits = msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); + if (digits+1 > size) { + *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + memcpy(p, tmpstr, digits*sizeof(tmpstr[0])); + p += digits; + *p++ = '.'; + size -= digits+1; + + while(1) { + while ((digits = *tmpnam_unique)+1 < tmp_max) { + if (InterlockedCompareExchange(tmpnam_unique, digits+1, digits) == digits) + break; + } + + digits = msvcrt_int_to_base32(digits, tmpstr); + if (digits+1 > size) { + *s = 0; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + memcpy(p, tmpstr, digits*sizeof(tmpstr[0])); + p[digits] = 0; + + if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && + GetLastError() == ERROR_FILE_NOT_FOUND) + break; + } + return 0; +} + +int CDECL MSVCRT_tmpnam_s(char *s, MSVCRT_size_t size) +{ + return tmpnam_helper(s, size, &tmpnam_s_unique, MSVCRT_TMP_MAX_S); +} + /********************************************************************* * tmpnam (MSVCRT.@) */ char * CDECL MSVCRT_tmpnam(char *s) { - char tmpstr[16]; - char *p; - int count, size; - if (!s) { thread_data_t *data = msvcrt_get_thread_data(); @@ -4798,18 +4849,7 @@ char * CDECL MSVCRT_tmpnam(char *s) s = data->tmpnam_buffer; } - msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); - p = s + sprintf(s, "\\s%s.", tmpstr); - for (count = 0; count < MSVCRT_TMP_MAX; count++) - { - size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); - memcpy(p, tmpstr, size); - p[size] = '\0'; - if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && - GetLastError() == ERROR_FILE_NOT_FOUND) - break; - } - return s; + return tmpnam_helper(s, -1, &tmpnam_unique, MSVCRT_TMP_MAX) ? NULL : s; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 77f612e..e30e675 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -663,6 +663,7 @@ struct MSVCRT__stat64 { #define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) #define MSVCRT_EOF (-1) #define MSVCRT_TMP_MAX 0x7fff +#define MSVCRT_TMP_MAX_S 0x7fffffff #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_BUFSIZ 512 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bffd860..e2c3e62 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1457,7 +1457,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -# stub tmpnam_s(ptr long) +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) MSVCRT_towlower diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 87c8812..604cc78 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2539,7 +2539,7 @@ @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ stub tmpnam_s +@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ stub towctrans

1 0

Austin English : iexplore: Sync registry and program resource values.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: bda46cc6fd5fa0f3c9db947108b685533662037a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda46cc6fd5fa0f3c9db94710… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 8 17:05:28 2015 -0600 iexplore: Sync registry and program resource values. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index cd75781..3d6d50f 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" +#define WINE_FILEVERSION 9,0,8112,16421 +#define WINE_FILEVERSION_STR "9.0.8112.16421" +#define WINE_PRODUCTVERSION 9,0,8112,16421 +#define WINE_PRODUCTVERSION_STR "9.0.8112.16421" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : comdlg32/fontdlg: Fix string format for sizes added to listbox.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 9f5260300d382d9112409a3103cf351a5d72ad5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5260300d382d9112409a310… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:32 2015 +0300 comdlg32/fontdlg: Fix string format for sizes added to listbox. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 245f150..37c82db 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -51,6 +51,7 @@ static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N', static const WCHAR strWineFontData_a[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0}; static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; +static const WCHAR fontsizefmtW[] = {'%','d',0}; /* image list with TrueType bitmaps and more */ static HIMAGELIST himlTT = 0; @@ -417,16 +418,15 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) { int j; WCHAR buffer[20]; - static const WCHAR strFormat[] = {'%','2','d',0}; if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - wsprintfW(buffer, strFormat, h); + sprintfW(buffer, fontsizefmtW, h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { - j=SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer); + j=SendMessageW(hwnd, CB_INSERTSTRING, -1, (LPARAM)buffer); if (j!=CB_ERR) j = SendMessageW(hwnd, CB_SETITEMDATA, j, h); if (j==CB_ERR) return TRUE; } @@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * static void CFn_FitFontSize( HWND hDlg, int points) { - static const WCHAR fmtW[] = {'%','d',0}; WCHAR buffW[16]; int i,n; @@ -554,7 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) } /* no default matching size, set text manually */ - sprintfW(buffW, fmtW, points); + sprintfW(buffW, fontsizefmtW, points); SetDlgItemTextW(hDlg, cmb3, buffW); }

1 0

Nikolay Sivov : comdlg32/fontdlg: Allow font sizes outside of defaults set.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: daaa083404a48acd55d1499d0ef6f024fd9a373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaa083404a48acd55d1499d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:31 2015 +0300 comdlg32/fontdlg: Allow font sizes outside of defaults set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/fontdlg.c | 75 ++++++++++++---- po/ar.po | 222 +++++++++++++++++++++++----------------------- po/bg.po | 222 +++++++++++++++++++++++----------------------- po/ca.po | 222 +++++++++++++++++++++++----------------------- po/cs.po | 222 +++++++++++++++++++++++----------------------- po/da.po | 222 +++++++++++++++++++++++----------------------- po/de.po | 222 +++++++++++++++++++++++----------------------- po/el.po | 222 +++++++++++++++++++++++----------------------- po/en.po | 222 +++++++++++++++++++++++----------------------- po/en_US.po | 222 +++++++++++++++++++++++----------------------- po/eo.po | 222 +++++++++++++++++++++++----------------------- po/es.po | 222 +++++++++++++++++++++++----------------------- po/fa.po | 222 +++++++++++++++++++++++----------------------- po/fi.po | 222 +++++++++++++++++++++++----------------------- po/fr.po | 222 +++++++++++++++++++++++----------------------- po/he.po | 222 +++++++++++++++++++++++----------------------- po/hi.po | 222 +++++++++++++++++++++++----------------------- po/hr.po | 222 +++++++++++++++++++++++----------------------- po/hu.po | 222 +++++++++++++++++++++++----------------------- po/it.po | 222 +++++++++++++++++++++++----------------------- po/ja.po | 222 +++++++++++++++++++++++----------------------- po/ko.po | 222 +++++++++++++++++++++++----------------------- po/lt.po | 222 +++++++++++++++++++++++----------------------- po/ml.po | 222 +++++++++++++++++++++++----------------------- po/nb_NO.po | 222 +++++++++++++++++++++++----------------------- po/nl.po | 222 +++++++++++++++++++++++----------------------- po/or.po | 222 +++++++++++++++++++++++----------------------- po/pa.po | 222 +++++++++++++++++++++++----------------------- po/pl.po | 222 +++++++++++++++++++++++----------------------- po/pt_BR.po | 222 +++++++++++++++++++++++----------------------- po/pt_PT.po | 222 +++++++++++++++++++++++----------------------- po/rm.po | 222 +++++++++++++++++++++++----------------------- po/ro.po | 222 +++++++++++++++++++++++----------------------- po/ru.po | 222 +++++++++++++++++++++++----------------------- po/sk.po | 222 +++++++++++++++++++++++----------------------- po/sl.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 222 +++++++++++++++++++++++----------------------- po/sv.po | 222 +++++++++++++++++++++++----------------------- po/te.po | 222 +++++++++++++++++++++++----------------------- po/th.po | 222 +++++++++++++++++++++++----------------------- po/tr.po | 222 +++++++++++++++++++++++----------------------- po/uk.po | 222 +++++++++++++++++++++++----------------------- po/wa.po | 222 +++++++++++++++++++++++----------------------- po/wine.pot | 222 +++++++++++++++++++++++----------------------- po/zh_CN.po | 222 +++++++++++++++++++++++----------------------- po/zh_TW.po | 222 +++++++++++++++++++++++----------------------- 49 files changed, 5259 insertions(+), 5030 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daaa083404a48acd55d14…

1 0

Michael Stefaniuc : dsound: Use a better name for IDirectSoundBufferImpl_Create().
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: bb72548f3870b1df03ad9fe7ad2e543a69d5d574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb72548f3870b1df03ad9fe7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:50:34 2015 +0100 dsound: Use a better name for IDirectSoundBufferImpl_Create(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 24 +++++++++--------------- dlls/dsound/dsound.c | 7 ++----- dlls/dsound/dsound_private.h | 6 ++---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d7717fd..2a80c3f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -983,19 +983,15 @@ static const IDirectSoundBuffer8Vtbl dsbvt = IDirectSoundBufferImpl_GetObjectInPath }; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice * device, - IDirectSoundBufferImpl **pdsb, - LPCDSBUFFERDESC dsbd) +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) { IDirectSoundBufferImpl *dsb; LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; - TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); - - *pdsb = NULL; + TRACE("(%p,%p,%p)\n", device, dsbd, buffer); if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); @@ -1107,14 +1103,12 @@ HRESULT IDirectSoundBufferImpl_Create( RtlInitializeResource(&dsb->lock); - /* register buffer if not primary */ - if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { - err = DirectSoundDevice_AddBuffer(device, dsb); - if (err == DS_OK) - *pdsb = dsb; - else - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - } + /* register buffer */ + err = DirectSoundDevice_AddBuffer(device, dsb); + if (err == DS_OK) + *buffer = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return err; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e50ef58..ccefd1f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -469,8 +469,6 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("primarybuffer_create() failed\n"); } } else { - IDirectSoundBufferImpl * dsb; - if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); @@ -547,9 +545,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } - hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); - if (dsb) { - *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + hres = secondarybuffer_create(device, dsbd, ppdsb); + if (SUCCEEDED(hres)) { if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE) device->drvcaps.dwFreeHwMixingAllBuffers--; } else diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9c001ed..07bda48 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -182,10 +182,8 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice *device, - IDirectSoundBufferImpl **ppdsb, - LPCDSBUFFERDESC dsbd) DECLSPEC_HIDDEN; +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb,

1 0

Bruno Jesus : ws2_32: Add WSAPoll() implementation.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 5913a107d8a6d257fa9838bdbca47f0d45b7a3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5913a107d8a6d257fa9838bdb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 22 21:15:41 2015 +0800 ws2_32: Add WSAPoll() implementation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 4 +++ dlls/ws2_32/ws2_32.spec | 1 + include/winsock2.h | 4 +-- 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d31f0b4..f62c9cd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -773,6 +773,17 @@ static const int ws_eai_map[][2] = { 0, 0 } }; +static const int ws_poll_map[][2] = +{ + MAP_OPTION( POLLERR ), + MAP_OPTION( POLLHUP ), + MAP_OPTION( POLLNVAL ), + MAP_OPTION( POLLWRNORM ), + MAP_OPTION( POLLWRBAND ), + MAP_OPTION( POLLRDNORM ), + { WS_POLLRDBAND, POLLPRI } +}; + static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -1415,6 +1426,40 @@ convert_socktype_u2w(int unixsocktype) { return -1; } +static int convert_poll_w2u(int events) +{ + int i, ret; + for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + { + if (ws_poll_map[i][0] & events) + { + ret |= ws_poll_map[i][1]; + events &= ~ws_poll_map[i][0]; + } + } + + if (events) + FIXME("Unsupported WSAPoll() flags 0x%x\n", events); + return ret; +} + +static int convert_poll_u2w(int events) +{ + int i, ret; + for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + { + if (ws_poll_map[i][1] & events) + { + ret |= ws_poll_map[i][0]; + events &= ~ws_poll_map[i][1]; + } + } + + if (events) + FIXME("Unsupported poll() flags 0x%x\n", events); + return ret; +} + static int set_ipx_packettype(int sock, int ptype) { #ifdef HAS_IPX @@ -5227,6 +5272,55 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return ret; } +/*********************************************************************** + * WSAPoll + */ +int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) +{ + int i, ret; + struct pollfd *ufds; + + if (!count) + { + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (!wfds) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (!(ufds = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ufds[0])))) + { + SetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + for (i = 0; i < count; i++) + { + ufds[i].fd = get_sock_fd(wfds[i].fd, 0, NULL); + ufds[i].events = convert_poll_w2u(wfds[i].events); + ufds[i].revents = 0; + } + + ret = do_poll(ufds, count, timeout); + + for (i = 0; i < count; i++) + { + if (ufds[i].fd != -1) + { + release_sock_fd(wfds[i].fd, ufds[i].fd); + wfds[i].revents = convert_poll_u2w(ufds[i].revents); + } + else + wfds[i].revents = WS_POLLNVAL; + } + + HeapFree(GetProcessHeap(), 0, ufds); + return ret; +} + /* helper to send completion messages for client-only i/o operation case */ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information ) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00fac77..aeb7a62 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6634,6 +6634,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); @@ -6652,6 +6653,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN | POLLOUT); poll_timeout = 2000; ret = pWSAPoll(fds, ix, poll_timeout); +todo_wine ok(ret == 0, "expected 0, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; @@ -6673,6 +6675,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN | POLLOUT); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLWRNORM | POLLHUP) || broken(POLL_ISSET(fdWrite, POLLWRNORM)) /* <= 2008 */, "fdWrite socket events incorrect\n"); closesocket(fdWrite); @@ -6696,6 +6699,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 6de888f..7625f38 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -91,6 +91,7 @@ @ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) @ stdcall WSANtohl(long long ptr) @ stdcall WSANtohs(long long ptr) +@ stdcall WSAPoll(ptr long long) @ stdcall WSAProviderConfigChange(ptr ptr ptr) @ stdcall WSARecv(long ptr long ptr ptr ptr ptr) @ stdcall WSARecvDisconnect(long ptr) diff --git a/include/winsock2.h b/include/winsock2.h index 461b90c..24f0ea3 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -113,8 +113,8 @@ extern "C" { #define SD_BOTH 0x02 /* Constants for WSAPoll() */ -#ifndef __WINE_WINE_PORT_H #ifndef USE_WS_PREFIX +#ifndef __WINE_WINE_PORT_H #define POLLERR 0x0001 #define POLLHUP 0x0002 #define POLLNVAL 0x0004 @@ -125,6 +125,7 @@ extern "C" { #define POLLPRI 0x0400 #define POLLIN (POLLRDNORM|POLLRDBAND) #define POLLOUT (POLLWRNORM) +#endif #else #define WS_POLLERR 0x0001 #define WS_POLLHUP 0x0002 @@ -137,7 +138,6 @@ extern "C" { #define WS_POLLIN (WS_POLLRDNORM|WS_POLLRDBAND) #define WS_POLLOUT (WS_POLLWRNORM) #endif -#endif /* Constants for WSAIoctl() */ #ifdef USE_WS_PREFIX

1 0

Michael Stefaniuc : dsound: Simplify error handling when creating a sound buffer.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: d51d55bab8995f94dcc78ce8418a4149836c27b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51d55bab8995f94dcc78ce84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:49:10 2015 +0100 dsound: Simplify error handling when creating a sound buffer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5aa2834..d7717fd 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -992,29 +992,28 @@ HRESULT IDirectSoundBufferImpl_Create( LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); + *pdsb = NULL; + if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); - *pdsb = NULL; return DSERR_INVALIDPARAM; /* FIXME: which error? */ } dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb)); - if (dsb == 0) { - WARN("out of memory\n"); - *pdsb = NULL; + if (!dsb) return DSERR_OUTOFMEMORY; - } TRACE("Created buffer at %p\n", dsb); - dsb->ref = 0; + dsb->ref = 1; dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; - dsb->numIfaces = 0; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; @@ -1025,9 +1024,8 @@ HRESULT IDirectSoundBufferImpl_Create( CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize); dsb->pwfx = DSOUND_CopyFormat(wfex); - if (dsb->pwfx == NULL) { - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->pwfx) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1052,22 +1050,16 @@ HRESULT IDirectSoundBufferImpl_Create( /* Allocate an empty buffer */ dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); - if (dsb->buffer == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->buffer) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (dsb->buffer->memory == NULL) { + if (!dsb->buffer->memory) { WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1118,18 +1110,12 @@ HRESULT IDirectSoundBufferImpl_Create( /* register buffer if not primary */ if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { err = DirectSoundDevice_AddBuffer(device, dsb); - if (err != DS_OK) { - HeapFree(GetProcessHeap(),0,dsb->buffer->memory); - HeapFree(GetProcessHeap(),0,dsb->buffer); - RtlDeleteResource(&dsb->lock); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - dsb = NULL; - } + if (err == DS_OK) + *pdsb = dsb; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); } - IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); - *pdsb = dsb; return err; }

1 0

Austin English : setupx.dll16: Add DiBuildDriverIndex stub.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 296ac8cf320336353fc5f5da3897c808a65556e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296ac8cf320336353fc5f5da3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 11:48:35 2015 -0600 setupx.dll16: Add DiBuildDriverIndex stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index 615e92f..34e6b68 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -205,7 +205,7 @@ 409 stub IPGETDRIVERVERSION 410 stub IpGetVersionString #(str str ptr word str) 411 pascal VcpExplain(ptr long) VcpExplain16 -412 stub DiBuildDriverIndex #(word) +412 pascal DiBuildDriverIndex(word) DiBuildDriverIndex16 413 stub DiAddSingleInfToDrvIdx #(str word word) 414 stub FCEGETFLAGS 450 stub UiMakeDlgNonBold #(word) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index adc5900..db15cfe 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -628,3 +628,12 @@ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) ldd.pszPath = szPath; return CtlSetLdd16(&ldd); } + +/*********************************************************************** + * DiBuildDriverIndex (SETUPX.412) + */ +RETERR16 WINAPI DiBuildDriverIndex16( WORD w1 ) +{ + FIXME( "%x: stub\n", w1 ); + return 0; +}

1 0

Nikolay Sivov : comdlg32/fontdlg: Remove dead assignment (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 1a7121b3275fd549fd964dcfe4a8638cb5e03549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7121b3275fd549fd964dcfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:33 2015 +0300 comdlg32/fontdlg: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 37c82db..344a356 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1011,7 +1011,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO /* face name */ i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0); if (i==CB_ERR) - i=GetDlgItemTextW( hDlg, cmb1, str, 256 ); + GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) ); else { SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i,

1 0

Piotr Caban : msvcp110: Always return empty string in _Read_dir on end of enumeration or error.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 77ec614ac4630eed384d24895503372817007720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ec614ac4630eed384d24895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 22 11:11:03 2015 +0100 msvcp110: Always return empty string in _Read_dir on end of enumeration or error. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7440aff..6a75476 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14483,18 +14483,16 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) { WIN32_FIND_DATAA data; + TRACE("(%p %p %p)\n", target, handle, type); - if(!FindNextFileA(handle, &data)) { - *type = status_unknown; - *target = '\0'; - return target; - } - while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + + do { if(!FindNextFileA(handle, &data)) { *type = status_unknown; - return NULL; + *target = '\0'; + return target; } - } + } while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")); strcpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)

1 0

Austin English : tdi.sys: Add a stub dll.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 7eec8cb4a660508edef376390d374b5e4755176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eec8cb4a660508edef376390… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 21 20:41:46 2015 -0600 tdi.sys: Add a stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tdi.sys/Makefile.in | 5 +++++ dlls/tdi.sys/main.c | 38 ++++++++++++++++++++++++++++++++ dlls/tdi.sys/tdi.sys.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 ++ 6 files changed, 104 insertions(+) diff --git a/configure b/configure index 0db4d30..8fe1910 100755 --- a/configure +++ b/configure @@ -1312,6 +1312,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tdi_sys enable_traffic enable_twain_32 enable_ucrtbase @@ -17884,6 +17885,7 @@ wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test +wine_fn_config_dll tdi.sys enable_tdi_sys wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 86f12c5..ffeecf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,6 +3224,7 @@ WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) +WINE_CONFIG_DLL(tdi.sys) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in new file mode 100644 index 0000000..1b5f5f3 --- /dev/null +++ b/dlls/tdi.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = tdi.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/tdi.sys/main.c b/dlls/tdi.sys/main.c new file mode 100644 index 0000000..d9fbcb1 --- /dev/null +++ b/dlls/tdi.sys/main.c @@ -0,0 +1,38 @@ +/* + * tdi.sys + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tdi); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/tdi.sys/tdi.sys.spec b/dlls/tdi.sys/tdi.sys.spec new file mode 100644 index 0000000..9e3d2e4 --- /dev/null +++ b/dlls/tdi.sys/tdi.sys.spec @@ -0,0 +1,56 @@ +@ stub CTEAllocateString +@ stub CTEBlock +@ stub CTEBlockWithTracker +@ stub CTEInitEvent +@ stub CTEInitString +@ stub CTEInitTimer +@ stub CTEInitialize +@ stub CTEInsertBlockTracker +@ stub CTELogEvent +@ stub CTERemoveBlockTracker +@ stub CTEScheduleCriticalEvent +@ stub CTEScheduleDelayedEvent +@ stub CTEScheduleEvent +@ stub CTESignal +@ stub CTEStartTimer +@ stub CTESystemUpTime +@ stub DllInitialize +@ stub DllUnload +@ stub TdiBuildNetbiosAddress +@ stub TdiBuildNetbiosAddressEa +@ stub TdiCopyBufferToMdl +@ stub TdiCopyBufferToMdlWithReservedMappingAtDpcLevel +@ stub TdiCopyMdlChainToMdlChain +@ stub TdiCopyMdlToBuffer +@ stub TdiDefaultChainedRcvDatagramHandler +@ stub TdiDefaultChainedRcvExpeditedHandler +@ stub TdiDefaultChainedReceiveHandler +@ stub TdiDefaultConnectHandler +@ stub TdiDefaultDisconnectHandler +@ stub TdiDefaultErrorHandler +@ stub TdiDefaultRcvDatagramHandler +@ stub TdiDefaultRcvExpeditedHandler +@ stub TdiDefaultReceiveHandler +@ stub TdiDefaultSendPossibleHandler +@ stub TdiDeregisterAddressChangeHandler +@ stub TdiDeregisterDeviceObject +@ stub TdiDeregisterNetAddress +@ stub TdiDeregisterNotificationHandler +@ stub TdiDeregisterPnPHandlers +@ stub TdiDeregisterProvider +@ stub TdiEnumerateAddresses +@ stub TdiGet9FTriageBlock +@ stub TdiInitialize +@ stub TdiMapUserRequest +@ stub TdiMatchPdoWithChainedReceiveContext +@ stub TdiOpenNetbiosAddress +@ stub TdiPnPPowerComplete +@ stub TdiPnPPowerRequest +@ stub TdiProviderReady +@ stub TdiRegisterAddressChangeHandler +@ stub TdiRegisterDeviceObject +@ stub TdiRegisterNetAddress +@ stub TdiRegisterNotificationHandler +@ stub TdiRegisterPnPHandlers +@ stub TdiRegisterProvider +@ stub TdiReturnChainedReceives diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7c0ad09..fb2583d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2514,6 +2514,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,tdi.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2555,6 +2556,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys 12,,mountmgr.sys 12,,ndis.sys +12,,tdi.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,-

1 0

Paul Gofman : msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: a3c818b33d2bbe92ca74783564dc896e24c1002a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c818b33d2bbe92ca7478356… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 22 15:08:58 2015 +0300 msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 42 ++++++++++++++--------------- dlls/msvcr110/msvcr110.spec | 64 ++++++++++++++++++++++----------------------- dlls/msvcr120/msvcr120.spec | 64 ++++++++++++++++++++++----------------------- dlls/msvcr80/msvcr80.spec | 42 ++++++++++++++--------------- dlls/msvcr90/msvcr90.spec | 42 ++++++++++++++--------------- dlls/msvcrt/math.c | 44 +++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 42 ++++++++++++++--------------- dlls/ucrtbase/ucrtbase.spec | 64 ++++++++++++++++++++++----------------------- 8 files changed, 202 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3c818b33d2bbe92ca747…

1 0

Alistair Leslie-Hughes : oledb32: Convert to a BSTR to work out it size.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 9c70026092f49872ee3d6f3a71df45f28cf2bed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c70026092f49872ee3d6f3a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 22 21:09:45 2015 +1100 oledb32: Convert to a BSTR to work out it size. This makes code for handling variants with DBTYPE_STR and DBTYPE_WSTR types consistent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 72714d3..891b31c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1372,10 +1372,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, switch (src_type) { case DBTYPE_VARIANT: - if(V_VT((VARIANT*)src) == VT_BSTR) - *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); - else - WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src)); + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v))+1) * sizeof(WCHAR); + VariantClear(&v); + } + } break; case DBTYPE_STR: if(src_len)

1 0

Nikolay Sivov : regedit: Fix potential buffer leak, simplify error handling (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: c9fb3b7f8f1924e58ccc36caa73617f366853d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fb3b7f8f1924e58ccc36caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:55:00 2015 +0300 regedit: Fix potential buffer leak, simplify error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 008e6a1..7afc7bf 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -95,17 +95,17 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) { - int pathLen = 0, maxLen; + int pathLen = 0, maxLen = 1024; WCHAR *pathBuffer; - pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024*sizeof(WCHAR)); + if (!hItem) { + hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + if (!hItem) return NULL; + } + + pathBuffer = HeapAlloc(GetProcessHeap(), 0, maxLen*sizeof(WCHAR)); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); - if (maxLen == (SIZE_T) - 1) return NULL; - maxLen = maxLen / sizeof(WCHAR); - if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; return pathBuffer; }

1 0