February 2017 - Wine-Commits

Andrew Eikum : jsproxy: Use debugstr_a on URL.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: aee52678f29be426bb7108296f1ef0931bb2d160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee52678f29be426bb7108296… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 10 13:35:07 2017 -0600 jsproxy: Use debugstr_a on URL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 11a671a..1ad57aa 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -635,7 +635,7 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW WCHAR *urlW = NULL, *hostnameW = NULL; BOOL ret = FALSE; - TRACE( "%s, %u, %s, %u, %p, %p\n", url, len_url, hostname, len_hostname, proxy, len_proxy ); + TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy ); EnterCriticalSection( &cs_jsproxy );

1 0

Henri Verbeet : ddraw: Implement GetSurfaceFromDC().
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: ebcf5196fc150b6ed4bf4891d3f5b0ebe08d625c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcf5196fc150b6ed4bf4891d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:58 2017 +0100 ddraw: Implement GetSurfaceFromDC(). Many thanks to Dmitry Timoshkov for helping figure this out. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.spec | 2 +- dlls/ddraw/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 41 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index 7575091..a6cf141 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec @@ -15,7 +15,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub GetNextMipMap -@ stub GetSurfaceFromDC +@ stdcall GetSurfaceFromDC(ptr ptr ptr) @ stub HeapVidMemAllocAligned @ stub InternalLock @ stub InternalUnlock diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4c94dd1..4caa923 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -200,6 +200,40 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha return entry->object; } +HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *device_dc) +{ + struct ddraw *ddraw; + + TRACE("dc %p, surface %p, device_dc %p.\n", dc, surface, device_dc); + + if (!surface) + return E_INVALIDARG; + + if (!device_dc) + { + *surface = NULL; + + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(ddraw, &global_ddraw_list, struct ddraw, ddraw_list_entry) + { + if (FAILED(IDirectDraw4_GetSurfaceFromDC(&ddraw->IDirectDraw4_iface, dc, surface))) + continue; + + *device_dc = NULL; /* FIXME */ + wined3d_mutex_unlock(); + return DD_OK; + } + wined3d_mutex_unlock(); + + *surface = NULL; + *device_dc = NULL; + + return DDERR_NOTFOUND; +} + /*********************************************************************** * * Helper function for DirectDrawCreate and friends diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d5b43f4..830da89 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -24,6 +24,8 @@ #include <math.h> #include "d3d.h" +HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc); + static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -12778,10 +12780,11 @@ static void test_get_surface_from_dc(void) IDirectDrawSurface4 *surface; DDSURFACEDESC2 surface_desc; IDirectDraw4 *ddraw; + HDC dc, device_dc; ULONG refcount; HWND window; HRESULT hr; - HDC dc; + DWORD ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -12810,6 +12813,33 @@ static void test_get_surface_from_dc(void) hr = IDirectDrawSurface4_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + tmp = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(NULL, &tmp, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, NULL, &device_dc); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(device_dc == (void *)0xdeadbeef, "Got unexpected device_dc %p.\n", device_dc); + + tmp = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + + hr = GetSurfaceFromDC(dc, &tmp, &device_dc); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp == surface1, "Got unexpected surface %p, expected %p.\n", tmp, surface1); + IDirectDrawSurface_Release(tmp); + + ret = GetObjectType(device_dc); + todo_wine ok(ret == OBJ_DC, "Got unexpected object type %#x.\n", ret); + ret = GetDeviceCaps(device_dc, TECHNOLOGY); + todo_wine ok(ret == DT_RASDISPLAY, "Got unexpected technology %#x.\n", ret); + hr = IDirectDraw4_GetSurfaceFromDC(ddraw, dc, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -12831,6 +12861,13 @@ static void test_get_surface_from_dc(void) ok(!!dc, "CreateCompatibleDC failed.\n"); tmp = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp, "Got unexpected surface %p.\n", tmp); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + tmp = (void *)0xdeadbeef; hr = IDirectDraw4_GetSurfaceFromDC(ddraw, dc, (IDirectDrawSurface4 **)&tmp); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!tmp, "Got unexpected surface %p.\n", tmp); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 70aff8f..31e7640 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -24,6 +24,8 @@ #include <math.h> #include "d3d.h" +HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc); + static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; @@ -12447,14 +12449,15 @@ static void test_surface_desc_size(void) static void test_get_surface_from_dc(void) { + IDirectDrawSurface *surface1, *tmp1; IDirectDrawSurface7 *surface, *tmp; - IDirectDrawSurface *surface1; DDSURFACEDESC2 surface_desc; IDirectDraw7 *ddraw; + HDC dc, device_dc; ULONG refcount; HWND window; HRESULT hr; - HDC dc; + DWORD ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -12483,6 +12486,33 @@ static void test_get_surface_from_dc(void) hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + tmp1 = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(NULL, &tmp1, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, NULL, &device_dc); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(device_dc == (void *)0xdeadbeef, "Got unexpected device_dc %p.\n", device_dc); + + tmp1 = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + + hr = GetSurfaceFromDC(dc, &tmp1, &device_dc); + ok(SUCCEEDED(hr), "GetSurfaceFromDC failed, hr %#x.\n", hr); + ok(tmp1 == surface1, "Got unexpected surface %p, expected %p.\n", tmp1, surface1); + IDirectDrawSurface_Release(tmp1); + + ret = GetObjectType(device_dc); + todo_wine ok(ret == OBJ_DC, "Got unexpected object type %#x.\n", ret); + ret = GetDeviceCaps(device_dc, TECHNOLOGY); + todo_wine ok(ret == DT_RASDISPLAY, "Got unexpected technology %#x.\n", ret); + hr = IDirectDraw7_GetSurfaceFromDC(ddraw, dc, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -12503,6 +12533,13 @@ static void test_get_surface_from_dc(void) dc = CreateCompatibleDC(NULL); ok(!!dc, "CreateCompatibleDC failed.\n"); + tmp1 = (void *)0xdeadbeef; + device_dc = (void *)0xdeadbeef; + hr = GetSurfaceFromDC(dc, &tmp1, &device_dc); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!tmp1, "Got unexpected surface %p.\n", tmp1); + ok(!device_dc, "Got unexpected device_dc %p.\n", device_dc); + tmp = (void *)0xdeadbeef; hr = IDirectDraw7_GetSurfaceFromDC(ddraw, dc, &tmp); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 7c10daf2db45384a0eed109afe41eaba42d2fa1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c10daf2db45384a0eed109af… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 10 21:24:26 2017 +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 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3672b8c..7e399ed 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: 2017-02-02 08:02+0300\n" +"PO-Revision-Date: 2017-02-10 21:23+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" @@ -11948,17 +11948,12 @@ msgstr "Nepavyko pervadinti pasirinktos registro reikšmės." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Raktai ir reikšmės iš %1 buvo sėkmingai pridėti į registrą." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"Nepavyko pervadinti rakto „%1“.\n" -"Nurodytas rakto vardas jau egzistuoja." +"Nepavyko importuoti %1. Nurodytas failas nėra teisingas registro failas." #: regedit.rc:373 msgid ""

1 0

Francois Gouget : browseui: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 9f0e5bf4b850aea53d50c27415e4c836771e8558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0e5bf4b850aea53d50c2741… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:44:00 2017 +0100 browseui: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/browseui.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index e03f47f..27691a1 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,19 +31,20 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void *heap_alloc(size_t size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); + if (!mem) return heap_alloc(size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Henri Verbeet : wined3d: Disable sRGB decode in swapchain_blit().
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 1401f91307b6cd70f77be7a8407574d0f541d11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1401f91307b6cd70f77be7a84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:59 2017 +0100 wined3d: Disable sRGB decode in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 56646e7..dfb62c8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -387,6 +387,9 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, + GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); context_set_draw_buffer(context, GL_BACK);

1 0

Francois Gouget : winetest: There is no special directory anymore.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 8e14f1f79a157028ccb332f1aea5b2b5f8885869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e14f1f79a157028ccb332f1a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 16:39:32 2017 +0100 winetest: There is no special directory anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 48b71c5..3b2342a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -514,11 +514,8 @@ static void remove_dir (const char *dir) static const char* get_test_source_file(const char* test, const char* subtest) { - static const char* special_dirs[][2] = { - { 0, 0 } - }; static char buffer[MAX_PATH]; - int i, len = strlen(test); + int len = strlen(test); if (len > 4 && !strcmp( test + len - 4, ".exe" )) { @@ -527,14 +524,6 @@ static const char* get_test_source_file(const char* test, const char* subtest) } else len = sprintf(buffer, "dlls/%s", test); - for (i = 0; special_dirs[i][0]; i++) { - if (strcmp(test, special_dirs[i][0]) == 0) { - strcpy( buffer, special_dirs[i][1] ); - len = strlen(buffer); - break; - } - } - sprintf(buffer + len, "/tests/%s.c", subtest); return buffer; }

1 0

Francois Gouget : advapi32: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 32c066d1f271b30d3e86513e92f8a4b4e4f49ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c066d1f271b30d3e86513e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:44:45 2017 +0100 advapi32: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 425a7be..d116ecb 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -35,28 +35,26 @@ DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; -/* heap allocation helpers */ -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +/* memory allocation functions */ + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupAW( const char *src )

1 0

Henri Verbeet : d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateDepthStencilSurface().
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 04586f6328f6d8040b8ecf34fea50e1761d7cfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=04586f6328f6d8040b8ecf34f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 10 13:58:56 2017 +0100 d3d8: Do not modify the "surface" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateDepthStencilSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f8eb7ee..9592342 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1010,6 +1010,9 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", iface, width, height, format, multisample_type, surface); + if (!format) + return D3DERR_INVALIDCALL; + *surface = NULL; /* TODO: Verify that Discard is false */ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2295300..45969fe 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8218,7 +8218,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, (IDirect3DSurface8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateImageSurface(device, 64, 64,

1 0

Alistair Leslie-Hughes : include: Correct value passed to __WINE_ALLOC_SIZE.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 1ca3a8b7cdfb3ff40d1dca7c7fae67034cafb38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca3a8b7cdfb3ff40d1dca7c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 10 06:39:15 2017 +0000 include: Correct value passed to __WINE_ALLOC_SIZE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index bf14d79..84cda0f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2246,7 +2246,7 @@ WINBASEAPI HGLOBAL WINAPI GlobalHandle(LPCVOID); WINBASEAPI LPVOID WINAPI GlobalLock(HGLOBAL); WINBASEAPI VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS); WINBASEAPI BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); -WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(3); +WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(2); WINBASEAPI SIZE_T WINAPI GlobalSize(HGLOBAL); WINBASEAPI VOID WINAPI GlobalUnfix(HGLOBAL); WINBASEAPI BOOL WINAPI GlobalUnlock(HGLOBAL); @@ -2321,7 +2321,7 @@ WINBASEAPI UINT WINAPI LocalFlags(HLOCAL); WINBASEAPI HLOCAL WINAPI LocalFree(HLOCAL); WINBASEAPI HLOCAL WINAPI LocalHandle(LPCVOID); WINBASEAPI LPVOID WINAPI LocalLock(HLOCAL); -WINBASEAPI HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(3); +WINBASEAPI HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(2); WINBASEAPI SIZE_T WINAPI LocalShrink(HGLOBAL,UINT); WINBASEAPI SIZE_T WINAPI LocalSize(HLOCAL); WINBASEAPI BOOL WINAPI LocalUnlock(HLOCAL);

1 0

Nikolay Sivov : d2d1: Always create HWND target as gdi-compatible.
by Alexandre Julliard Feb. 10, 2017

Feb. 10, 2017

Module: wine Branch: master Commit: 71cb1be214315d315f6f523f13760f39960d0061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cb1be214315d315f6f523f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 10 15:00:18 2017 +0300 d2d1: Always create HWND target as gdi-compatible. 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/hwnd_render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 4f68afd..2ce7b71 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -839,7 +839,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = hwnd_rt_desc->presentOptions & D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS ? DXGI_SWAP_EFFECT_SEQUENTIAL : DXGI_SWAP_EFFECT_DISCARD; - swapchain_desc.Flags = 0; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; hr = IDXGIFactory_CreateSwapChain(dxgi_factory, (IUnknown *)device, &swapchain_desc, &render_target->swapchain); IDXGIFactory_Release(dxgi_factory);

1 0