February 2015 - Wine-commits

Jacek Caban : wininet: Use sock_get_error in a few more places.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: c815baf8995f3a44940d5bec9777377a88162c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c815baf8995f3a44940d5bec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 19:37:51 2015 +0100 wininet: Use sock_get_error in a few more places. --- dlls/wininet/netconnection.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7695e14..6747a81 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -62,12 +62,14 @@ #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif +#if !defined(__MINGW32__) && !defined(_MSC_VER) +#include <errno.h> +#endif #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <errno.h> #include <assert.h> #include "wine/library.h" @@ -456,6 +458,9 @@ int sock_get_error(void) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; +#if EAGAIN != EWOULDBLOCK + case EAGAIN: +#endif case EWOULDBLOCK: return WSAEWOULDBLOCK; case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; @@ -516,7 +521,7 @@ int sock_send(int fd, const void *msg, size_t len, int flags) { ret = send(fd, msg, len, flags); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && sock_get_error() == WSAEINTR); return ret; } @@ -527,7 +532,7 @@ int sock_recv(int fd, void *msg, size_t len, int flags) { ret = recv(fd, msg, len, flags); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && sock_get_error() == WSAEINTR); return ret; } @@ -824,7 +829,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 0) { if(!buf_len) { - if(errno == EAGAIN || errno == EWOULDBLOCK) { + if(sock_get_error() == WSAEWOULDBLOCK) { TRACE("would block\n"); return WSAEWOULDBLOCK; } @@ -864,7 +869,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking set_socket_blocking(conn->socket, mode); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 1) { - if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { + if(size < 0 && sock_get_error() == WSAEWOULDBLOCK) { TRACE("would block\n"); /* FIXME: Optimize extra_buf usage. */ @@ -1035,7 +1040,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) BYTE b; len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); - return len == 1 || (len == -1 && errno == EWOULDBLOCK); + return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; int len; @@ -1051,7 +1056,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - return len == 1 || (len == -1 && errno == WSAEWOULDBLOCK); + return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); #else FIXME("not supported on this platform\n"); return TRUE;

1 0

Jacek Caban : wininet: Properly check for ioctlsocket failure in NETCON_is_alive.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: f3e02c2fc06082419f57e2eebaa09f1381c12ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e02c2fc06082419f57e2eeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 19:37:58 2015 +0100 wininet: Properly check for ioctlsocket failure in NETCON_is_alive. --- dlls/wininet/netconnection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6747a81..fc46492 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1047,13 +1047,13 @@ BOOL NETCON_is_alive(netconn_t *netconn) char b; mode = 1; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) + if(ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) + if(ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK);

1 0

