August 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : ole32: Fix standard GIT initialization.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 2f21130f2e922614382425b702b90bc581d526e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f21130f2e922614382425b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 18 09:10:18 2013 +0400 ole32: Fix standard GIT initialization. --- dlls/ole32/compobj.c | 8 +----- dlls/ole32/compobj_private.h | 4 +-- dlls/ole32/git.c | 43 ++++++++++++++++++++++++----------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 92ace8a..710f21e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2905,15 +2905,11 @@ HRESULT WINAPI CoCreateInstance( /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. - * Rather than create a class factory, we can just check for it here */ if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) - StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); - hres = IGlobalInterfaceTable_QueryInterface((IGlobalInterfaceTable*)StdGlobalInterfaceTableInstance, - iid, - ppv); + IGlobalInterfaceTable *git = get_std_git(); + hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); if (hres) return hres; TRACE("Retrieved GIT (%p)\n", *ppv); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c4379cb..6352553 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -173,10 +173,8 @@ struct oletls /* Global Interface Table Functions */ - -extern void* StdGlobalInterfaceTable_Construct(void) DECLSPEC_HIDDEN; +extern IGlobalInterfaceTable *get_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; -extern void* StdGlobalInterfaceTableInstance DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index dd65c2e..ad921ed 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -72,7 +72,7 @@ typedef struct StdGlobalInterfaceTableImpl } StdGlobalInterfaceTableImpl; -void* StdGlobalInterfaceTableInstance; +static IGlobalInterfaceTable *std_git; static CRITICAL_SECTION git_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -96,7 +96,7 @@ static void StdGlobalInterfaceTable_Destroy(void* This) FIXME("Revoke held interfaces here\n"); HeapFree(GetProcessHeap(), 0, This); - StdGlobalInterfaceTableInstance = NULL; + std_git = NULL; } /*** @@ -335,9 +335,8 @@ GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) - StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); - return IGlobalInterfaceTable_QueryInterface( (IGlobalInterfaceTable*) StdGlobalInterfaceTableInstance, riid, ppv); + IGlobalInterfaceTable *git = get_std_git(); + return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); } FIXME("(%s), not supported.\n",debugstr_guid(riid)); @@ -378,19 +377,27 @@ static const IGlobalInterfaceTableVtbl StdGlobalInterfaceTableImpl_Vtbl = StdGlobalInterfaceTable_GetInterfaceFromGlobal }; -/** This function constructs the GIT. It should only be called once **/ -void* StdGlobalInterfaceTable_Construct(void) +IGlobalInterfaceTable* get_std_git(void) { - StdGlobalInterfaceTableImpl* newGIT; - - newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); - if (newGIT == 0) return newGIT; - - newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; - newGIT->ref = 1; /* Initialise the reference count */ - list_init(&newGIT->list); - newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ - TRACE("Created the GIT at %p\n", newGIT); + if (!std_git) + { + StdGlobalInterfaceTableImpl* newGIT; + + newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); + if (!newGIT) return NULL; + + newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; + newGIT->ref = 1; + list_init(&newGIT->list); + newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ + + if (InterlockedCompareExchangePointer((void**)&std_git, &newGIT->IGlobalInterfaceTable_iface, NULL)) + { + StdGlobalInterfaceTable_Destroy(newGIT); + } + else + TRACE("Created the GIT at %p\n", newGIT); + } - return (void*)newGIT; + return std_git; }

1 0

Henri Verbeet : d3drm: Avoid LPUNKNOWN.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: be6b54f52f87340e3a1ba39fb54fe52828168baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6b54f52f87340e3a1ba39fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:13 2013 +0200 d3drm: Avoid LPUNKNOWN. --- dlls/d3drm/d3drm.c | 29 ++++++--------- dlls/d3drm/device.c | 27 +++++---------- dlls/d3drm/face.c | 17 +++------ dlls/d3drm/frame.c | 48 +++++++++++--------------- dlls/d3drm/light.c | 9 ++--- dlls/d3drm/material.c | 7 ++-- dlls/d3drm/meshbuilder.c | 57 ++++++++++--------------------- dlls/d3drm/texture.c | 14 +++---- dlls/d3drm/viewport.c | 18 +++------ include/d3drm.h | 6 ++-- include/d3drmdef.h | 2 +- include/d3drmobj.h | 84 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 2 +- 13 files changed, 131 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6b54f52f87340e3a1ba…

