August 2015 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Introduce a separate function to resize swapchain buffers.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 2735947d763df9bb46bffde760be9446463da668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2735947d763df9bb46bffde76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 10:01:33 2015 +0200 wined3d: Introduce a separate function to resize swapchain buffers. --- dlls/wined3d/device.c | 202 ++++++++++++----------------------------- dlls/wined3d/swapchain.c | 94 ++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 155 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2735947d763df9bb46bff…

1 0

Hans Leidekker : shell32: Add a stub implementation of SHQueryUserNotificationState.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 7ec5f555b05152dda53b149d5994152115e2c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec5f555b05152dda53b149d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:14:32 2015 +0200 shell32: Add a stub implementation of SHQueryUserNotificationState. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 10 ++++++++++ include/shellapi.h | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index ce3a9f7..91a4138 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -409,6 +409,7 @@ @ stdcall SHPathPrepareForWriteW(long ptr wstr long) @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) +@ stdcall SHQueryUserNotificationState(ptr) @ stdcall SHSetLocalizedName(wstr wstr long) @ stdcall SHSetUnreadMailCountW(wstr long wstr) @ stdcall SHUpdateRecycleBinIcon() diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index fd4b8c8..74deecd 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1404,3 +1404,13 @@ HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY user, DWORD idx, LPWSTR maila FIXME("%p %d %p %d: stub\n", user, idx, mailaddress, mailaddresslen); return E_NOTIMPL; } + +/*********************************************************************** + * SHQueryUserNotificationState (SHELL32.@) + */ +HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE *state) +{ + FIXME("%p: stub\n", state); + *state = QUNS_ACCEPTS_NOTIFICATIONS; + return S_OK; +} diff --git a/include/shellapi.h b/include/shellapi.h index 8492155..57454e3 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -490,6 +490,19 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR,LPSHQUERYRBINFO); * Misc */ +typedef enum +{ + QUNS_NOT_PRESENT = 1, + QUNS_BUSY = 2, + QUNS_RUNNING_D3D_FULL_SCREEN = 3, + QUNS_PRESENTATION_MODE = 4, + QUNS_ACCEPTS_NOTIFICATIONS = 5, + QUNS_QUIET_TIME = 6, + QUNS_APP = 7 +} QUERY_USER_NOTIFICATION_STATE; + +HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE*); + typedef enum SHSTOCKICONID { SIID_INVALID=-1,

1 0

Vincent Povirk : ole32: Ignore high part of size in storage version 3 files.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 9d517a1727f7de379912019e417d87634427288b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d517a1727f7de379912019e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 5 16:33:07 2015 -0500 ole32: Ignore high part of size in storage version 3 files. --- dlls/ole32/storage32.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ce72b73..c881620 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3446,10 +3446,18 @@ static HRESULT StorageImpl_ReadDirEntry( OFFSET_PS_SIZE, &buffer->size.u.LowPart); - StorageUtl_ReadDWord( - currentEntry, - OFFSET_PS_SIZE_HIGH, - &buffer->size.u.HighPart); + if (This->bigBlockSize < 4096) + { + /* Version 3 files may have junk in the high part of size. */ + buffer->size.u.HighPart = 0; + } + else + { + StorageUtl_ReadDWord( + currentEntry, + OFFSET_PS_SIZE_HIGH, + &buffer->size.u.HighPart); + } } return readRes;

1 0

Henri Verbeet : wined3d: Add base format info for WINED3DFMT_R8G8B8A8_UNORM_SRGB.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 7f29d994ad12faf10e543d31adcf9da07f0af813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f29d994ad12faf10e543d31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:54 2015 +0200 wined3d: Add base format info for WINED3DFMT_R8G8B8A8_UNORM_SRGB. --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 30ad0e0..0d4e878 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -93,6 +93,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R10G10B10A2_UINT, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10A2_SNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_UNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_UINT, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R8G8B8X8_UNORM, 8, 8, 8, 0, 0, 8, 16, 0, 4, 0, 0}, {WINED3DFMT_R16G16_UNORM, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0},

