February 2015 - Wine-commits

Henri Verbeet : dxgi: Implement dxgi_swapchain_SetPrivateDataInterface().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: e37272ee864a9fa85f2030116377d9089d6ef85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37272ee864a9fa85f2030116… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:41 2015 +0100 dxgi: Implement dxgi_swapchain_SetPrivateDataInterface(). --- dlls/dxgi/swapchain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4ac3421..a348ecc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -92,9 +92,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateData(IDXGISwapChain *i static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwapChain *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&swapchain->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *iface,

1 0

Stefan Dösinger : ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2).
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: f64815e6513d4f2f8ba097ff2abb6b5752962af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64815e6513d4f2f8ba097ff2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 19:10:41 2015 +0100 ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2). --- dlls/ddraw/tests/ddraw1.c | 66 +++++++++++ dlls/ddraw/tests/ddraw2.c | 66 +++++++++++ dlls/ddraw/tests/visual.c | 291 +--------------------------------------------- 3 files changed, 134 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f64815e6513d4f2f8ba09…

1 0

Stefan Dösinger : ddraw/tests: Create a device in test_surface_discard.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 5408c5ea34e3329c9e6a582c08f19b298de11345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5408c5ea34e3329c9e6a582c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 19:10:42 2015 +0100 ddraw/tests: Create a device in test_surface_discard. --- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3117d51..a26fd65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3951,10 +3951,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw *ddraw; + IDirect3DDevice *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -3974,14 +3975,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4016,7 +4019,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4034,7 +4037,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice_Release(device); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f584971..090f731 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4622,10 +4622,11 @@ static void test_surface_lock(void) static void test_surface_discard(void) { IDirectDraw2 *ddraw; + IDirect3DDevice2 *device; HRESULT hr; HWND window; DDSURFACEDESC ddsd; - IDirectDrawSurface *surface, *primary; + IDirectDrawSurface *surface, *target; void *addr; static const struct { @@ -4645,14 +4646,16 @@ static void test_surface_discard(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return; + } - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &primary, NULL); + hr = IDirect3DDevice2_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { @@ -4687,7 +4690,7 @@ static void test_surface_discard(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL); + hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -4705,7 +4708,8 @@ static void test_surface_discard(void) ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); } - IDirectDrawSurface_Release(primary); + IDirectDrawSurface_Release(target); + IDirect3DDevice2_Release(device); IDirectDraw2_Release(ddraw); DestroyWindow(window); }

1 0

Thomas Faber : wininet: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: d742f6e821e819efcb5fe24f8fe331d98ad47c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d742f6e821e819efcb5fe24f8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:27:12 2015 +0100 wininet: Avoid empty initializer braces. --- dlls/wininet/internet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 65bb434..7eddb2c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -522,11 +522,12 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { static const WCHAR fmt[] = {'%','s',':','%','u',0}; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; URL_COMPONENTSW uc; + hostname[0] = username[0] = password[0] = 0; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); uc.lpszHostName = hostname;

1 0

Thomas Faber : quartz: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 7f9a63e5fdb0636bd68e3a7b9a18423460d3f365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a63e5fdb0636bd68e3a7b9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:33:23 2015 +0100 quartz: Avoid empty initializer braces. --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9f96654..8e34655 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -916,7 +916,7 @@ static LONG cookie_counter = 1; static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { DSoundRenderImpl *This = lpParam; - struct dsoundrender_timer head = { }; + struct dsoundrender_timer head = {NULL}; MSG msg; TRACE("(%p): Main Loop\n", This);

1 0

Thomas Faber : winegstreamer: Avoid empty initializer braces.
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: ed761920ca7a6803485a74bb3a08a3762b5951b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed761920ca7a6803485a74bb3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 14 09:35:56 2015 +0100 winegstreamer: Avoid empty initializer braces. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4e5f04d..de48efd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -707,7 +707,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS PIN_INFO piOutput; const char *typename; char *name; - AM_MEDIA_TYPE amt = { }; + AM_MEDIA_TYPE amt = {{0}}; GstCaps *caps; GstStructure *arg; GstPad *mypad;

1 0

Thomas Faber : gdi32/tests: Avoid variable length arrays (MSVC).
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 656bc70f80e72774f3d266308157f44c89bce6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=656bc70f80e72774f3d266308… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Feb 16 09:14:34 2015 +0100 gdi32/tests: Avoid variable length arrays (MSVC). --- dlls/gdi32/tests/bitmap.c | 2 +- dlls/gdi32/tests/pen.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 351a5ca..84f843f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1588,7 +1588,7 @@ static BOOL is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) { static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors ) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *info = (BITMAPINFO *)buffer; RGBQUAD *colors = info->bmiColors; WORD bits[16]; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 156700f..43f00d8 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -512,7 +512,7 @@ static void test_ps_userstyle(void) LOGBRUSH lb; HPEN pen; INT size, i; - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *ext_pen = (EXTLOGPEN *)buffer; lb.lbColor = 0x00ff0000; @@ -569,7 +569,7 @@ static void test_ps_userstyle(void) static void test_brush_pens(void) { - char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry) + 16 * sizeof(DWORD)]; EXTLOGPEN *elp = (EXTLOGPEN *)buffer; LOGBRUSH lb; HPEN pen = 0;

