May 2012 - Wine-Commits - list.winehq.org

André Hentschel : libwine: Add checks for DragonFly BSD.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: e369e79bd545e491b38c415bb85daeb27c906415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e369e79bd545e491b38c415bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:26:45 2012 +0200 libwine: Add checks for DragonFly BSD. --- libs/wine/ldt.c | 6 +++--- libs/wine/mmap.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 4e48b16..85a835b 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -87,7 +87,7 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #endif #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <machine/segments.h> #include <machine/sysarch.h> #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ @@ -175,7 +175,7 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) if ((ret = modify_ldt(0x11, &ldt_info, sizeof(ldt_info))) < 0) perror( "modify_ldt" ); } -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) { LDT_ENTRY entry_copy = *entry; /* The kernel will only let us set LDTs with user priority level */ @@ -412,7 +412,7 @@ void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) ldt_info.entry_number = sel >> 3; fill_modify_ldt_struct( &ldt_info, entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" ); -#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) i386_set_fsbase( wine_ldt_get_base( entry )); #endif } diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 6ec814a..44fc53f 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -205,7 +205,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) if (!(flags & MAP_FIXED)) { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* Even FreeBSD 5.3 does not properly support NULL here. */ if( start == NULL ) start = (void *)0x110000; #endif @@ -377,7 +377,7 @@ void mmap_init(void) char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); if (base > user_space_limit) reserve_area( user_space_limit, base ); base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1); -#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) /* Heuristic: assume the stack is near the end of the address */ /* space, this avoids a lot of futile allocation attempts */ end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000);

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]RenderMode.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 2ab69db4c300c62934a4e67c6dd1dedebf4c8df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab69db4c300c62934a4e67c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:35:34 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]RenderMode. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index cd2cda3..7d29236 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -41,6 +41,7 @@ typedef struct { LONG ref; BOOL dither; D3DRMRENDERQUALITY quality; + DWORD rendermode; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -444,18 +445,18 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetRenderMode(IDirect3DRMDevice2* i { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, dwFlags); + TRACE("(%p/%p)->(%u)\n", iface, This, dwFlags); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetRenderMode(&This->IDirect3DRMDevice3_iface, dwFlags); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); } static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, @@ -869,18 +870,20 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetRenderMode(IDirect3DRMDevice3* i { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, dwFlags); + TRACE("(%p/%p)->(%u)\n", iface, This, dwFlags); - return E_NOTIMPL; + This->rendermode = dwFlags; + + return D3DRM_OK; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->rendermode; } static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface,

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]Quality.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 66262eea55ce710740493e4e318ea44923cea8cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=66262eea55ce710740493e4e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:35:01 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]Quality. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9ad9367..cd2cda3 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -40,6 +40,7 @@ typedef struct { IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; BOOL dither; + D3DRMRENDERQUALITY quality; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -301,9 +302,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetQuality(IDirect3DRMDevice2* ifac { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, quality); + TRACE("(%p/%p)->(%u)\n", iface, This, quality); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetQuality(&This->IDirect3DRMDevice3_iface, quality); } static HRESULT WINAPI IDirect3DRMDevice2Impl_SetTextureQuality(IDirect3DRMDevice2* iface, @@ -384,9 +385,9 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMDevice2Impl_GetQuality(IDirect3DRMDe { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetQuality(&This->IDirect3DRMDevice3_iface); } static D3DCOLORMODEL WINAPI IDirect3DRMDevice2Impl_GetColorModel(IDirect3DRMDevice2* iface) @@ -723,9 +724,11 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetQuality(IDirect3DRMDevice3* ifac { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, quality); + TRACE("(%p/%p)->(%u)\n", iface, This, quality); - return E_NOTIMPL; + This->quality = quality; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_SetTextureQuality(IDirect3DRMDevice3* iface, @@ -806,9 +809,9 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMDevice3Impl_GetQuality(IDirect3DRMDe { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->quality; } static D3DCOLORMODEL WINAPI IDirect3DRMDevice3Impl_GetColorModel(IDirect3DRMDevice3* iface)

1 0

Jacek Caban : wininet: Get rid of no longer used serverName and serverPort from http_session_t.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 2ed97ebe43ef637605ebca25197a39acd1cdd60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed97ebe43ef637605ebca251… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:13 2012 +0200 wininet: Get rid of no longer used serverName and serverPort from http_session_t. --- dlls/wininet/http.c | 7 ++----- dlls/wininet/internet.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f08ab6d..74c9006 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3086,11 +3086,11 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - port = session->serverPort; + port = session->hostPort; if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->serverName, port); + request->server = get_server(session->hostName, port); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -5450,7 +5450,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) WININET_Release(&session->appInfo->hdr); heap_free(session->hostName); - heap_free(session->serverName); heap_free(session->password); heap_free(session->userName); } @@ -5602,13 +5601,11 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->proxyBypass) FIXME("Proxy bypass is ignored.\n"); } - session->serverName = heap_strdupW(lpszServerName); session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0]) session->password = heap_strdupW(lpszPassword); - session->serverPort = serverPort; session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; session->send_timeout = INFINITE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index fd6b5f7..2e59720 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -269,11 +269,9 @@ typedef struct object_header_t hdr; appinfo_t *appInfo; LPWSTR hostName; /* the final destination of the request */ - LPWSTR serverName; /* the name of the server we directly connect to */ LPWSTR userName; LPWSTR password; INTERNET_PORT hostPort; /* the final destination port of the request */ - INTERNET_PORT serverPort; /* the port of the server we directly connect to */ DWORD connect_timeout; DWORD send_timeout; DWORD receive_timeout;