1 0

Henri Verbeet : d3d8: Always create textures for surfaces.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 133bfe29e4b5d70e5e962dbce2f5e56f8264a83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=133bfe29e4b5d70e5e962dbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:11 2013 +0200 d3d8: Always create textures for surfaces. --- dlls/d3d8/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2f09a4f..e2a6af9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,6 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = +{ + d3d8_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -871,7 +878,10 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface8 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d8_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d8_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p,\n" @@ -879,22 +889,36 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d8_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface8_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice8_iface; + *surface = &surface_impl->IDirect3DSurface8_iface; + IDirect3DSurface8_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1910,13 +1934,6 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return hr; } -static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = -{ - d3d8_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) { @@ -2907,14 +2924,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d8_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface8 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0

Henri Verbeet : d3d9: Always create textures for surfaces.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: d0c9dbe7633c0618660dcf85bb8e6bc7f367a8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c9dbe7633c0618660dcf85b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:10 2013 +0200 d3d9: Always create textures for surfaces. --- dlls/d3d9/device.c | 72 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 738a274..261591b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -25,6 +25,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} + +static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = +{ + d3d9_null_wined3d_object_destroyed, +}; + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -909,7 +916,10 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct d3d9_surface *object; + struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; + struct d3d9_surface *surface_impl; + struct wined3d_texture *texture; HRESULT hr; TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p.\n" @@ -917,22 +927,36 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = wined3dformat_from_d3dformat(format); + desc.multisample_type = multisample_type; + desc.multisample_quality = multisample_quality; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; - if (FAILED(hr = surface_init(object, device, width, height, format, - flags, usage, pool, multisample_type, multisample_quality))) + wined3d_mutex_lock(); + + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &desc, + 1, flags, NULL, &d3d9_null_wined3d_parent_ops, &texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - TRACE("Created surface %p.\n", object); - *surface = &object->IDirect3DSurface9_iface; + sub_resource = wined3d_texture_get_sub_resource(texture, 0); + surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl->forwardReference = NULL; + surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface; + *surface = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*surface); + wined3d_texture_decref(texture); + + wined3d_mutex_unlock(); return D3D_OK; } @@ -1989,13 +2013,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return hr; } -static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = -{ - d3d9_null_wined3d_object_destroyed, -}; - /* The caller is responsible for wined3d locking */ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UINT min_size) { @@ -3292,14 +3309,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, desc, sub_resource_idx, flags, surface); - if (FAILED(hr = d3d9_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), flags, (IDirect3DSurface9 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) { - WARN("Failed to create surface, hr %#x.\n", hr); + FIXME("Failed to allocate surface memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + if (FAILED(hr = surface_init(d3d_surface, device, desc->width, desc->height, + d3dformat_from_wined3dformat(desc->format), flags, desc->usage, desc->pool, + desc->multisample_type, desc->multisample_quality))) + { + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, d3d_surface); return hr; } + TRACE("Created surface %p.\n", d3d_surface); + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface);

1 0

Vincent Povirk : riched20: Use \ulnone instead of \ul0 for no underline.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: d04d1c17369887c365174c062d2975d957509980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d1c17369887c365174c062… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 19 17:31:38 2013 -0500 riched20: Use \ulnone instead of \ul0 for no underline. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6a4538c..ea797fd 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -680,7 +680,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) break; case CFU_UNDERLINENONE: default: - strcat(props, "\\ul0"); + strcat(props, "\\ulnone"); break; } else if (fmt->dwEffects & CFE_UNDERLINE)

1 0

Henri Verbeet : wined3d: Store the original display mode in the swapchain.
by Alexandre Julliard Aug. 20, 2013

Aug. 20, 2013

