September 2013 - Wine-Commits

Henri Verbeet : ddraw: Verify that the surface is in video memory in SetRenderTarget().
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: c70376af6310566e129168985373dc78e85f87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70376af6310566e129168985… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 19 10:16:46 2013 +0200 ddraw: Verify that the surface is in video memory in SetRenderTarget(). This is where things become a bit of a mess, because the error checking is inconsistent between versions. --- dlls/ddraw/device.c | 113 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9ec9d1d..af343bb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1810,32 +1810,14 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, { HRESULT hr; - wined3d_mutex_lock(); - - if (!validate_surface_palette(target)) - { - WARN("Surface %p has an indexed pixel format, but no palette.\n", target); - wined3d_mutex_unlock(); - return DDERR_INVALIDCAPS; - } - - if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) - { - WARN("Surface %p is not a render target.\n", target); - wined3d_mutex_unlock(); - return DDERR_INVALIDCAPS; - } - if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n"); - wined3d_mutex_unlock(); return D3D_OK; } if (!target) { WARN("Trying to set render target to NULL.\n"); - wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } @@ -1844,14 +1826,9 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, device->rt_iface = rt_iface; if (FAILED(hr = wined3d_device_set_render_target(device->wined3d_device, 0, target->wined3d_surface, FALSE))) - { - wined3d_mutex_unlock(); return hr; - } d3d_device_update_depth_stencil(device); - wined3d_mutex_unlock(); - return D3D_OK; } @@ -1860,10 +1837,36 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, { struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface7(target); struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + HRESULT hr; TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - return d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } static HRESULT WINAPI d3d_device7_SetRenderTarget_FPUSetup(IDirect3DDevice7 *iface, @@ -1890,10 +1893,39 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, { struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface4(target); struct d3d_device *device = impl_from_IDirect3DDevice3(iface); + HRESULT hr; TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - return d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + IDirectDrawSurface4_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return D3D_OK; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, @@ -1901,10 +1933,39 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, { struct ddraw_surface *target_impl = unsafe_impl_from_IDirectDrawSurface(target); struct d3d_device *device = impl_from_IDirect3DDevice2(iface); + HRESULT hr; TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags); - return d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_lock(); + + if (!validate_surface_palette(target_impl)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target_impl); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + WARN("Surface %p is not in video memory.\n", target_impl); + IDirectDrawSurface_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return D3D_OK; + } + + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); + wined3d_mutex_unlock(); + return hr; } /*****************************************************************************

1 0

Rico Schüller : d3dx9/tests: Add matrix column register count clamp test.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 196766cb77976c6d3d2c3922653c278e117ddac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=196766cb77976c6d3d2c39226… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 18 23:16:47 2013 +0200 d3dx9/tests: Add matrix column register count clamp test. --- dlls/d3dx9_36/tests/shader.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d773a39..02e69af 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5560,6 +5560,47 @@ static const struct registerset_test registerset_test_bigvec_float[] = 0x42800123, 0x43200123, 0x43600123}}, }; +/* + * fxc.exe /Tvs_3_0 + */ +#if 0 +float4x4 cf = {1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8}; +float f = 33.33; +float4 main(float4 pos : POSITION) : POSITION +{ + float4 tmp = 0; + tmp.y += cf._22; + tmp.z = f; + return tmp; +} +#endif +static const DWORD registerset_blob_matrix_column_clamp[] = +{ +0xfffe0300, 0x003efffe, 0x42415443, 0x0000001c, 0x000000c3, 0xfffe0300, 0x00000002, 0x0000001c, +0x00000100, 0x000000bc, 0x00000044, 0x00000002, 0x00000002, 0x00000048, 0x00000058, 0x00000098, +0x00020002, 0x00000001, 0x0000009c, 0x000000ac, 0xab006663, 0x00030003, 0x00040004, 0x00000001, +0x00000000, 0x3f8ccccd, 0x40b00000, 0x411e6666, 0x3fc00000, 0x400ccccd, 0x40d33333, 0x3f99999a, +0x3fcccccd, 0x40533333, 0x40f66666, 0x3fa66666, 0x3fd9999a, 0x408ccccd, 0x410ccccd, 0x3fb33333, +0x3fe66666, 0xabab0066, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0x420551ec, 0x00000000, +0x00000000, 0x00000000, 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, +0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, +0x05000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, 0x0200001f, 0x80000000, +0xe00f0000, 0x02000001, 0x80020000, 0xa0550001, 0x03000005, 0xe00b0000, 0x80550000, 0xa0240003, +0x02000001, 0xe0040000, 0xa0000002, 0x0000ffff, +}; + +static const struct registerset_constants registerset_constants_matrix_column_clamp[] = +{ + {"cf", {"cf", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, 0}, + {"f", {"f", D3DXRS_FLOAT4, 2, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, NULL}, 0}, +}; + +static const struct registerset_test registerset_test_matrix_column_clamp[] = +{ + {SetMatrix, 0, 0, 0, 8, + {0x40000123, 0x40c00123, 0x41200123, 0x41600123, 0x00000000, 0x40e00123, 0x41300123, 0x41700123}}, +}; + static const struct { const char *name; @@ -5831,6 +5872,11 @@ registerset_data[] = sizeof(registerset_test_bigvec_float) / sizeof(*registerset_test_bigvec_float), registerset_constants_bigvec_float, sizeof(registerset_constants_bigvec_float) / sizeof(*registerset_constants_bigvec_float)}, + {"cf", "cf", 0, D3DXRS_FLOAT4, registerset_blob_matrix_column_clamp, + registerset_test_matrix_column_clamp, + sizeof(registerset_test_matrix_column_clamp) / sizeof(*registerset_test_matrix_column_clamp), + registerset_constants_matrix_column_clamp, + sizeof(registerset_constants_matrix_column_clamp) / sizeof(*registerset_constants_matrix_column_clamp)}, }; static void registerset_clear(IDirect3DDevice9 *device) @@ -6283,6 +6329,11 @@ registerset_defaults_data[] = {0x00000000}}, /* DefaultValue = NULL */ {"big vector", registerset_blob_bigvec}, + {"matrix column clamp", registerset_blob_matrix_column_clamp, 12, 0, 0, + {0x3f8ccccd, 0x40b00000, 0x411e6666, 0x3fc00000, 0x400ccccd, 0x40d33333, 0x3f99999a, 0x3fcccccd, + 0x420551ec, 0x00000000, 0x00000000, 0x00000000}, + {0x00000000}, + {0x00000000}}, }; static void test_registerset_defaults(void)