Jacek Caban : wininet: Properly handle EWOULDBLOCK return from connect().
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 4fe1be148e7320473775a2ddfba489259bce5955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe1be148e7320473775a2ddf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 19:38:08 2015 +0100 wininet: Properly handle EWOULDBLOCK return from connect(). --- dlls/wininet/netconnection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index fc46492..872daec 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -330,7 +330,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { - if (sock_get_error() == WSAEINPROGRESS) { + if (sock_get_error() == WSAEINPROGRESS || sock_get_error() == WSAEWOULDBLOCK) { struct pollfd pfd; int res;

1 0

Jacek Caban : wininet: Initialize winsock before creating socket in Windows builds.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: de5c1fb8e9d7712c316581fdb5635f76bef8b42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5c1fb8e9d7712c316581fdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 12 12:05:23 2015 +0100 wininet: Initialize winsock before creating socket in Windows builds. --- dlls/wininet/ftp.c | 2 ++ dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 2 ++ dlls/wininet/netconnection.c | 47 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index a28865f..7f349d3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2573,6 +2573,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); + init_winsock(); nsocket = socket(AF_INET,SOCK_STREAM,0); if (nsocket == -1) { @@ -2932,6 +2933,7 @@ static BOOL FTP_InitListenSocket(ftp_session_t *lpwfs) TRACE("\n"); + init_winsock(); lpwfs->lstnSocket = socket(PF_INET, SOCK_STREAM, 0); if (lpwfs->lstnSocket == -1) { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4847ca0..aa9c259 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3477,6 +3477,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) goto End; + init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); if (fd != -1) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b0a0db5..23f4a41 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -478,6 +478,8 @@ BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; void free_cookie(void) DECLSPEC_HIDDEN; +void init_winsock(void) DECLSPEC_HIDDEN; + #define MAX_REPLY_LEN 0x5B4 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 872daec..a7cbf6a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -27,6 +27,10 @@ #define NONAMELESSUNION #if defined(__MINGW32__) || defined (_MSC_VER) +#define USE_WINSOCK +#endif + +#ifdef USE_WINSOCK #include <ws2tcpip.h> #endif @@ -62,7 +66,7 @@ #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif -#if !defined(__MINGW32__) && !defined(_MSC_VER) +#ifndef USE_WINSOCK #include <errno.h> #endif @@ -317,10 +321,38 @@ static BOOL ensure_cred_handle(void) return TRUE; } +#ifdef USE_WINSOCK +static BOOL winsock_loaded = FALSE; + +static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) +{ + WSADATA wsa_data; + DWORD res; + + res = WSAStartup(MAKEWORD(1,1), &wsa_data); + if(res == ERROR_SUCCESS) + winsock_loaded = TRUE; + else + ERR("WSAStartup failed: %u\n", res); + return TRUE; +} +#endif + +void init_winsock(void) +{ +#ifdef USE_WINSOCK + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); +#endif +} + static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { int result; ULONG flag; + DWORD res; + + init_winsock(); assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); @@ -330,7 +362,8 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { - if (sock_get_error() == WSAEINPROGRESS || sock_get_error() == WSAEWOULDBLOCK) { + res = sock_get_error(); + if (res == WSAEINPROGRESS || res == WSAEWOULDBLOCK) { struct pollfd pfd; int res; @@ -441,12 +474,16 @@ void NETCON_unload(void) if(have_compat_cred_handle) FreeCredentialsHandle(&compat_cred_handle); DeleteCriticalSection(&init_sechandle_cs); + +#ifdef USE_WINSOCK + WSACleanup(); +#endif } /* translate a unix error code into a winsock one */ int sock_get_error(void) { -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef USE_WINSOCK return WSAGetLastError(); #else switch (errno) @@ -538,7 +575,7 @@ int sock_recv(int fd, void *msg, size_t len, int flags) static void set_socket_blocking(int socket, blocking_mode_t mode) { -#if defined(__MINGW32__) || defined (_MSC_VER) +#ifdef USE_WINSOCK ULONG arg = mode == BLOCKING_DISALLOW; ioctlsocket(socket, FIONBIO, &arg); #endif @@ -1041,7 +1078,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); -#elif defined(__MINGW32__) || defined(_MSC_VER) +#elif defined(USE_WINSOCK) ULONG mode; int len; char b;

1 0

Henri Verbeet : wined3d: Fix the .spec.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 471e62605271d4d5ab8e02115263c70d8acada7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=471e62605271d4d5ab8e02115… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:55 2015 +0100 wined3d: Fix the .spec. --- dlls/wined3d/wined3d.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index aca33f4..9de0baf 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -199,16 +199,16 @@ @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) -@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr long) -@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr long) -@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr long) +@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr) +@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr) +@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_decref(ptr) @ cdecl wined3d_shader_get_byte_code(ptr ptr ptr) @ cdecl wined3d_shader_get_parent(ptr) @ cdecl wined3d_shader_incref(ptr) @ cdecl wined3d_shader_set_local_constants_float(ptr long ptr long) -@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr) +@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr) @ cdecl wined3d_shader_resource_view_decref(ptr) @ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr)

1 0

Henri Verbeet : d3d10: D3D10CreateStateBlock() is implemented.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: e7b7d1ef45a1a025c1440b4a5f4d6fdcccecc006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b7d1ef45a1a025c1440b4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:56 2015 +0100 d3d10: D3D10CreateStateBlock() is implemented. --- dlls/d3d10/stateblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 72466a1..d0efc52 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -519,7 +519,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, { struct d3d10_stateblock *object; - FIXME("device %p, mask %p, stateblock %p stub!\n", device, mask, stateblock); + TRACE("device %p, mask %p, stateblock %p.\n", device, mask, stateblock); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object)

1 0

