December 2015 - Wine-commits

Nikolay Sivov : ole32: Fix parameter validation for CoGetMalloc().
by Alexandre Julliard 24 Dec '15

24 Dec '15

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

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

24 Dec '15

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 : ole32: Simplify OleRegGetUserType() using existing helper.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 98505b40763bac5f42575cc21b47c07370798726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98505b40763bac5f42575cc21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:36:12 2015 +0300 ole32: Simplify OleRegGetUserType() using existing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f28b9d0..41fe4bd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -677,47 +677,26 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; - LONG hres; - - /* - * Initialize the out parameter. - */ - *pszUserType = NULL; + HRESULT hres; + LONG ret; - /* - * 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_guid(clsid), dwFormOfType, pszUserType); - TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); + *pszUserType = NULL; - /* - * Open the class id Key - */ - hres = open_classes_key(HKEY_CLASSES_ROOT, keyName, MAXIMUM_ALLOWED, &clsidKey); - if (hres != ERROR_SUCCESS) - return REGDB_E_CLASSNOTREG; + hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); + if (FAILED(hres)) + return hres; /* * Retrieve the size of the name string. */ cbData = 0; - hres = RegQueryValueExW(clsidKey, - emptyW, - NULL, - &dwKeyType, - NULL, - &cbData); - - if (hres!=ERROR_SUCCESS) + if (RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, NULL, &cbData)) { RegCloseKey(clsidKey); return REGDB_E_READREGDB; @@ -734,7 +713,7 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - hres = RegQueryValueExW(clsidKey, + ret = RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, @@ -743,11 +722,10 @@ HRESULT WINAPI OleRegGetUserType( RegCloseKey(clsidKey); - if (hres != ERROR_SUCCESS) + if (ret != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); *pszUserType = NULL; - return REGDB_E_READREGDB; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: b30167e2403ff39f33205e5c6bd069b1517b1cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30167e2403ff39f33205e5c6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Dec 23 17:36:00 2015 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index f016adf..7c78f2f 100644 --- a/po/lt.po +++ b/po/lt.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-20 09:57+0300\n" +"PO-Revision-Date: 2015-12-23 17:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -1042,7 +1042,7 @@ msgstr "Parinkite aplanką" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Šrifto dydis turi būti skaičius." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

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 24 Dec '15

24 Dec '15

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

Riccardo Bortolato : ddraw7/tests: Test GetPriority() on cubemap surfaces.
by Alexandre Julliard 24 Dec '15

24 Dec '15

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

Nikolay Sivov : msvcrt: Fix char to int promotion that breaks pattern lookup.
by Alexandre Julliard 24 Dec '15

24 Dec '15

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 : msvcrt: Fix cwscanf* prototypes.
by Alexandre Julliard 24 Dec '15

24 Dec '15

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 24 Dec '15

24 Dec '15

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 24 Dec '15

24 Dec '15

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