1 0

Aric Stewart : imm32: Fix ImmGetDescription behavior with a null HKL.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 8b933495fb4b9a874b9f1f3560847739520ba384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b933495fb4b9a874b9f1f356… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 17 13:52:23 2013 -0500 imm32: Fix ImmGetDescription behavior with a null HKL. --- dlls/imm32/imm.c | 3 +++ dlls/imm32/tests/imm32.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 59e7ff2..29bf4af 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1523,6 +1523,8 @@ UINT WINAPI ImmGetDescriptionA( /* find out how many characters in the unicode buffer */ len = ImmGetDescriptionW( hKL, NULL, 0 ); + if (!len) + return 0; /* allocate a buffer of that size */ buf = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR) ); @@ -1550,6 +1552,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); + if (!hKL) return 0; if (!uBufLen) return lstrlenW( name ); lstrcpynW( lpszDescription, name, uBufLen ); return lstrlenW( lpszDescription ); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7abc4c3..7162f82 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -629,18 +629,19 @@ static void test_ImmGetContext(void) static void test_ImmGetDescription(void) { HKL hkl; - WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; WCHAR descW[100]; CHAR descA[100]; UINT ret, lret; /* FIXME: invalid keyboard layouts should not pass */ ret = ImmGetDescriptionW(NULL, NULL, 0); - todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + ret = ImmGetDescriptionA(NULL, NULL, 0); + ok(!ret, "ImmGetDescriptionA failed, expected 0 received %d.\n", ret); /* load a language with valid IMM descriptions */ - hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); - todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + hkl = GetKeyboardLayout(0); + ok(hkl != 0, "GetKeyboardLayout failed, expected != 0.\n"); ret = ImmGetDescriptionW(hkl, NULL, 0); if(!ret) @@ -649,6 +650,12 @@ static void test_ImmGetDescription(void) return; } + SetLastError(0xdeadcafe); + ret = ImmGetDescriptionW(0, NULL, 100); + ok (ret == 0, "ImmGetDescriptionW with 0 hkl should return 0\n"); + ret = GetLastError(); + ok (ret == 0xdeadcafe, "Last Error should remain unchanged\n"); + ret = ImmGetDescriptionW(hkl, descW, 0); ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n");

1 0