Henri Verbeet : dxgi: Implement dxgi_device_SetPrivateData().
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 4e93a02aaf1165cd0432b3433446e6a66bd79561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e93a02aaf1165cd0432b3433… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:57 2015 +0100 dxgi: Implement dxgi_device_SetPrivateData(). --- dlls/dxgi/device.c | 13 +++++++++++-- dlls/dxgi/dxgi_private.h | 3 +++ dlls/dxgi/tests/device.c | 10 +++++----- dlls/dxgi/utils.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index a6f72ca..f0c38a0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -84,6 +84,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_device_decref(This->wined3d_device); LeaveCriticalSection(&dxgi_cs); IDXGIFactory1_Release(This->factory); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -95,9 +96,11 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IWineDXGIDevice *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IWineDXGIDevice *iface, @@ -357,6 +360,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; + wined3d_private_store_init(&device->private_store); layer_base = device + 1; @@ -364,6 +368,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device, &IID_IUnknown, (void **)&device->child_layer))) { WARN("Failed to create device, returning %#x.\n", hr); + wined3d_private_store_cleanup(&device->private_store); return hr; } @@ -372,6 +377,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l { ERR("DXGI device should implement IWineD3DDeviceParent.\n"); IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); return hr; } wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); @@ -386,6 +392,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (SUCCEEDED(hr)) hr = E_FAIL; IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); return hr; } @@ -397,6 +404,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l { WARN("Failed to create a wined3d device, returning %#x.\n", hr); IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); return hr; } @@ -409,6 +417,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l ERR("Failed to initialize 3D, hr %#x.\n", hr); wined3d_device_decref(device->wined3d_device); IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); return hr; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 278137d..a22916d 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; +HRESULT dxgi_set_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; /* IDXGIFactory */ struct dxgi_factory @@ -99,6 +101,7 @@ struct dxgi_device IWineDXGIDevice IWineDXGIDevice_iface; IUnknown *child_layer; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; IDXGIFactory1 *factory; }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 70cf3be..be571a4 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -621,13 +621,13 @@ static void test_private_data(void) * NULL interface is not considered a clear but as setting an interface pointer that * happens to be NULL. */ hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 0, NULL); - todo_wine ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); - todo_wine ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -662,13 +662,13 @@ static void test_private_data(void) todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); - todo_wine ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 979c972..1a8db7e 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -324,3 +324,31 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) return WINED3DFMT_UNKNOWN; } } + +HRESULT dxgi_set_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT data_size, const void *data) +{ + struct wined3d_private_data *entry; + HRESULT hr; + + if (!data) + { + EnterCriticalSection(&dxgi_cs); + if (!(entry = wined3d_private_store_get_private_data(store, guid))) + { + LeaveCriticalSection(&dxgi_cs); + return S_FALSE; + } + + wined3d_private_store_free_private_data(store, entry); + LeaveCriticalSection(&dxgi_cs); + + return S_OK; + } + + EnterCriticalSection(&dxgi_cs); + hr = wined3d_private_store_set_private_data(store, guid, data, data_size, 0); + LeaveCriticalSection(&dxgi_cs); + + return hr; +}

1 0

Henri Verbeet : dxgi: Implement dxgi_device_SetPrivateDataInterface().
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 2190f0266f2fe214492dc6ae65ffcecfcac14c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2190f0266f2fe214492dc6ae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:58 2015 +0100 dxgi: Implement dxgi_device_SetPrivateDataInterface(). --- dlls/dxgi/device.c | 6 ++++-- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/tests/device.c | 22 +++++++++++----------- dlls/dxgi/utils.c | 16 ++++++++++++++++ 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index f0c38a0..8b32041 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -106,9 +106,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IWineDXGIDevice *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&device->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *iface, diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a22916d..655dd40 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -78,6 +78,8 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSP enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; +HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, + REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; /* IDXGIFactory */ struct dxgi_factory diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index be571a4..b00c5e4 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -623,14 +623,14 @@ static void test_private_data(void) hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 0, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); @@ -641,25 +641,25 @@ static void test_private_data(void) refcount = get_refcount((IUnknown *)test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount--; refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -672,7 +672,7 @@ static void test_private_data(void) hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount++; size = 2 * sizeof(ptr); ptr = NULL; @@ -696,7 +696,7 @@ static void test_private_data(void) todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 1a8db7e..576a9ba 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -352,3 +352,19 @@ HRESULT dxgi_set_private_data(struct wined3d_private_store *store, return hr; } + +HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, + REFGUID guid, const IUnknown *object) +{ + HRESULT hr; + + if (!object) + return dxgi_set_private_data(store, guid, sizeof(object), &object); + + EnterCriticalSection(&dxgi_cs); + hr = wined3d_private_store_set_private_data(store, + guid, object, sizeof(object), WINED3DSPD_IUNKNOWN); + LeaveCriticalSection(&dxgi_cs); + + return hr; +}