1 0

Henri Verbeet : dxgi: Introduce a helper function to convert dxgi multisample info to wined3d.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: fbc8f59629b296d9da8981a130871b3adeac80af URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc8f59629b296d9da8981a13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:55 2015 +0200 dxgi: Introduce a helper function to convert dxgi multisample info to wined3d. --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 12 ++---------- dlls/dxgi/utils.c | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2b8a05f..e288774 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -185,8 +185,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac FIXME("Implement DXGI<->wined3d usage conversion\n"); surface_desc.resource_type = WINED3D_RTYPE_SURFACE; surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); - surface_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; - surface_desc.multisample_quality = desc->SampleDesc.Quality; + wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, + &surface_desc.multisample_quality, &desc->SampleDesc); surface_desc.usage = usage; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = desc->Width; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 8703158..02e37ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -76,6 +76,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a66585e..a716e1b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -211,16 +211,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.backbuffer_height = desc->BufferDesc.Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); wined3d_desc.backbuffer_count = desc->BufferCount; - if (desc->SampleDesc.Count > 1) - { - wined3d_desc.multisample_type = desc->SampleDesc.Count; - wined3d_desc.multisample_quality = desc->SampleDesc.Quality; - } - else - { - wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; - wined3d_desc.multisample_quality = 0; - } + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = desc->OutputWindow; wined3d_desc.windowed = desc->Windowed; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index be2b5f7..ea88567 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,21 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) +{ + if (dxgi_desc->Count > 1) + { + *wined3d_type = dxgi_desc->Count; + *wined3d_quality = dxgi_desc->Quality; + } + else + { + *wined3d_type = WINED3D_MULTISAMPLE_NONE; + *wined3d_quality = 0; + } +} + HRESULT dxgi_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) {

1 0

Henri Verbeet : dxgi: Introduce a helper function to convert wined3d multisample info to dxgi.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: d29f263c79b5cccc659304bc396bd860c4ccd534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29f263c79b5cccc659304bc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:56 2015 +0200 dxgi: Introduce a helper function to convert wined3d multisample info to dxgi. --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/swapchain.c | 3 +-- dlls/dxgi/utils.c | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 02e37ba..0991433 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -76,6 +76,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d3f2289..ea0cfe1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -205,8 +205,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D desc->BufferDesc.Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; - desc->SampleDesc.Count = wined3d_desc.multisample_type; - desc->SampleDesc.Quality = wined3d_desc.multisample_quality; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index ea88567..8334283 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,13 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) +{ + desc->Count = wined3d_type == WINED3D_MULTISAMPLE_NONE ? 1 : wined3d_type; + desc->Quality = wined3d_quality; +} + void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) {

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc() on top of wined3d.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 4a843f282693cff00518dbe784ffc504306cf83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a843f282693cff00518dbe78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:57 2015 +0200 dxgi: Implement dxgi_surface_GetDesc() on top of wined3d. --- dlls/d3d10core/texture.c | 55 +++++++++++++++++++++-------------------------- dlls/dxgi/device.c | 14 ++++++------ dlls/dxgi/dxgi_private.h | 5 ++--- dlls/dxgi/surface.c | 11 +++++++--- include/wine/winedxgi.idl | 2 +- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 46a3af8..3ee87df 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -296,35 +296,6 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - if (desc->MipLevels == 1 && desc->ArraySize == 1) - { - DXGI_SURFACE_DESC surface_desc; - IWineDXGIDevice *wine_device; - - if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, - (void **)&wine_device))) - { - ERR("Device should implement IWineDXGIDevice.\n"); - wined3d_private_store_cleanup(&texture->private_store); - return E_FAIL; - } - - surface_desc.Width = desc->Width; - surface_desc.Height = desc->Height; - surface_desc.Format = desc->Format; - surface_desc.SampleDesc = desc->SampleDesc; - - hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, - (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); - IWineDXGIDevice_Release(wine_device); - if (FAILED(hr)) - { - ERR("Failed to create DXGI surface, returning %#x\n", hr); - wined3d_private_store_cleanup(&texture->private_store); - return hr; - } - } - if (desc->ArraySize != 1) FIXME("Array textures not implemented.\n"); if (desc->SampleDesc.Count > 1) @@ -348,13 +319,35 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - if (texture->dxgi_surface) - IUnknown_Release(texture->dxgi_surface); wined3d_private_store_cleanup(&texture->private_store); return hr; } texture->desc.MipLevels = levels; + if (desc->MipLevels == 1 && desc->ArraySize == 1) + { + IWineDXGIDevice *wine_device; + + if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, + (void **)&wine_device))) + { + ERR("Device should implement IWineDXGIDevice.\n"); + wined3d_texture_decref(texture->wined3d_texture); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_surface(wine_device, wined3d_texture_get_resource(texture->wined3d_texture), + 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#x\n", hr); + texture->dxgi_surface = NULL; + wined3d_texture_decref(texture->wined3d_texture); + return hr; + } + } + texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e288774..580baf2 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -256,23 +256,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic /* IWineDXGIDevice methods */ -static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, - DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) +static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, + struct wined3d_resource *wined3d_resource, DXGI_USAGE usage, + const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { struct dxgi_surface *object; HRESULT hr; - FIXME("iface %p, desc %p, usage %#x, shared_resource %p, outer %p, surface %p partial stub!\n", - iface, desc, usage, shared_resource, outer, surface); + TRACE("iface %p, wined3d_resource %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", + iface, wined3d_resource, usage, shared_resource, outer, surface); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) { ERR("Failed to allocate DXGI surface object memory\n"); return E_OUTOFMEMORY; } - if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_resource))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 0991433..e4966d2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -164,11 +164,10 @@ struct dxgi_surface LONG refcount; struct wined3d_private_store private_store; IDXGIDevice *device; - - DXGI_SURFACE_DESC desc; + struct wined3d_resource *wined3d_resource; }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; + IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index f961de5..221a80d 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -164,10 +164,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); - *desc = surface->desc; + wined3d_resource_get_desc(surface->wined3d_resource, &wined3d_desc); + desc->Width = wined3d_desc.width; + desc->Height = wined3d_desc.height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.format); + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); return S_OK; } @@ -214,7 +219,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, const DXGI_SURFACE_DESC *desc) + IUnknown *outer, struct wined3d_resource *wined3d_resource) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; @@ -222,7 +227,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, wined3d_private_store_init(&surface->private_store); surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; - surface->desc = *desc; + surface->wined3d_resource = wined3d_resource; return S_OK; } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 4980588..a6c6cce 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -26,7 +26,7 @@ import "dxgi.idl"; interface IWineDXGIDevice : IDXGIDevice { HRESULT create_surface( - [in] const DXGI_SURFACE_DESC *desc, + [in] struct wined3d_resource *wined3d_resource, [in] DXGI_USAGE usage, [in] const DXGI_SHARED_RESOURCE *shared_resource, [in] IUnknown *outer,

1 0

Henri Verbeet : d3d10core: Ensure the information we return in d3d10_texture2d_GetDesc() is current.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 82dffc9567988ece44207553cd5d4fe1dacb4944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dffc9567988ece44207553c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:58 2015 +0200 d3d10core: Ensure the information we return in d3d10_texture2d_GetDesc() is current. --- dlls/d3d10core/texture.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 3ee87df..04b9e2d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -243,11 +243,26 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) { - struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p\n", iface, desc); - *desc = This->desc; + *desc = texture->desc; + + wined3d_mutex_lock(); + wined3d_resource_get_desc(wined3d_texture_get_resource(texture->wined3d_texture), &wined3d_desc); + wined3d_mutex_unlock(); + + /* FIXME: Resizing swapchain buffers can cause these to change. We'd like + * to get everything from wined3d, but e.g. bind flags don't exist as such + * there (yet). */ + desc->Width = wined3d_desc.width; + desc->Height = wined3d_desc.height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.format); + desc->SampleDesc.Count = wined3d_desc.multisample_type == WINED3D_MULTISAMPLE_NONE + ? 1 : wined3d_desc.multisample_type; + desc->SampleDesc.Quality = wined3d_desc.multisample_quality; } static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl =

1 0

Sebastian Lackner : dbghelp: Implement UnDecorateSymbolNameW.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: fa4dfa4325f7c77331106ffdc4b1cedbb0803e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4dfa4325f7c77331106ffdc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 08:22:22 2015 +0200 dbghelp: Implement UnDecorateSymbolNameW. Also fixes a bug in UnDecorateSymbolName when undecorated_length == 0. --- dlls/dbghelp/dbghelp.spec | 4 +-- dlls/dbghelp/symbol.c | 63 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 4772358..6004f95 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -183,8 +183,8 @@ @ stdcall SymUnDName64(ptr str long) @ stdcall SymUnloadModule(long long) @ stdcall SymUnloadModule64(long int64) -@ stdcall UnDecorateSymbolName(str str long long) -@ stub UnDecorateSymbolNameW +@ stdcall UnDecorateSymbolName(str ptr long long) +@ stdcall UnDecorateSymbolNameW(wstr ptr long long) @ stdcall UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) #@ stub block diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index cbe232b..7569a58 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1752,32 +1752,69 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } -/*********************************************************************** - * UnDecorateSymbolName (DBGHELP.@) - */ -DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, - DWORD UndecoratedLength, DWORD Flags) +static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short flags) { /* undocumented from msvcrt */ static HANDLE hMsvcrt; static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - TRACE("(%s, %p, %d, 0x%08x)\n", - debugstr_a(DecoratedName), UnDecoratedName, UndecoratedLength, Flags); - if (!p_undname) { if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt); if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName"); - if (!p_undname) return 0; + if (!p_undname) return NULL; } - if (!UnDecoratedName) return 0; - if (!p_undname(UnDecoratedName, DecoratedName, UndecoratedLength, - und_alloc, und_free, Flags)) + return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags); +} + +/*********************************************************************** + * UnDecorateSymbolName (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_a(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) + return 0; + if (!und_name(undecorated_name, decorated_name, undecorated_length, flags)) + return 0; + return strlen(undecorated_name); +} + +/*********************************************************************** + * UnDecorateSymbolNameW (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + char *buf, *ptr; + int len, ret = 0; + + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_w(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) return 0; - return strlen(UnDecoratedName); + + len = WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, NULL, 0, NULL, NULL); + if ((buf = HeapAlloc(GetProcessHeap(), 0, len))) + { + WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL); + if ((ptr = und_name(NULL, buf, 0, flags))) + { + MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length); + undecorated_name[undecorated_length - 1] = 0; + ret = strlenW(undecorated_name); + und_free(ptr); + } + HeapFree(GetProcessHeap(), 0, buf); + } + + return ret; } #define WILDCHAR(x) (-(x))

1 0

Sebastian Lackner : vcomp: Implement _vcomp_for_dynamic_init and _vcomp_for_dynamic_next.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 69ec8904557f2ecb9708dd38034a13993be9a646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec8904557f2ecb9708dd380… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 09:30:57 2015 +0200 vcomp: Implement _vcomp_for_dynamic_init and _vcomp_for_dynamic_next. --- dlls/vcomp/main.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 +- dlls/vcomp100/vcomp100.spec | 4 +- dlls/vcomp110/vcomp110.spec | 4 +- dlls/vcomp90/vcomp90.spec | 4 +- 5 files changed, 149 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69ec8904557f2ecb9708d…

1 0