Ken Thomases : winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/ end of a resizing operation.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 4ad9d5f04affb22f6e3724b66da814088a89c897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9d5f04affb22f6e3724b66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:01:03 2013 -0500 winemac: Send WM_ENTER/EXITSIZEMOVE messages at start/end of a resizing operation. --- dlls/winemac.drv/cocoa_window.m | 7 +++++++ dlls/winemac.drv/event.c | 4 ++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d833d04..a602adb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1476,6 +1476,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) windowDidEndLiveResize:(NSNotification *)notification { + macdrv_query* query = macdrv_create_query(); + query->type = QUERY_RESIZE_END; + query->window = (macdrv_window)[self retain]; + + [self.queue query:query timeout:0.3]; + macdrv_release_query(query); + self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 97f1e3b..709079a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -146,6 +146,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; + case QUERY_RESIZE_END: + TRACE("QUERY_RESIZE_END\n"); + success = query_resize_end(hwnd); + break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d308e69..a0e0b52 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -161,6 +161,7 @@ extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_did_minimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71d8c9f..2f26b34 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -272,6 +272,7 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, + QUERY_RESIZE_END, QUERY_RESIZE_START, NUM_QUERY_TYPES }; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 411270c..4cb8082 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1991,6 +1991,22 @@ fail: BOOL query_resize_start(HWND hwnd) { TRACE("hwnd %p\n", hwnd); + sync_window_min_max_info(hwnd); + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); + + return TRUE; +} + + +/*********************************************************************** + * query_resize_end + * + * Handler for QUERY_RESIZE_END query. + */ +BOOL query_resize_end(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); return TRUE; }

1 0

Ken Thomases : winemac: At the start of a resize operation, get window min/ max size info and pass it to Cocoa.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: a3197b8ad09c92c2af463d1a30ecf15c3ed98ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3197b8ad09c92c2af463d1a3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:00:37 2013 -0500 winemac: At the start of a resize operation, get window min/max size info and pass it to Cocoa. --- dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 52 ++++++++++++--- dlls/winemac.drv/event.c | 4 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 + dlls/winemac.drv/window.c | 136 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3197b8ad09c92c2af463…

1 0

Jacek Caban : mshtml: Moved Exec(DOCHOST_DOCCANNAVIGATE) call to separated function.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 42c1b3936da43e7b946f9d298a5dfab95aeecaf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c1b3936da43e7b946f9d298… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 16:57:56 2013 +0200 mshtml: Moved Exec(DOCHOST_DOCCANNAVIGATE) call to separated function. --- dlls/mshtml/oleobj.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index ac15cdf..fded548 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -210,6 +210,22 @@ void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } +static void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) +{ + VARIANT var; + + if(!doc->client_cmdtrg) + return; + + if(doc_can_navigate) { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&doc->basedoc.window->base.IHTMLWindow2_iface; + } + + IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, + doc_can_navigate ? &var : NULL, NULL); +} + static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { HTMLDocument *This = impl_from_IOleObject(iface); @@ -359,9 +375,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IDocObjectService *doc_object_service; IWebBrowser2 *wb; - V_VT(&var) = VT_UNKNOWN; - V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; - IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); + set_document_navigation(This->doc_obj, TRUE); if(browser_service) { hres = IBrowserService_QueryInterface(browser_service,

1 0

Huw Davies : iphlpapi: Add helpers to convert the host' s sockaddr structures to SOCKADDR_STORAGE.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: f8463f28a9b62886c200c5a09ef02d94f7b39723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8463f28a9b62886c200c5a09… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 18 11:49:16 2013 +0100 iphlpapi: Add helpers to convert the host's sockaddr structures to SOCKADDR_STORAGE. --- dlls/iphlpapi/iphlpapi_main.c | 51 ++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f84c700..e2d09eb 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -925,6 +925,30 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ERROR_SUCCESS; } +static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in *src ) +{ + SOCKADDR_IN *s = (SOCKADDR_IN *)dst; + + s->sin_family = WS_AF_INET; + s->sin_port = src->sin_port; + memcpy( &s->sin_addr, &src->sin_addr, sizeof(IN_ADDR) ); + memset( (char *)s + FIELD_OFFSET( SOCKADDR_IN, sin_zero ), 0, + sizeof(SOCKADDR_STORAGE) - FIELD_OFFSET( SOCKADDR_IN, sin_zero) ); +} + +static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src ) +{ + SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst; + + s->sin6_family = WS_AF_INET6; + s->sin6_port = src->sin6_port; + s->sin6_flowinfo = src->sin6_flowinfo; + memcpy( &s->sin6_addr, &src->sin6_addr, sizeof(IN6_ADDR) ); + s->sin6_scope_id = src->sin6_scope_id; + memset( (char *)s + sizeof(SOCKADDR_IN6), 0, + sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); +} + #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ @@ -957,22 +981,13 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) #ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 if (_res._u._ext.nsaddrs[i]) { - SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; if (ip4_only) continue; - s->sin6_family = WS_AF_INET6; - s->sin6_port = _res._u._ext.nsaddrs[i]->sin6_port; - s->sin6_flowinfo = _res._u._ext.nsaddrs[i]->sin6_flowinfo; - memcpy( &s->sin6_addr, &_res._u._ext.nsaddrs[i]->sin6_addr, sizeof(IN6_ADDR) ); - s->sin6_scope_id = _res._u._ext.nsaddrs[i]->sin6_scope_id; - memset( (char *)s + sizeof(SOCKADDR_IN6), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + sockaddr_in6_to_WS_storage( addr, _res._u._ext.nsaddrs[i] ); } else #endif { - *(struct sockaddr_in *)addr = _res.nsaddr_list[i]; - memset( (char *)addr + sizeof(struct sockaddr_in), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + sockaddr_in_to_WS_storage( addr, _res.nsaddr_list + i ); } addr++; } @@ -1004,21 +1019,11 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) if (buf[i].ss_family == AF_INET6) { - SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)addr; - struct sockaddr_in6 *ptr = (struct sockaddr_in6 *)(buf + i); - s->sin6_family = WS_AF_INET6; - s->sin6_port = ptr->sin6_port; - s->sin6_flowinfo = ptr->sin6_flowinfo; - memcpy( &s->sin6_addr, &ptr->sin6_addr, sizeof(IN6_ADDR) ); - s->sin6_scope_id = ptr->sin6_scope_id; - memset( (char *)s + sizeof(SOCKADDR_IN6), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(SOCKADDR_IN6) ); + sockaddr_in6_to_WS_storage( addr, (struct sockaddr_in6 *)(buf + i) ); } else { - *(struct sockaddr_in *)addr = *(struct sockaddr_in *)(buf + i); - memset( (char *)addr + sizeof(struct sockaddr_in), 0, - sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) ); + sockaddr_in_to_WS_storage( addr, (struct sockaddr_in *)(buf + i) ); } if (++addr >= servers + num) break; }