1 0

Kimmo Myllyvirta : wined3d: Add NVIDIA GeForce GTX 680.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: d738e6ffd2219b353d4f40a2c14447ef73d4bb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d738e6ffd2219b353d4f40a2c… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun May 27 11:02:10 2012 +0300 wined3d: Add NVIDIA GeForce GTX 680. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7810d7b..f2542b9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1125,6 +1125,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1517,6 +1518,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 051b04e..096fe60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1406,6 +1406,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, + CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DDevice9Impl.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 2a63fe66240134b46bd0edf57af8f673eb9a3a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a63fe66240134b46bd0edf57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:28 2012 +0200 d3d9: Get rid of IDirect3DDevice9Impl. --- dlls/d3d9/buffer.c | 4 +- dlls/d3d9/d3d9_private.h | 45 +- dlls/d3d9/device.c | 1576 ++++++++++++++++++++--------------------- dlls/d3d9/directx.c | 4 +- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 6 +- dlls/d3d9/vertexdeclaration.c | 4 +- dlls/d3d9/volume.c | 2 +- 12 files changed, 794 insertions(+), 861 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a63fe66240134b46bd0e…

1 0

André Hentschel : loader: Add check for DragonFly BSD.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 1491e7b99cd8f612e6da26e14f410a169c1e0d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1491e7b99cd8f612e6da26e14… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:22:13 2012 +0200 loader: Add check for DragonFly BSD. --- loader/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/main.c b/loader/main.c index 11f475b..edbf4f7 100644 --- a/loader/main.c +++ b/loader/main.c @@ -174,7 +174,7 @@ static int pre_exec(void) return 1; /* we have a preloader on x86-64 */ } -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__)) && defined(__i386__) +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(__i386__) static int pre_exec(void) {

1 0

André Hentschel : server: Add checks for DragonFly BSD .
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 89e462b1419ce2c6b30021eae20633bb912f3823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e462b1419ce2c6b30021eae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:21:04 2012 +0200 server: Add checks for DragonFly BSD. --- server/fd.c | 2 +- server/ptrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index a8b3a5f..f3e42bd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -924,7 +924,7 @@ static int is_device_removable( dev_t dev, int unix_fd ) return (stfs.f_type == 0x9660 || /* iso9660 */ stfs.f_type == 0x9fa1 || /* supermount */ stfs.f_type == 0x15013346); /* udf */ -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) struct statfs stfs; if (fstatfs( unix_fd, &stfs ) == -1) return 0; diff --git a/server/ptrace.c b/server/ptrace.c index 6c14481..912f90e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -656,7 +656,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign } #elif defined(__i386__) && defined(PTRACE_GETDBREGS) && defined(PTRACE_SETDBREGS) && \ - (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__)) + (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)) #include <machine/reg.h>

1 0

