wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Nikolay Sivov : dxgi: Added partial implementation of GetDC()/ReleaseDC().
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 4cffa0e2636b75e14fc3ef44b360f1b66b9f7b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cffa0e2636b75e14fc3ef44b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 8 13:26:52 2016 +0300 dxgi: Added partial implementation of GetDC()/ReleaseDC(). 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/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 6 +++--- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/surface.c | 32 ++++++++++++++++++++++++++++---- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f70b4ff..6007a3b 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -720,7 +720,7 @@ static void test_getdc(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); /* One more time. */ dc = (HDC)0xdeadbeef; @@ -729,7 +729,7 @@ static void test_getdc(void) ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); hr = IDXGISurface1_ReleaseDC(surface1, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); hr = IDXGISurface1_ReleaseDC(surface1, NULL); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43e43db..b53de3b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8426,10 +8426,10 @@ static void test_getdc(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGISurface1_GetDC(surface, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); hr = IDXGISurface1_ReleaseDC(surface, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); IDXGISurface1_Release(surface); ID3D11Texture2D_Release(texture); @@ -8481,7 +8481,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDXGISurface1_GetDC(surface, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); + ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); if (FAILED(hr)) { diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 86ba34a..06892e2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -184,6 +184,7 @@ struct dxgi_surface struct wined3d_private_store private_store; IDXGIDevice *device; struct wined3d_texture *wined3d_texture; + HDC dc; }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 687caaa..36fc1e6 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -197,16 +197,39 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) /* IDXGISurface1 methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDC(IDXGISurface1 *iface, BOOL discard, HDC *hdc) { - FIXME("iface %p, discard %d, hdc %p stub!\n", iface, discard, hdc); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, discard %d, hdc %p semi-stub!\n", iface, discard, hdc); + + if (!hdc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + hr = wined3d_texture_get_dc(surface->wined3d_texture, 0, hdc); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + surface->dc = *hdc; + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_surface_ReleaseDC(IDXGISurface1 *iface, RECT *dirty_rect) { - FIXME("iface %p, rect %p stub!\n", iface, dirty_rect); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, rect %s\n", iface, wine_dbgstr_rect(dirty_rect)); + + if (!IsRectEmpty(dirty_rect)) + FIXME("dirty rectangle is ignored.\n"); + + wined3d_mutex_lock(); + hr = wined3d_texture_release_dc(surface->wined3d_texture, 0, surface->dc); + wined3d_mutex_unlock(); + + return hr; } static const struct IDXGISurface1Vtbl dxgi_surface_vtbl = @@ -249,6 +272,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; surface->wined3d_texture = wined3d_texture; + surface->dc = NULL; return S_OK; }

1 0

Nikolay Sivov : d3d11: Enabled GetDC() capability for 2D textures.
by Alexandre Julliard 08 Sep '16

08 Sep '16

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 08 Sep '16

08 Sep '16

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

Jacek Caban : winhttp: Added WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER options stub.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 9bc3e9614f59619c409658da11285ffa758b0611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc3e9614f59619c409658da1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 18:57:30 2016 +0200 winhttp: Added WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER options stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 600624c..4813a3f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -205,6 +205,12 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); session->unload_event = *(HANDLE *)buffer; return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: + FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); + return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: + FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

Andrey Gusev : api-ms-win-core-privateprofile-l1-1-1: Add dll.
by Alexandre Julliard 08 Sep '16

08 Sep '16

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 call to GlobalUnlock in render_synthesized_enhmetafile.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 4e63a5bf8fa76e145fbd83ba8a8bcd22cedd57f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e63a5bf8fa76e145fbd83ba8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 20:52:49 2016 +0200 user32: Add missing call to GlobalUnlock in render_synthesized_enhmetafile. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 135790a..d11dd23 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -348,6 +348,8 @@ static HANDLE render_synthesized_enhmetafile( HANDLE data ) ret = SetWinMetaFileBits( size, bits, NULL, pict ); HeapFree( GetProcessHeap(), 0, bits ); } + + GlobalUnlock( data ); return ret; }

1 0

Sebastian Lackner : user32: Add missing calls to GlobalUnlock in render_synthesized_dib.
by Alexandre Julliard 08 Sep '16

08 Sep '16

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

Sebastian Lackner : user32: Only call GlobalUnlock when GlobalLock was successful.
by Alexandre Julliard 08 Sep '16

08 Sep '16

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

Alistair Leslie-Hughes : ws2_32: Accept shouldn' t fail when addrlen32 is NULL.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: f9d40575740fba3e48c5ab2638e630b4a24f3126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d40575740fba3e48c5ab263… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 04:31:42 2016 +0000 ws2_32: Accept shouldn't fail when addrlen32 is NULL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ccd50f8..f0dc04f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2653,7 +2653,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) SERVER_END_REQ; if (!status) { - if (addr && WS_getpeername(as, addr, addrlen32)) + if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { WS_closesocket(as); return SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98ff7c7..be98691 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4068,7 +4068,7 @@ static void test_accept(void) int ret; SOCKET server_socket, accepted = INVALID_SOCKET, connector; struct sockaddr_in address; - SOCKADDR_STORAGE ss; + SOCKADDR_STORAGE ss, ss_empty; int socklen; select_thread_params thread_params; HANDLE thread_handle = NULL; @@ -4199,6 +4199,19 @@ static void test_accept(void) ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); ok(socklen != sizeof(ss), "unexpected length\n"); ok(ss.ss_family, "family not set\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen, FALSE); + if (connector == INVALID_SOCKET) goto done; + + memset(&ss, 0, sizeof(ss)); + memset(&ss_empty, 0, sizeof(ss_empty)); + accepted = accept(server_socket, (struct sockaddr *)&ss, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(!memcmp(&ss, &ss_empty, sizeof(ss)), "structure is different\n"); done: if (accepted != INVALID_SOCKET)

1 0

Sebastian Lackner : jscript: Do not include terminating \0 in result returned by Date_toLocale{Date, Time}String.
by Alexandre Julliard 08 Sep '16

08 Sep '16

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

← Newer
1
...
28
29
30
31
32
33
34
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2016