1 0

Stefan Dösinger : d3d9/tests: Add tests for block-based volume formats.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 50d2cdd0ea7193178cd44e3e8e3f47400be30e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d2cdd0ea7193178cd44e3e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:58 2013 +0200 d3d9/tests: Add tests for block-based volume formats. --- dlls/d3d9/tests/device.c | 361 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 361 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50d2cdd0ea7193178cd44…

1 0

Stefan Dösinger : wined3d: Mapping a mapped volume is an error.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 83b404879c091e192b770f73e0065abea5eb7856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b404879c091e192b770f73e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:55 2013 +0200 wined3d: Mapping a mapped volume is an error. --- dlls/wined3d/volume.c | 15 ++++++++++----- dlls/wined3d/wined3d_private.h | 7 +++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 540db93..508b1df 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -524,10 +524,15 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); + map_desc->data = NULL; if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) { WARN("Volume %p is not CPU accessible.\n", volume); - map_desc->data = NULL; + return WINED3DERR_INVALIDCALL; + } + if (volume->resource.map_count) + { + WARN("Volume is already mapped.\n"); return WINED3DERR_INVALIDCALL; } flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); @@ -614,7 +619,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); } - volume->flags |= WINED3D_VFLAG_LOCKED; + volume->resource.map_count++; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); @@ -631,9 +636,9 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (!(volume->flags & WINED3D_VFLAG_LOCKED)) + if (!volume->resource.map_count) { - WARN("Trying to unlock unlocked volume %p.\n", volume); + WARN("Trying to unlock an unlocked volume %p.\n", volume); return WINED3DERR_INVALIDCALL; } @@ -651,7 +656,7 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) context_release(context); } - volume->flags &= ~WINED3D_VFLAG_LOCKED; + volume->resource.map_count--; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4928f92..f85bfec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2110,10 +2110,9 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; -#define WINED3D_VFLAG_LOCKED 0x00000001 -#define WINED3D_VFLAG_ALLOCATED 0x00000002 -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000004 -#define WINED3D_VFLAG_PBO 0x00000008 +#define WINED3D_VFLAG_ALLOCATED 0x00000001 +#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 +#define WINED3D_VFLAG_PBO 0x00000004 #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002

1 0

Jacek Caban : d3d11sdklayers.idl: Added new file.
by Alexandre Julliard Sept. 18, 2013

Sept. 18, 2013

Module: wine Branch: master Commit: 515af78f6b4b33dfd11c4d0f9d9c0427e3712c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515af78f6b4b33dfd11c4d0f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 11:36:13 2013 +0200 d3d11sdklayers.idl: Added new file. --- .gitignore | 1 + include/Makefile.in | 1 + include/d3d11.idl | 2 +- include/d3d11sdklayers.idl | 1259 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1262 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=515af78f6b4b33dfd11c4…

1 0