September 2016 - Wine-Commits

Nikolay Sivov : d3d11: Enabled GetDC() capability for 2D textures.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 74a923c31e595aba3f1f691617edfc8b27eebb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a923c31e595aba3f1f69161… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 21:50:39 2016 +0300 d3d11: Enabled GetDC() capability for 2D textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 ++---- dlls/d3d11/texture.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c72aee2..43e43db 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8462,9 +8462,7 @@ static void test_getdc(void) /* STAGING usage, requesting GDI compatibility mode. */ desc.MiscFlags = D3D11_RESOURCE_MISC_GDI_COMPATIBLE; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); - todo_wine ok(FAILED(hr), "Expected CreateTexture2D to fail, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D11Texture2D_Release(texture); + ok(FAILED(hr), "Expected CreateTexture2D to fail, hr %#x.\n", hr); desc.Usage = D3D11_USAGE_DEFAULT; desc.BindFlags = D3D11_BIND_RENDER_TARGET; @@ -8473,7 +8471,7 @@ static void test_getdc(void) if (testdata[i].getdc_supported) ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); else - todo_wine ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); + ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); if (FAILED(hr)) continue; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 5563982..54c5613 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -443,11 +443,25 @@ static const struct wined3d_parent_ops d3d_texture2d_wined3d_parent_ops = d3d_texture2d_wined3d_object_released, }; +static BOOL is_gdi_compatible_texture(const D3D11_TEXTURE2D_DESC *desc) +{ + if (!(desc->Format == DXGI_FORMAT_B8G8R8A8_UNORM + || desc->Format == DXGI_FORMAT_B8G8R8A8_TYPELESS + || desc->Format == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)) + return FALSE; + + if (desc->Usage != D3D11_USAGE_DEFAULT) + return FALSE; + + return TRUE; +} + static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { struct wined3d_resource_desc wined3d_desc; unsigned int levels; + DWORD flags = 0; HRESULT hr; texture->ID3D11Texture2D_iface.lpVtbl = &d3d11_texture2d_vtbl; @@ -473,8 +487,21 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(desc->Width, desc->Height)) + 1; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) + { + if (is_gdi_compatible_texture(desc)) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + else + { + WARN("Incompatible description used to create GDI compatible texture.\n"); + wined3d_private_store_cleanup(&texture->private_store); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + } + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, - desc->ArraySize, levels, 0, (struct wined3d_sub_resource_data *)data, + desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, texture, &d3d_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr);

1 0

Nikolay Sivov : d2d1/tests: Test that target properties are kept during BindDC().
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: ccc6a576d6f8347ee3590135657da1c4f6109265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc6a576d6f8347ee35901356… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 17:33:50 2016 +0300 d2d1/tests: Test that target properties are kept during BindDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index dbbe7d0..0a81013 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2654,18 +2654,23 @@ static void test_dc_target(void) { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, { DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED }, }; + D2D1_TEXT_ANTIALIAS_MODE text_aa_mode; D2D1_RENDER_TARGET_PROPERTIES desc; + D2D1_MATRIX_3X2_F matrix, matrix2; + D2D1_ANTIALIAS_MODE aa_mode; ID2D1SolidColorBrush *brush; ID2D1DCRenderTarget *rt; ID2D1Factory *factory; + FLOAT dpi_x, dpi_y; D2D1_COLOR_F color; D2D1_SIZE_F size; + D2D1_TAG t1, t2; unsigned int i; HDC hdc, hdc2; + D2D_RECT_F r; COLORREF clr; HRESULT hr; RECT rect; - D2D_RECT_F r; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -2716,6 +2721,14 @@ if (SUCCEEDED(hr)) hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + aa_mode = ID2D1DCRenderTarget_GetAntialiasMode(rt); + ok(aa_mode == D2D1_ANTIALIAS_MODE_PER_PRIMITIVE, "Got wrong default aa mode %d.\n", aa_mode); + text_aa_mode = ID2D1DCRenderTarget_GetTextAntialiasMode(rt); + ok(text_aa_mode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, "Got wrong default text aa mode %d.\n", text_aa_mode); + + ID2D1DCRenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 96.0f && dpi_y == 96.0f, "Got dpi_x %f, dpi_y %f.\n", dpi_x, dpi_y); + hdc = CreateCompatibleDC(NULL); ok(hdc != NULL, "Failed to create an HDC.\n"); @@ -2725,9 +2738,33 @@ if (SUCCEEDED(hr)) hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + /* Target properties are retained during BindDC() */ + ID2D1DCRenderTarget_SetTags(rt, 1, 2); + ID2D1DCRenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1DCRenderTarget_SetTextAntialiasMode(rt, D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 600.0f); + ID2D1DCRenderTarget_SetTransform(rt, &matrix); + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + ID2D1DCRenderTarget_GetTags(rt, &t1, &t2); + ok(t1 == 1 && t2 == 2, "Got wrong tags.\n"); + + aa_mode = ID2D1DCRenderTarget_GetAntialiasMode(rt); + ok(aa_mode == D2D1_ANTIALIAS_MODE_ALIASED, "Got wrong aa mode %d.\n", aa_mode); + + text_aa_mode = ID2D1DCRenderTarget_GetTextAntialiasMode(rt); + ok(text_aa_mode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, "Got wrong text aa mode %d.\n", text_aa_mode); + + ID2D1DCRenderTarget_GetTransform(rt, &matrix2); + ok(!memcmp(&matrix, &matrix2, sizeof(matrix)), "Got wrong target transform.\n"); + + set_matrix_identity(&matrix); + ID2D1DCRenderTarget_SetTransform(rt, &matrix); + /* target size comes from specified dimensions, not from selected bitmap size */ size = ID2D1DCRenderTarget_GetSize(rt); ok(size.width == 32.0f, "got width %.08e.\n", size.width);