André Hentschel : d3drm: Implement width and height handling in device interfaces.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 5ab7b75cebe86236d53ed5cf867ce02c2cc9eb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab7b75cebe86236d53ed5cf8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:37:09 2012 +0200 d3drm: Implement width and height handling in device interfaces. --- dlls/d3drm/device.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 7d29236..1b4967a 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -42,6 +42,8 @@ typedef struct { BOOL dither; D3DRMRENDERQUALITY quality; DWORD rendermode; + DWORD height; + DWORD width; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -204,9 +206,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u, %u): stub\n", iface, This, width, height); + TRACE("(%p/%p)->(%u, %u)\n", iface, This, width, height); - return E_NOTIMPL; + return IDirect3DRMDevice3_Init(&This->IDirect3DRMDevice3_iface, width, height); } /*** IDirect3DRMDevice2 methods ***/ @@ -227,9 +229,10 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%p, %p, %u, %u): stub\n", iface, This, lpDDClipper, lpGUID, width, height); + TRACE("(%p/%p)->(%p, %p, %u, %u)\n", iface, This, lpDDClipper, lpGUID, width, height); - return E_NOTIMPL; + return IDirect3DRMDevice3_InitFromClipper(&This->IDirect3DRMDevice3_iface, lpDDClipper, lpGUID, + width, height); } static HRESULT WINAPI IDirect3DRMDevice2Impl_Update(IDirect3DRMDevice2* iface) @@ -350,18 +353,18 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetHeight(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetHeight(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetWidth(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetWidth(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetTrianglesDrawn(IDirect3DRMDevice2* iface) @@ -627,7 +630,10 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO FIXME("(%p/%p)->(%u, %u): stub\n", iface, This, width, height); - return E_NOTIMPL; + This->height = height; + This->width = width; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, @@ -649,7 +655,10 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* FIXME("(%p/%p)->(%p, %p, %u, %u): stub\n", iface, This, lpDDClipper, lpGUID, width, height); - return E_NOTIMPL; + This->height = height; + This->width = width; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_Update(IDirect3DRMDevice3* iface) @@ -774,18 +783,18 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetHeight(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->height; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetWidth(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->width; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetTrianglesDrawn(IDirect3DRMDevice3* iface)

1 0

Jacek Caban : wininet: Handle error flags only for masked-error mode.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 79259064c9c9cd754dfc246988b9626bbcd1f3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79259064c9c9cd754dfc24698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:54:32 2012 +0200 wininet: Handle error flags only for masked-error mode. --- dlls/wininet/netconnection.c | 32 ++++++++++++++------- dlls/wininet/tests/http.c | 61 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 238d365..8117884 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -247,41 +247,47 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } if(errors & CERT_TRUST_IS_REVOKED) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; @@ -313,10 +319,12 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ if(ret) { if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; err = ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { - WARN("unknown error flags for policy status %x\n", policyStatus.dwError); + if(conn->mask_errors) + WARN("unknown error flags for policy status %x\n", policyStatus.dwError); err = ERROR_INTERNET_SEC_INVALID_CERT; } }else { @@ -328,9 +336,10 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - if(conn->mask_errors) + if(conn->mask_errors) { + conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; + } return err; } @@ -772,7 +781,8 @@ DWORD NETCON_secure_connect(netconn_t *connection) connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; connection->security_flags |= SECURITY_FLAG_SECURE; - connection->server->security_flags = connection->security_flags; + if(connection->mask_errors) + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; fail: diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2cfc2af..2e7b693 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2929,12 +2929,63 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + test_secflags_option(req, 0); + set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + + SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); + SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); + + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); + + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + + test_request_flags(req, 0); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA| + SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_STRENGTH_STRONG); + + res = InternetReadFile(req, buf, sizeof(buf), &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + ok(size, "size = 0\n"); + + /* Collect all existing persistent connections */ + res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(res, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequest(conn, "GET", "/tests/hello.html", NULL, NULL, NULL, + INTERNET_FLAG_SECURE|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_RELOAD|INTERNET_FLAG_NO_CACHE_WRITE, + 0xdeadbeef); + ok(req != NULL, "HttpOpenRequest failed\n"); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT|INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY; res = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&flags, sizeof(flags)); ok(res, "InternetQueryOption(INTERNET_OPTION_ERROR_MASK failed: %u\n", GetLastError()); - SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); - SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2950,8 +3001,6 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2963,7 +3012,7 @@ static void test_security_flags(void) if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { win_skip("Unexpected cert errors, skipping security flags tests\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); CloseHandle(hCompleteEvent); return; } @@ -3013,7 +3062,7 @@ static void test_security_flags(void) ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); /* Collect all existing persistent connections */ res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0);

1 0