March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_SetPrivateData().
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 4a965589a6048cb0c06a1d7795691179c9d9406e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a965589a6048cb0c06a1d779… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:54 2015 +0100 d3d10core: Implement d3d10_depthstencil_view_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 266e1bd..a8a44a0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -137,6 +137,7 @@ struct d3d10_depthstencil_view ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_rendertarget_view *wined3d_view; D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index fc2e8cd..c11dfee 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -407,6 +407,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci wined3d_rendertarget_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -437,10 +438,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10DepthStencilView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface(ID3D10DepthStencilView *iface, @@ -579,6 +582,7 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struc return hr; } + wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;

1 0

Francois Gouget : dispex: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: a3b806ced763ae7289df6799f142ce425912107e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b806ced763ae7289df6799f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:29:37 2015 +0100 dispex: Remove unneeded NONAMELESSXXX directives. --- dlls/dispex/usrmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index a4f2b2b..6e3c723 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : server: Allow device manager ioctls to run asynchronously.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 0157f7688813e9f4d04855f97c3053e104a31ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0157f7688813e9f4d04855f97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:44:51 2015 +0900 server: Allow device manager ioctls to run asynchronously. --- server/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/device.c b/server/device.c index df65aa9..c5e3107 100644 --- a/server/device.c +++ b/server/device.c @@ -313,7 +313,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ { struct device *device = get_fd_user( fd ); struct ioctl_call *ioctl; - obj_handle_t handle; + obj_handle_t handle = 0; if (!device->manager) /* it has been deleted */ { @@ -327,7 +327,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ ioctl->thread = (struct thread *)grab_object( current ); ioctl->user_arg = async_data->arg; - if (!(handle = alloc_handle( current->process, ioctl, SYNCHRONIZE, 0 ))) + if (blocking && !(handle = alloc_handle( current->process, ioctl, SYNCHRONIZE, 0 ))) { release_object( ioctl ); return 0; @@ -335,7 +335,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT ))) { - close_handle( current->process, handle ); + if (handle) close_handle( current->process, handle ); release_object( ioctl ); return 0; }

1 0

Austin English : include: Add some missing entries in hidusage.h.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 71ffa9a2c5443292e5d48fc96a634e9cbb4dd603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ffa9a2c5443292e5d48fc96… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 10 23:28:26 2015 -0500 include: Add some missing entries in hidusage.h. --- include/hidusage.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index d037d45..67d698e 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -194,6 +194,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) +#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) +#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) +#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) +#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) +#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) +#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) +#define HID_USAGE_TELEPHONY_REDIAL ((USAGE) 0x24) +#define HID_USAGE_TELEPHONY_TRANSFER ((USAGE) 0x25) +#define HID_USAGE_TELEPHONY_DROP ((USAGE) 0x26) +#define HID_USAGE_TELEPHONY_LINE ((USAGE) 0x2A) +#define HID_USAGE_TELEPHONY_RING_ENABLE ((USAGE) 0x2D) +#define HID_USAGE_TELEPHONY_SEND ((USAGE) 0x31) +#define HID_USAGE_TELEPHONY_KEYPAD_0 ((USAGE) 0xB0) +#define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) +#define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) + +#define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) +#define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) + +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #ifdef __cplusplus } #endif

1 0

Stefan Dösinger : ddraw/tests: Add a test for signed formats.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 937522ffd09f6408a98a8647984f0b12ef7ee50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=937522ffd09f6408a98a86479… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:43 2015 +0100 ddraw/tests: Add a test for signed formats. --- dlls/ddraw/tests/ddraw4.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 206 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 436 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=937522ffd09f6408a98a8…

1 0

Francois Gouget : explorerframe: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 3dbb09a56b4fe17d228d116dbf46e7906b90f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbb09a56b4fe17d228d116db… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:30:37 2015 +0100 explorerframe: Remove unneeded NONAMELESSXXX directives. --- dlls/explorerframe/explorerframe_main.c | 2 -- dlls/explorerframe/nstc.c | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 7586209..8f32c2c 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -22,8 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 9daee8b..52d74c7 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h"

1 0

Francois Gouget : dwmapi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 6e3e5ea654d11ef6d2ac90c1d0fd6acc1bf026c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3e5ea654d11ef6d2ac90c1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:30:34 2015 +0100 dwmapi: Remove unneeded NONAMELESSXXX directives. --- dlls/dwmapi/dwmapi_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index d5fb03f..08373b9 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -22,8 +22,6 @@ #include "config.h" #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : dplayx: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: abd2c7265ba74db7259d440170cdfda6cab88b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd2c7265ba74db7259d44017… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:30:00 2015 +0100 dplayx: Remove unneeded NONAMELESSSTRUCT directives. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_global.c | 2 +- dlls/dplayx/dplobby.c | 2 +- dlls/dplayx/name_server.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index bae6a15..4b8d546 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -25,7 +25,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winerror.h" #include "winbase.h" diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index f68cad0..8351f66 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -33,7 +33,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "wine/debug.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 3a968de..2b4b554 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -21,7 +21,7 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index b3e4a4e..7b04bcd 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -23,7 +23,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_SetPrivateDataInterface().
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 2d96cefbb7ed3cae0d1beeb5fa7f513cb903b95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d96cefbb7ed3cae0d1beeb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:52 2015 +0100 d3d10core: Implement d3d10_texture3d_SetPrivateDataInterface(). --- dlls/d3d10core/texture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 0ddba7f..67ccbb5 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -463,9 +463,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface,

1 0

Stefan Dösinger : ddraw: Remove support for V16U16.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 2702f28e669c88a81f6361c9cc4b374114c17f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2702f28e669c88a81f6361c9c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:45 2015 +0100 ddraw: Remove support for V16U16. None of my Windows drivers support this format. At best this will confuse applications trying to pick X8L8V8U8. --- dlls/ddraw/device.c | 1 - dlls/ddraw/utils.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f0dcf16..582a1d4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1066,7 +1066,6 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_R8G8_SNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, - WINED3DFMT_R16G16_SNORM, WINED3DFMT_R10G11B11_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM }; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f22db3e..c85abb5 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -299,16 +299,6 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; break; - case WINED3DFMT_R16G16_SNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; - DDPixelFormat->dwFourCC = 0; - DDPixelFormat->u1.dwBumpBitCount = 32; - DDPixelFormat->u2.dwBumpDuBitMask = 0x0000ffff; - DDPixelFormat->u3.dwBumpDvBitMask = 0xffff0000; - DDPixelFormat->u4.dwBumpLuminanceBitMask = 0x00000000; - DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; - break; - case WINED3DFMT_R5G5_SNORM_L6_UNORM: DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; @@ -551,13 +541,6 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix { return WINED3DFMT_R8G8_SNORM; } - else if ( (DDPixelFormat->u1.dwBumpBitCount == 32 ) && - (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000ffff) && - (DDPixelFormat->u3.dwBumpDvBitMask == 0xffff0000) && - (DDPixelFormat->u4.dwBumpLuminanceBitMask == 0x00000000) ) - { - return WINED3DFMT_R16G16_SNORM; - } else if ( (DDPixelFormat->u1.dwBumpBitCount == 16 ) && (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000001f) && (DDPixelFormat->u3.dwBumpDvBitMask == 0x000003e0) &&

1 0