1 0

Henri Verbeet : dxgi: Implement dxgi_device_GetPrivateData().
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 2d18cf57acb5be6a6bc00e31a915a340dab9a7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18cf57acb5be6a6bc00e31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:59 2015 +0100 dxgi: Implement dxgi_device_GetPrivateData(). --- dlls/dxgi/device.c | 6 ++++-- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/tests/device.c | 32 ++++++++++++++++---------------- dlls/dxgi/utils.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8b32041..2b8a05f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -116,9 +116,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IWineDXGIDe static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, REFIID riid, void **parent) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 655dd40..55837f9 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; +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, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b00c5e4..9181c42 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -634,9 +634,9 @@ static void test_private_data(void) size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); - todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, @@ -677,11 +677,11 @@ static void test_private_data(void) size = 2 * sizeof(ptr); ptr = NULL; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); expected_refcount--; @@ -689,29 +689,29 @@ static void test_private_data(void) ptr = (IUnknown *)0xdeadbeef; size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); size = 2 * sizeof(ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); size = 0xdeadbabe; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == 0, "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, NULL, &ptr); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); refcount = IDXGIDevice_Release(device); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 576a9ba..be2b5f7 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,48 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +HRESULT dxgi_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + HRESULT hr; + + if (!data_size) + return E_INVALIDARG; + + EnterCriticalSection(&dxgi_cs); + if (!(stored_data = wined3d_private_store_get_private_data(store, guid))) + { + hr = DXGI_ERROR_NOT_FOUND; + *data_size = 0; + goto done; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + { + hr = S_OK; + goto done; + } + if (size_in < stored_data->size) + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + hr = S_OK; + +done: + LeaveCriticalSection(&dxgi_cs); + + return hr; +} + HRESULT dxgi_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) {

1 0

Austin English : kernel32: Add SetVolumeMountPointA/W stubs.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 295f194804d4d504048d17f20e3b1f639b9ee9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295f194804d4d504048d17f20… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 11 02:38:03 2015 -0600 kernel32: Add SetVolumeMountPointA/W stubs. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/volume.c | 20 ++++++++++++++++++++ include/winbase.h | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f49075e..c95c446 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1465,8 +1465,8 @@ @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) -@ stub SetVolumeMountPointA -@ stub SetVolumeMountPointW +@ stdcall SetVolumeMountPointA(str str) +@ stdcall SetVolumeMountPointW(wstr wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) @ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) # @ stub SetXStateFeaturesMask diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d396764..59eda44 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -2167,3 +2167,23 @@ BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR mountpoint) FIXME("(%s), stub!\n", debugstr_w(mountpoint)); return FALSE; } + +/*********************************************************************** + * SetVolumeMountPointA (KERNEL32.@) + */ +BOOL WINAPI SetVolumeMountPointA(LPCSTR path, LPCSTR volume) +{ + FIXME("(%s, %s), stub!\n", debugstr_a(path), debugstr_a(volume)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetVolumeMountPointW (KERNEL32.@) + */ +BOOL WINAPI SetVolumeMountPointW(LPCWSTR path, LPCWSTR volume) +{ + FIXME("(%s, %s), stub!\n", debugstr_w(path), debugstr_w(volume)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winbase.h b/include/winbase.h index 0d8cede..1eb49b3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2407,7 +2407,7 @@ WINBASEAPI BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR); #define SetVolumeLabel WINELIB_NAME_AW(SetVolumeLabel) WINBASEAPI BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR); -WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCSTR,LPCSTR); +WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR); #define SetVolumeMountPoint WINELIB_NAME_AW(SetVolumeMountPoint) WINBASEAPI BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); WINBASEAPI BOOL WINAPI SetWaitableTimerEx(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,REASON_CONTEXT*,ULONG);

1 0