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

Henri Verbeet : d3d10core: Implement d3d10_texture3d_GetPrivateData().
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: c840645bc22e2c818751ff250a310edd85c31850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c840645bc22e2c818751ff250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:53 2015 +0100 d3d10core: Implement d3d10_texture3d_GetPrivateData(). --- 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 67ccbb5..46a3af8 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -443,10 +443,12 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_SetPrivateData().
by Alexandre Julliard 11 Mar '15

11 Mar '15

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 11 Mar '15

11 Mar '15

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

Francois Gouget : dmloader: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 41768edec4069d454beff9ddb0dfb88b40f43e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41768edec4069d454beff9ddb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:29:46 2015 +0100 dmloader: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/dmloader/loaderstream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index cd57c97..855203e 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -45,7 +45,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dmloader_private.h"

1 0

Francois Gouget : dplayx: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard 11 Mar '15

11 Mar '15

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

Francois Gouget : dsound: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 359fbe829a6ffa7c3d13df306cfac35dd8f8c472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359fbe829a6ffa7c3d13df306… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:30:29 2015 +0100 dsound: Remove unneeded NONAMELESSXXX directives. --- dlls/dsound/buffer.c | 2 -- dlls/dsound/capture.c | 3 +-- dlls/dsound/dsound.c | 3 +-- dlls/dsound/dsound_convert.c | 2 -- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/duplex.c | 2 -- dlls/dsound/mixer.c | 3 +-- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 2 -- 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e581c5a..4e84d17 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -23,8 +23,6 @@ #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 17b1a04..0764261 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -28,8 +28,7 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7e53f91..824f581 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -26,8 +26,7 @@ #include <math.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 5ac7a10..5accba6 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -39,8 +39,6 @@ #include <stdarg.h> #include <math.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index d6be926..cb46301 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -35,8 +35,8 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index a2bc726..b18972e 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -22,8 +22,6 @@ #include <stdarg.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include "windef.h" #include "winbase.h" diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index db1152c..8dbd15a 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -27,8 +27,7 @@ #include <math.h> /* Insomnia - pow() function */ #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 52d00f9..3f8a478 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -26,8 +26,8 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 6c0b9f4..b89c45a 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION -#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 439cfac..9a0226a 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -40,8 +40,6 @@ #include <stdarg.h> #include <math.h> /* Insomnia - pow() function */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winuser.h"

1 0

Francois Gouget : dwmapi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 11 Mar '15

11 Mar '15

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 : explorerframe: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 11 Mar '15

11 Mar '15

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

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 3535f6f4a74639c3dbed5922f77adf390d877c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3535f6f4a74639c3dbed5922f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 11 11:31:54 2015 +0100 po: Update French translation. --- po/fr.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9826d64..d0bdf3e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3160,10 +3160,8 @@ msgid "&View Source" msgstr "Afficher la &source" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Propriétés" +msgstr "Proprié&tés" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -11649,10 +11647,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erreur : paramètre de ligne de commande invalide\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Erreur : impossible d'ajouter des clés à une machine distante\n" +msgstr "Erreur : impossible d'accéder à une machine distante\n" #: reg.rc:38 msgid "" @@ -11662,10 +11658,8 @@ msgstr "" "spécifiée\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Type non pris en charge.\n" +msgstr "Erreur : type non pris en charge\n" #: regedit.rc:34 msgid "&Registry"

1 0

Alexandre Julliard : server: Allow device manager ioctls to run asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

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