1 0

Jacek Caban : wininet: Moved inet_ntop call to GetAddress.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 47778f95fa7136a64440dfc9b00b3c4cb5267e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47778f95fa7136a64440dfc9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:53 2015 +0100 wininet: Moved inet_ntop call to GetAddress. --- dlls/wininet/ftp.c | 5 ++--- dlls/wininet/http.c | 18 ++---------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 +-- dlls/wininet/utility.c | 7 ++++++- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05f5d4b..9be3096 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2447,7 +2447,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; - char szaddr[INET_ADDRSTRLEN]; + char szaddr[INET6_ADDRSTRLEN]; TRACE("%p Server(%s) Port(%d) User(%s) Paswd(%s)\n", hIC, debugstr_w(lpszServerName), @@ -2535,7 +2535,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, (LPWSTR) lpszServerName, (strlenW(lpszServerName)+1) * sizeof(WCHAR)); sock_namelen = sizeof(socketAddr); - if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) + if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen, szaddr)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; @@ -2548,7 +2548,6 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, goto lerror; } - inet_ntop(socketAddr.sin_family, &socketAddr.sin_addr, szaddr, sizeof(szaddr)); SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 59c358c..b878cab 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1852,8 +1852,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { server_t *server = request->proxy ? request->proxy : request->server; - socklen_t addr_len; - void *addr; + int addr_len; if(server->addr_len) return ERROR_SUCCESS; @@ -1864,23 +1863,10 @@ static DWORD HTTP_ResolveName(http_request_t *request) (strlenW(server->name)+1) * sizeof(WCHAR)); addr_len = sizeof(server->addr); - if (!GetAddress(server->name, server->port, (struct sockaddr *)&server->addr, &addr_len)) + if (!GetAddress(server->name, server->port, (SOCKADDR*)&server->addr, &addr_len, server->addr_str)) return ERROR_INTERNET_NAME_NOT_RESOLVED; - switch(server->addr.ss_family) { - case AF_INET: - addr = &((struct sockaddr_in *)&server->addr)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)&server->addr)->sin6_addr; - break; - default: - WARN("unsupported family %d\n", server->addr.ss_family); - return ERROR_INTERNET_NAME_NOT_RESOLVED; - } - server->addr_len = addr_len; - inet_ntop(server->addr.ss_family, addr, server->addr_str, sizeof(server->addr_str)); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, server->addr_str, strlen(server->addr_str)+1); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a1e22d6..65bb434 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3453,7 +3453,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe socklen_t sa_len = sizeof(saddr); int fd; - if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) + if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len, NULL)) goto End; init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5741d24..2ad414f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -397,8 +397,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN; -BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; +BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*) DECLSPEC_HIDDEN; DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 16447e4..dd926dd 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -125,9 +125,10 @@ time_t ConvertTimeString(LPCWSTR asctime) } -BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, socklen_t *sa_len) +BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, int *sa_len, char *addr_str) { ADDRINFOW *res, hints; + void *addr = NULL; int ret; TRACE("%s\n", debugstr_w(name)); @@ -162,13 +163,17 @@ BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, soc switch (res->ai_family) { case AF_INET: + addr = &((struct sockaddr_in *)psa)->sin_addr; ((struct sockaddr_in *)psa)->sin_port = htons(port); break; case AF_INET6: + addr = &((struct sockaddr_in6 *)psa)->sin6_addr; ((struct sockaddr_in6 *)psa)->sin6_port = htons(port); break; } + if(addr_str) + inet_ntop(res->ai_family, addr, addr_str, INET6_ADDRSTRLEN); FreeAddrInfoW(res); return TRUE; }

1 0

Jacek Caban : wininet: Don't include ws2tcpip.h after zlib.h.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 6a0eb2ddd764ee61f1717211f26744ea751f1712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0eb2ddd764ee61f1717211f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:17:08 2015 +0100 wininet: Don't include ws2tcpip.h after zlib.h. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b878cab..d515d7d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -30,11 +30,11 @@ #include "config.h" #ifdef HAVE_ZLIB -# define Z_SOLO # include <zlib.h> #endif -#include "ws2tcpip.h" +#include "winsock2.h" +#include "ws2ipdef.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2ad414f..e0baf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -37,7 +37,7 @@ typedef struct { INTERNET_PORT port; BOOL is_https; struct sockaddr_storage addr; - socklen_t addr_len; + int addr_len; char addr_str[INET6_ADDRSTRLEN]; WCHAR *scheme_host_port;

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateDataInterface().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: b3159320101cd35c14aa1b299f4f931e8032e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3159320101cd35c14aa1b299… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:50 2015 +0100 dxgi: Implement dxgi_factory_SetPrivateDataInterface(). --- dlls/dxgi/factory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 13b72f0..3943051 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -103,9 +103,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&factory->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface,

1 0