1 0

Michael Stefaniuc : sti: Standardize COM aggregation in StillImage.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 4f114ad6239af9ade333dd43eeabc03cb024c4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f114ad6239af9ade333dd43e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 13:22:11 2016 +0200 sti: Standardize COM aggregation in StillImage. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/sti.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index de5f426..41c94f5 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -44,9 +44,9 @@ static const WCHAR registeredAppsLaunchPath[] = { typedef struct _stillimage { + IUnknown IUnknown_inner; IStillImageW IStillImageW_iface; - IUnknown IUnknown_iface; - IUnknown *pUnkOuter; + IUnknown *outer_unk; LONG ref; } stillimage; @@ -59,19 +59,19 @@ static HRESULT WINAPI stillimagew_QueryInterface(IStillImageW *iface, REFIID rii { stillimage *This = impl_from_IStillImageW(iface); TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject); - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObject); } static ULONG WINAPI stillimagew_AddRef(IStillImageW *iface) { stillimage *This = impl_from_IStillImageW(iface); - return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI stillimagew_Release(IStillImageW *iface) { stillimage *This = impl_from_IStillImageW(iface); - return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) @@ -261,7 +261,7 @@ static const struct IStillImageWVtbl stillimagew_vtbl = static inline stillimage *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, stillimage, IUnknown_iface); + return CONTAINING_RECORD(iface, stillimage, IUnknown_inner); } static HRESULT WINAPI Internal_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) @@ -335,18 +335,18 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP if (This) { This->IStillImageW_iface.lpVtbl = &stillimagew_vtbl; - This->IUnknown_iface.lpVtbl = &internal_unk_vtbl; + This->IUnknown_inner.lpVtbl = &internal_unk_vtbl; if (pUnkOuter) - This->pUnkOuter = pUnkOuter; + This->outer_unk = pUnkOuter; else - This->pUnkOuter = &This->IUnknown_iface; + This->outer_unk = &This->IUnknown_inner; This->ref = 1; hr = IStillImage_Initialize(&This->IStillImageW_iface, hinst, dwVer); if (SUCCEEDED(hr)) { if (pUnkOuter) - *ppSti = (IStillImageW*) &This->IUnknown_iface; + *ppSti = (IStillImageW*) &This->IUnknown_inner; else *ppSti = &This->IStillImageW_iface; }

1 0

Sebastian Lackner : comctl32/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 88bf73abb23616d76be9b9eba3487dfa23deeb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bf73abb23616d76be9b9eba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 12:20:10 2016 +0200 comctl32/tests: Fix incorrect usage of broken() function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index fa0d970..a394beb 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -289,7 +289,7 @@ static void test_status_control(void) expect(5,LOWORD(r)); expect(SBT_POPOUT,HIWORD(r)); r = SendMessageW(hWndStatus, WM_GETTEXTLENGTH, 0, 0); - ok(r == 5 || broken(0x02000005 /* NT4 */), "Expected 5, got %d\n", r); + ok(r == 5, "Expected 5, got %d\n", r); r = SendMessageA(hWndStatus, SB_GETTEXTLENGTHA, 1, 0); expect(0,LOWORD(r)); expect(SBT_OWNERDRAW,HIWORD(r));

1 0

Andrey Gusev : api-ms-win-core-privateprofile-l1-1-1: Add dll.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: eaea1ac2cba08945add3bb052140b05073b980d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea1ac2cba08945add3bb052… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 7 22:05:18 2016 +0300 api-ms-win-core-privateprofile-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-privateprofile-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-privateprofile-l1-1-1.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 1fde1d0..ce6b814 100755 --- a/configure +++ b/configure @@ -919,6 +919,7 @@ enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_namespace_l1_1_0 enable_api_ms_win_core_normalization_l1_1_0 enable_api_ms_win_core_path_l1_1_0 +enable_api_ms_win_core_privateprofile_l1_1_1 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -17467,6 +17468,7 @@ wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_named wine_fn_config_dll api-ms-win-core-namespace-l1-1-0 enable_api_ms_win_core_namespace_l1_1_0 wine_fn_config_dll api-ms-win-core-normalization-l1-1-0 enable_api_ms_win_core_normalization_l1_1_0 wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 +wine_fn_config_dll api-ms-win-core-privateprofile-l1-1-1 enable_api_ms_win_core_privateprofile_l1_1_1 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 diff --git a/configure.ac b/configure.ac index 52b217e..8ce789f 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,6 +2684,7 @@ WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-privateprofile-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-1/Makefile.in b/dlls/api-ms-win-core-privateprofile-l1-1-1/Makefile.in new file mode 100644 index 0000000..94eeefd --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-privateprofile-l1-1-1.dll diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-1/api-ms-win-core-privateprofile-l1-1-1.spec b/dlls/api-ms-win-core-privateprofile-l1-1-1/api-ms-win-core-privateprofile-l1-1-1.spec new file mode 100644 index 0000000..ba558b3 --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-1/api-ms-win-core-privateprofile-l1-1-1.spec @@ -0,0 +1,2 @@ +@ stdcall GetPrivateProfileSectionA(str ptr long str) kernel32.GetPrivateProfileSectionA +@ stdcall WritePrivateProfileSectionW(wstr wstr wstr) kernel32.WritePrivateProfileSectionW diff --git a/tools/make_specfiles b/tools/make_specfiles index 1b81db3..0b0bf28 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -168,6 +168,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", + "api-ms-win-core-privateprofile-l1-1-1", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0",

1 0

Sebastian Lackner : user32: Add missing calls to GlobalUnlock in render_synthesized_dib.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 5eb8217f6d3c1cc8e2dc3a040c03fd6b1eb904cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb8217f6d3c1cc8e2dc3a040… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 20:52:35 2016 +0200 user32: Add missing calls to GlobalUnlock in render_synthesized_dib. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index f6f073e..135790a 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -283,13 +283,16 @@ static HANDLE render_synthesized_dib( HANDLE data, UINT format, UINT from ) header_size = (format == CF_DIBV5) ? sizeof(BITMAPV5HEADER) : offsetof( BITMAPINFO, bmiColors[src->bmiHeader.biCompression == BI_BITFIELDS ? 3 : 0] ); - if (!(ret = GlobalAlloc( GMEM_FIXED, header_size + bits_size ))) goto done; - bmi = (BITMAPINFO *)ret; - memset( bmi, 0, header_size ); - memcpy( bmi, src, min( header_size, src_size )); - bmi->bmiHeader.biSize = header_size; - /* FIXME: convert colors according to DIBv5 color profile */ - memcpy( (char *)bmi + header_size, (char *)src + src_size, bits_size ); + if ((ret = GlobalAlloc( GMEM_FIXED, header_size + bits_size ))) + { + bmi = (BITMAPINFO *)ret; + memset( bmi, 0, header_size ); + memcpy( bmi, src, min( header_size, src_size )); + bmi->bmiHeader.biSize = header_size; + /* FIXME: convert colors according to DIBv5 color profile */ + memcpy( (char *)bmi + header_size, (char *)src + src_size, bits_size ); + } + GlobalUnlock( data ); } done:

1 0

Bruno Jesus : winejoystick.drv: Test for new joysticks in intervals of 2 seconds.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: caaedf1cd610012f944f96a53627d9702358d2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaedf1cd610012f944f96a53… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 8 00:08:33 2016 -0300 winejoystick.drv: Test for new joysticks in intervals of 2 seconds. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 289e728..287f4be 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -163,10 +163,17 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { char buf[20]; int flags, fd, found_ix, i; + static DWORD last_attempt; + DWORD now; if (jstick->dev > 0) return jstick->dev; + now = GetTickCount(); + if (now - last_attempt < 2000) + return -1; + last_attempt = now; + #ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; #else @@ -189,6 +196,7 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { TRACE("Found joystick[%d] at %s\n", jstick->joyIntf, buf); jstick->dev = fd; + last_attempt = 0; break; }

1 0

Sebastian Lackner : user32: Only call GlobalUnlock when GlobalLock was successful.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: a78fd8a07e93f4e64e99dd822e814d3f44b3d308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78fd8a07e93f4e64e99dd822… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 20:51:49 2016 +0200 user32: Only call GlobalUnlock when GlobalLock was successful. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 72f7334..f6f073e 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -89,8 +89,11 @@ static LCID get_clipboard_locale(void) if ((data = GetClipboardData( CF_LOCALE ))) { LCID *ptr = GlobalLock( data ); - if (ptr && GlobalSize( data ) >= sizeof(*ptr)) lcid = *ptr; - GlobalUnlock( data ); + if (ptr) + { + if (GlobalSize( data ) >= sizeof(*ptr)) lcid = *ptr; + GlobalUnlock( data ); + } } return lcid; }