Module: wine Branch: master Commit: 7e7bd87b2cf2786f858a5d14a4611c34102bbbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7bd87b2cf2786f858a5d14a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:09 2013 +0200 wined3d: Store the original display mode in the swapchain. --- dlls/wined3d/device.c | 6 +----- dlls/wined3d/swapchain.c | 39 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1db04b4..1ab93a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5012,11 +5012,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } else if (swapchain_desc->windowed) { - m.width = swapchain->orig_width; - m.height = swapchain->orig_height; - m.refresh_rate = 0; - m.format_id = swapchain->desc.backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m = swapchain->original_mode; } else { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f6cfc2e..47ee901 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -30,7 +30,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); /* Do not call while under the GL lock. */ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { - struct wined3d_display_mode mode; HRESULT hr; UINT i; @@ -76,13 +75,8 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) * orig_height will be equal to the modes in the presentation params. */ if (!swapchain->desc.windowed && swapchain->desc.auto_restore_display_mode) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->orig_fmt; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &mode))) + swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); } @@ -818,8 +812,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 { const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc surface_desc; - const struct wined3d_format *format; - struct wined3d_display_mode mode; BOOL displaymode_set = FALSE; RECT client_rect; HWND window; @@ -853,11 +845,12 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 swapchain->win_handle = window; swapchain->device_window = window; - wined3d_get_adapter_display_mode(device->wined3d, adapter->ordinal, &mode, NULL); - swapchain->orig_width = mode.width; - swapchain->orig_height = mode.height; - swapchain->orig_fmt = mode.format_id; - format = wined3d_get_format(&adapter->gl_info, mode.format_id); + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode, NULL))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + goto err; + } GetClientRect(window, &client_rect); if (desc->windowed @@ -879,8 +872,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) { - desc->backbuffer_format = swapchain->orig_fmt; - TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->orig_fmt)); + desc->backbuffer_format = swapchain->original_mode.format_id; + TRACE("Updating format to %s.\n", debug_d3dformat(swapchain->original_mode.format_id)); } } swapchain->desc = *desc; @@ -1040,18 +1033,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 err: if (displaymode_set) { - DEVMODEW devmode; - + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + adapter->ordinal, &swapchain->original_mode))) + ERR("Failed to restore display mode.\n"); ClipCursor(NULL); - - /* Change the display settings */ - memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); - devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = format->byte_count * CHAR_BIT; - devmode.dmPelsWidth = swapchain->orig_width; - devmode.dmPelsHeight = swapchain->orig_height; - ChangeDisplaySettingsExW(adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); } if (swapchain->back_buffers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cee9651..49aacc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2543,8 +2543,7 @@ struct wined3d_swapchain struct wined3d_surface **back_buffers; struct wined3d_surface *front_buffer; struct wined3d_swapchain_desc desc; - DWORD orig_width, orig_height; - enum wined3d_format_id orig_fmt; + struct wined3d_display_mode original_mode; struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo; const struct wined3d_format *ds_format;

1 0

Hans Leidekker : winhttp: Allow setting NULL username and password for NTLM , Passport and Negotiate.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 78fc21cdb5773724735e1d48af2eaf52ea6c7ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fc21cdb5773724735e1d48a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 19 15:52:25 2013 +0200 winhttp: Allow setting NULL username and password for NTLM, Passport and Negotiate. --- dlls/winhttp/request.c | 17 ++++++++++++----- dlls/winhttp/tests/winhttp.c | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3b91c75..00c2238 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1668,7 +1668,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, const WCHAR *username, const WCHAR *password ) { - if (!username || !password) + if ((scheme == WINHTTP_AUTH_SCHEME_BASIC || scheme == WINHTTP_AUTH_SCHEME_DIGEST) && + (!username || !password)) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1678,17 +1679,23 @@ static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, con case WINHTTP_AUTH_TARGET_SERVER: { heap_free( request->connect->username ); - if (!(request->connect->username = strdupW( username ))) return FALSE; + if (!username) request->connect->username = NULL; + else if (!(request->connect->username = strdupW( username ))) return FALSE; + heap_free( request->connect->password ); - if (!(request->connect->password = strdupW( password ))) return FALSE; + if (!password) request->connect->password = NULL; + else if (!(request->connect->password = strdupW( password ))) return FALSE; break; } case WINHTTP_AUTH_TARGET_PROXY: { heap_free( request->connect->session->proxy_username ); - if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE; + if (!username) request->connect->session->proxy_username = NULL; + else if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE; + heap_free( request->connect->session->proxy_password ); - if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE; + if (!password) request->connect->session->proxy_password = NULL; + else if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE; break; } default: diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6b946a9..87ddcb0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1959,6 +1959,27 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 401, "request failed unexpectedly %u\n", status); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); error = GetLastError();

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 368cff7a5909b7a7bb65b42dc91b5caf0aeedf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368cff7a5909b7a7bb65b42dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 09:22:57 2013 +1000 oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index fba9025..36448d3 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -878,6 +878,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_BOOL(v) = *(VARIANT_BOOL*)src; hr = S_OK; break; + case DBTYPE_I2: + V_VT(v) = VT_I2; + V_I2(v) = *(signed short*)src; + hr = S_OK; + break; case DBTYPE_I4: V_VT(v) = VT_I4; V_I4(v) = *(signed int*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 61607a9..b42b4df 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2666,6 +2666,7 @@ static void test_converttovar(void) CY cy, cy2; DATE date; INT i4; + signed short i2; LARGE_INTEGER i8; VARIANT_BOOL boolean = VARIANT_TRUE; FLOAT fvalue = 543.21f; @@ -2746,6 +2747,17 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + i2 = 123; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_VARIANT, sizeof(i2), &dst_len, &i2, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_I2, "got %d\n", V_VT(&dst)); + ok(V_I2(&dst) == 123, "got %d\n", V_I2(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; date = 123.123; hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_VARIANT, sizeof(date), &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Alexandre Julliard : libwine: Add support for defining round-trip mappings using the Unicode private range .
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 4f718ca07de5d3fd45ca97b438d3241488333128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f718ca07de5d3fd45ca97b43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 18:59:40 2013 +0200 libwine: Add support for defining round-trip mappings using the Unicode private range. --- libs/wine/c_10003.c | 14 +++--- libs/wine/c_10081.c | 100 +++++++++++++++++++++++++-------------- libs/wine/c_28593.c | 121 ++++++++++++++++++++++++++++++----------------- libs/wine/c_28596.c | 132 +++++++++++++++++++++++++++++++------------------- libs/wine/c_28597.c | 106 ++++++++++++++++++++++++++--------------- libs/wine/c_28598.c | 132 +++++++++++++++++++++++++++++++-------------------- libs/wine/c_857.c | 110 ++++++++++++++++++++++++++---------------- libs/wine/c_864.c | 110 ++++++++++++++++++++++++++---------------- tools/make_unicode | 69 +++++++++++++++++---------- 9 files changed, 559 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f718ca07de5d3fd45ca9…

1 0

Michael Stefaniuc : gdi32/tests: Replace FIELD_OFFSET with offsetof for the sake of consistency.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 4f94913e0474d6e1d5a32da9b94e0792d86d6104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f94913e0474d6e1d5a32da9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 19 11:52:37 2013 +0200 gdi32/tests: Replace FIELD_OFFSET with offsetof for the sake of consistency. --- dlls/gdi32/tests/pen.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index a4d544c..f7e0f1d 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -240,12 +240,12 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -283,7 +283,7 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -292,7 +292,7 @@ static void test_logpen(void) break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -350,12 +350,12 @@ test_geometric_pens: break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -410,7 +410,7 @@ test_geometric_pens: ok(!size /*&& GetLastError() == ERROR_INVALID_PARAMETER*/, "GetObject should fail: size %d, error %d\n", size, GetLastError()); size = GetObject(hpen, sizeof(elp_buffer), elp_buffer); - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -419,7 +419,7 @@ test_geometric_pens: break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -559,7 +559,7 @@ static void test_ps_userstyle(void) ok(pen != 0, "ExtCreatePen should not fail\n"); size = GetObject(pen, sizeof(buffer), ext_pen); - expect(FIELD_OFFSET(EXTLOGPEN,elpStyleEntry[16]), size); + ok(size == offsetof(EXTLOGPEN, elpStyleEntry[16]), "wrong size %d\n", size); for(i = 0; i < 16; i++) expect(style[i], ext_pen->elpStyleEntry[i]); @@ -602,7 +602,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == lb.lbStyle, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == RGB(12,34,56), "wrong color %x\n", elp->elpColor ); @@ -627,7 +627,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_PATTERN, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == 0, "wrong color %x\n", elp->elpColor ); @@ -642,7 +642,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_DIBPATTERNPT, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == 0, "wrong color %x\n", elp->elpColor ); @@ -668,7 +668,7 @@ static void test_brush_pens(void) { ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == PS_DOT, "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_SOLID, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == RGB(12,34,56), "wrong color %x\n", elp->elpColor );

1 0