December 2015 - Wine-Commits

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

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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. 24, 2015

Dec. 24, 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