1 0

Sebastian Lackner : jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 69437afed123117cff3002cd99bb9ce58490a85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69437afed123117cff3002cd9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:50:11 2016 +0200 jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 6 +++--- dlls/jscript/date.c | 22 +++++++++++----------- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 22 +++++++++++----------- dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/jsstr.c | 17 +++++++++-------- dlls/jscript/jsstr.h | 6 +++--- dlls/jscript/number.c | 4 ++-- dlls/jscript/object.c | 4 ++-- dlls/jscript/string.c | 24 ++++++++++++------------ 11 files changed, 59 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69437afed123117cff300…

1 0

Sebastian Lackner : jscript: Do not include terminating \0 in result returned by Date_toLocale{Date, Time}String.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 18420826aae58b25bdace5dc52ee7c6568e46aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18420826aae58b25bdace5dc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 19:04:48 2016 +0200 jscript: Do not include terminating \0 in result returned by Date_toLocale{Date,Time}String. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b35d812..b6997ab 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -925,7 +925,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD WCHAR *ptr; len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); - date_str = jsstr_alloc_buf(len, &ptr); + date_str = jsstr_alloc_buf(len-1, &ptr); if(!date_str) return E_OUTOFMEMORY; GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, ptr, len); @@ -964,7 +964,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD WCHAR *ptr; len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0); - date_str = jsstr_alloc_buf(len, &ptr); + date_str = jsstr_alloc_buf(len-1, &ptr); if(!date_str) return E_OUTOFMEMORY; GetTimeFormatW(ctx->lcid, 0, &st, NULL, ptr, len); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1ca974d..c7f2bcd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2130,6 +2130,11 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 201 ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); +tmp = (new Date()).toLocaleDateString(); +ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +tmp = (new Date()).toLocaleTimeString(); +ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

1 0