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

Nikolay Sivov : msxml3: Accept selection namespaces string with trailing spaces.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: c3fd306f611e4e5b73797168de87537d5a6fefa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fd306f611e4e5b73797168d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 19 10:24:43 2012 +0400 msxml3: Accept selection namespaces string with trailing spaces. --- dlls/msxml3/domdoc.c | 3 +++ dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0f3eb50..c2dbe03 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2872,6 +2872,9 @@ static HRESULT WINAPI domdoc_setProperty( while (*pTokEnd != ' ' && *pTokEnd != 0) ++pTokEnd; + /* so it failed to advance which means we've got some trailing spaces */ + if (pTokEnd == pTokBegin) break; + if (xmlStrncmp(pTokBegin, (xmlChar const*)"xmlns", 5) != 0) { hr = E_FAIL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dfa6126..817cf97 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5738,22 +5738,27 @@ static const selection_ns_t selection_ns_data[] = { { &CLSID_DOMDocument, "CLSID_DOMDocument", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument, "CLSID_DOMDocument", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument, "CLSID_DOMDocument", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument, "CLSID_DOMDocument", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { NULL } }; @@ -6054,6 +6059,7 @@ if (0) IXMLDOMDocument2_Release(doc); ptr++; + free_bstrs(); } free_bstrs();

1 0

Heiko Hund : winhttp: Make strings in WINHTTP_PROXY_INFO non-const.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 1ba968821a45fe1d590bd3bf8c6b97eb1f0c8a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba968821a45fe1d590bd3bf8… Author: Heiko Hund <heiko.hund(a)sophos.com> Date: Thu Jul 19 08:22:59 2012 +0000 winhttp: Make strings in WINHTTP_PROXY_INFO non-const. --- dlls/winhttp/request.c | 16 ++++++++-------- dlls/winhttp/session.c | 8 ++++---- dlls/winhttp/tests/notification.c | 4 ++-- dlls/winhttp/tests/winhttp.c | 12 ++++++------ include/winhttp.h | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8870e50..8109290 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2238,8 +2238,8 @@ static void free_request( struct winhttp_request *request ) CloseHandle( request->thread ); CloseHandle( request->wait ); CloseHandle( request->cancel ); - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); VariantClear( &request->data ); @@ -2430,16 +2430,16 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; @@ -2448,12 +2448,12 @@ static HRESULT WINAPI winhttp_request_SetProxy( request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; if (V_VT( &proxy_server ) == VT_BSTR) { - heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxy ); request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); } if (V_VT( &bypass_list ) == VT_BSTR) { - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); } break; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b4a46e0..e3e5e2b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -229,14 +229,14 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->access = info.dwAccessType; if (info.lpszProxy && !(session->proxy_server = strdupW( info.lpszProxy ))) { - GlobalFree( (LPWSTR)info.lpszProxy ); - GlobalFree( (LPWSTR)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); goto end; } if (info.lpszProxyBypass && !(session->proxy_bypass = strdupW( info.lpszProxyBypass ))) { - GlobalFree( (LPWSTR)info.lpszProxy ); - GlobalFree( (LPWSTR)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); goto end; } } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 84a3569..8ef2115 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -68,9 +68,9 @@ static BOOL proxy_active(void) { active = (proxy_info.lpszProxy != NULL); if (active) - GlobalFree((HGLOBAL) proxy_info.lpszProxy); + GlobalFree(proxy_info.lpszProxy); if (proxy_info.lpszProxyBypass != NULL) - GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + GlobalFree(proxy_info.lpszProxyBypass); } else active = FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9d75dbf..3bc686f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -46,9 +46,9 @@ static BOOL proxy_active(void) { active = (proxy_info.lpszProxy != NULL); if (active) - GlobalFree((HGLOBAL) proxy_info.lpszProxy); + GlobalFree(proxy_info.lpszProxy); if (proxy_info.lpszProxyBypass != NULL) - GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + GlobalFree(proxy_info.lpszProxyBypass); } else active = FALSE; @@ -1005,8 +1005,8 @@ static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) static void test_set_default_proxy_config(void) { - static const WCHAR wideString[] = { 0x226f, 0x575b, 0 }; - static const WCHAR normalString[] = { 'f','o','o',0 }; + static WCHAR wideString[] = { 0x226f, 0x575b, 0 }; + static WCHAR normalString[] = { 'f','o','o',0 }; DWORD type, len; BYTE *saved_proxy_settings = NULL; WINHTTP_PROXY_INFO info; @@ -2699,8 +2699,8 @@ static void test_WinHttpGetProxyForUrl(void) trace("%u\n", info.dwAccessType); trace("%s\n", wine_dbgstr_w(info.lpszProxy)); trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); - GlobalFree( (WCHAR *)info.lpszProxy ); - GlobalFree( (WCHAR *)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); } WinHttpCloseHandle( session ); } diff --git a/include/winhttp.h b/include/winhttp.h index b54bd92..cf0da83 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -487,8 +487,8 @@ typedef struct typedef struct { DWORD dwAccessType; - LPCWSTR lpszProxy; - LPCWSTR lpszProxyBypass; + LPWSTR lpszProxy; + LPWSTR lpszProxyBypass; } WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW;

1 0

Alexandre Julliard : winex11: Use the function table pointer to call dynamically loaded OpenGL functions .
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 101bdf425b39f0c20c7da07bf5712887a88ea847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101bdf425b39f0c20c7da07bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:00:55 2012 +0200 winex11: Use the function table pointer to call dynamically loaded OpenGL functions. --- dlls/winex11.drv/opengl.c | 43 +++++++------------------------------------ 1 files changed, 7 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b36a29c..355b55d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -314,6 +314,7 @@ MAKE_FUNCPTR(glXGetVisualFromFBConfig) MAKE_FUNCPTR(glXMakeContextCurrent) MAKE_FUNCPTR(glXQueryDrawable) MAKE_FUNCPTR(glXGetCurrentReadDrawable) +#undef MAKE_FUNCPTR /* GLX Extensions */ static GLXContext (*pglXCreateContextAttribsARB)(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); @@ -332,21 +333,6 @@ static void (*pglFinish)(void); static void (*pglFlush)(void); static void (*pglGetIntegerv)(GLenum,GLint*); -MAKE_FUNCPTR(glBindTexture) -MAKE_FUNCPTR(glBitmap) -MAKE_FUNCPTR(glCopyTexSubImage1D) -MAKE_FUNCPTR(glCopyTexImage2D) -MAKE_FUNCPTR(glCopyTexSubImage2D) -MAKE_FUNCPTR(glDrawBuffer) -MAKE_FUNCPTR(glEndList) -MAKE_FUNCPTR(glGetError) -MAKE_FUNCPTR(glGetString) -MAKE_FUNCPTR(glNewList) -MAKE_FUNCPTR(glPixelStorei) -MAKE_FUNCPTR(glReadPixels) -MAKE_FUNCPTR(glTexImage2D) -#undef MAKE_FUNCPTR - static void wglFinish(void); static void wglFlush(void); static void wglGetIntegerv(GLenum pname, GLint* params); @@ -413,9 +399,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); goto done; } - gl_renderer = (const char *)pglGetString(GL_RENDERER); - WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); - str = (const char *) pglGetString(GL_EXTENSIONS); + gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER); + WineGLInfo.glVersion = (const char *) opengl_funcs.gl.p_glGetString(GL_VERSION); + str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); strcpy(WineGLInfo.glExtensions, str); @@ -566,21 +552,6 @@ static BOOL has_opengl(void) LOAD_FUNCPTR(glXMakeContextCurrent); LOAD_FUNCPTR(glXGetCurrentReadDrawable); LOAD_FUNCPTR(glXGetFBConfigs); - - /* Standard OpenGL calls */ - LOAD_FUNCPTR(glBindTexture); - LOAD_FUNCPTR(glBitmap); - LOAD_FUNCPTR(glCopyTexSubImage1D); - LOAD_FUNCPTR(glCopyTexImage2D); - LOAD_FUNCPTR(glCopyTexSubImage2D); - LOAD_FUNCPTR(glDrawBuffer); - LOAD_FUNCPTR(glEndList); - LOAD_FUNCPTR(glGetError); - LOAD_FUNCPTR(glGetString); - LOAD_FUNCPTR(glNewList); - LOAD_FUNCPTR(glPixelStorei); - LOAD_FUNCPTR(glReadPixels); - LOAD_FUNCPTR(glTexImage2D); #undef LOAD_FUNCPTR /* It doesn't matter if these fail. They'll only be used if the driver reports @@ -1664,7 +1635,7 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->drawables[1] = escape.gl_drawable; ctx->refresh_drawables = FALSE; - if (escape.gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); + if (escape.gl_type == DC_GL_BITMAP) opengl_funcs.gl.p_glDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE); @@ -2837,8 +2808,8 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. * After that upload the pbuffer texture data. */ - pglBindTexture(object->texture_target, prev_binded_texture); - pglCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); + opengl_funcs.gl.p_glBindTexture(object->texture_target, prev_binded_texture); + opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context);

1 0

Henri Verbeet : ddraw: Implement ddraw7_GetScanLine() on top of wined3d_get_adapter_raster_status().
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 2bfc5214be461882ee314cf5301e7a98e84ac94c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfc5214be461882ee314cf53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 21:32:30 2012 +0200 ddraw: Implement ddraw7_GetScanLine() on top of wined3d_get_adapter_raster_status(). --- dlls/ddraw/ddraw.c | 42 ++++----------------------------------- dlls/wined3d/directx.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 43 ++-------------------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 + 5 files changed, 58 insertions(+), 77 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1963de2..b96fd48 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1931,60 +1931,28 @@ static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flag return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event); } -/***************************************************************************** - * IDirectDraw7::GetScanLine - * - * Returns the scan line that is being drawn on the monitor - * - * Parameters: - * Scanline: Address to write the scan line value to - * - * Returns: - * Always returns DD_OK - * - *****************************************************************************/ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); - struct wined3d_display_mode mode; - static BOOL hide = FALSE; - DWORD time, frame_progress, lines; + struct wined3d_raster_status raster_status; HRESULT hr; TRACE("iface %p, line %p.\n", iface, Scanline); - /* This function is called often, so print the fixme only once */ - if(!hide) - { - FIXME("iface %p, line %p partial stub!\n", iface, Scanline); - hide = TRUE; - } - wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL); + hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); wined3d_mutex_unlock(); if (FAILED(hr)) { - ERR("Failed to get display mode, hr %#x.\n", hr); + WARN("Failed to get raster status, hr %#x.\n", hr); return hr; } - /* Fake the line sweeping of the monitor */ - /* FIXME: We should synchronize with a source to keep the refresh rate */ + *Scanline = raster_status.scan_line; - /* Simulate a 60Hz display */ - time = GetTickCount(); - frame_progress = time & 15; /* time % (1000 / 60) */ - if (!frame_progress) - { - *Scanline = 0; + if (raster_status.in_vblank) return DDERR_VERTICALBLANKINPROGRESS; - } - /* Convert frame_progress to estimated scan line. Return any line from - * block determined by time. Some lines may be never returned */ - lines = mode.height / 15; - *Scanline = (frame_progress - 1) * lines + time % lines; return DD_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f80e80c..9e9af8a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3225,6 +3225,53 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, return WINED3D_OK; } +HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, + struct wined3d_raster_status *raster_status) +{ + LONGLONG freq_per_frame, freq_per_line; + LARGE_INTEGER counter, freq_per_sec; + struct wined3d_display_mode mode; + static UINT once; + + if (!once++) + FIXME("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", + wined3d, adapter_idx, raster_status); + else + WARN("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", + wined3d, adapter_idx, raster_status); + + /* Obtaining the raster status is a widely implemented but optional + * feature. When this method returns OK StarCraft 2 expects the + * raster_status->InVBlank value to actually change over time. + * And Endless Alice Crysis doesn't care even if this method fails. + * Thus this method returns OK and fakes raster_status by + * QueryPerformanceCounter. */ + + if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) + return WINED3DERR_INVALIDCALL; + if (FAILED(wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, NULL))) + return WINED3DERR_INVALIDCALL; + if (mode.refresh_rate == DEFAULT_REFRESH_RATE) + mode.refresh_rate = 60; + + freq_per_frame = freq_per_sec.QuadPart / mode.refresh_rate; + /* Assume 20 scan lines in the vertical blank. */ + freq_per_line = freq_per_frame / (mode.height + 20); + raster_status->scan_line = (counter.QuadPart % freq_per_frame) / freq_per_line; + if (raster_status->scan_line < mode.height) + raster_status->in_vblank = FALSE; + else + { + raster_status->scan_line = 0; + raster_status->in_vblank = TRUE; + } + + TRACE("Returning fake value, in_vblank %u, scan_line %u.\n", + raster_status->in_vblank, raster_status->scan_line); + + return WINED3D_OK; +} + static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd00e55..8c37659 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -220,47 +220,10 @@ HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain * HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { - static BOOL warned; - LARGE_INTEGER counter, freq_per_sec; - LONGLONG freq_per_frame, freq_per_line; - struct wined3d_display_mode mode; - - /* No OpenGL equivalent */ - if (!warned) - { - FIXME("swapchain %p, raster_status %p semi-stub!\n", swapchain, raster_status); - warned = TRUE; - } - - /* Obtaining the raster status is a widely implemented but optional - * feature. When this method returns OK StarCraft 2 expects the - * raster_status->InVBlank value to actually change over time. - * And Endless Alice Crysis doesn't care even if this method fails. - * Thus this method returns OK and fakes raster_status by - * QueryPerformanceCounter. */ - - if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) - return WINED3DERR_INVALIDCALL; + TRACE("swapchain %p, raster_status %p.\n", swapchain, raster_status); - if (FAILED(wined3d_swapchain_get_display_mode(swapchain, &mode, NULL))) - return WINED3DERR_INVALIDCALL; - if (mode.refresh_rate == DEFAULT_REFRESH_RATE) - mode.refresh_rate = 60; - - freq_per_frame = freq_per_sec.QuadPart / mode.refresh_rate; - /* Assume 20 scan lines in the vertical blank */ - freq_per_line = freq_per_frame / (mode.height + 20); - raster_status->scan_line = (counter.QuadPart % freq_per_frame) / freq_per_line; - if (raster_status->scan_line < mode.height) - raster_status->in_vblank = FALSE; - else - { - raster_status->scan_line = 0; - raster_status->in_vblank = TRUE; - } - TRACE("Returning fake value, in_vblank %u, scan_line %u.\n", - raster_status->in_vblank, raster_status->scan_line); - return WINED3D_OK; + return wined3d_get_adapter_raster_status(swapchain->device->wined3d, + swapchain->device->adapter->ordinal, raster_status); } HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a22ebd1..eed1174 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -14,6 +14,7 @@ @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_monitor(ptr long) +@ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f587e44..5208a79 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2045,6 +2045,8 @@ HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UI UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); +HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, + struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, WINED3DCAPS *caps); ULONG __cdecl wined3d_incref(struct wined3d *wined3d);

1 0

Alexandre Julliard : gdi32: PatBlt needs to bypass the brush for ROPs that don't make use of it.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 7c9d35e575613e7e554ee7cb6bc1bc5e192e7209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9d35e575613e7e554ee7cb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 15:36:33 2012 +0200 gdi32: PatBlt needs to bypass the brush for ROPs that don't make use of it. --- dlls/gdi32/dibdrv/dibdrv.h | 1 - dlls/gdi32/dibdrv/graphics.c | 45 +++++++++++++++++++++++++++++++++++++---- dlls/gdi32/dibdrv/objects.c | 15 +++---------- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index cb94800..24202d0 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -241,7 +241,6 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; -extern BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 0237acf..846b08e 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -26,18 +26,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) +{ + struct clipped_rects clipped_rects; + BOOL ret; + + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; + ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, + GetROP2( pdev->dev.hdc )); + free_clipped_rects( &clipped_rects ); + return ret; +} + /* paint a region with the brush (note: the region can be modified) */ static BOOL brush_region( dibdrv_physdev *pdev, HRGN region ) { if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - return brush_rect( pdev, &pdev->brush, NULL, region, GetROP2( pdev->dev.hdc )); + return brush_rect( pdev, &pdev->brush, NULL, region ); } /* paint a region with the pen (note: the region can be modified) */ static BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) { if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - return brush_rect( pdev, &pdev->pen_brush, NULL, region, GetROP2( pdev->dev.hdc )); + return brush_rect( pdev, &pdev->pen_brush, NULL, region ); } static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, BOOL rtl_correction ) @@ -916,11 +928,34 @@ static inline INT get_rop2_from_rop(INT rop) BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + dib_brush *brush = &pdev->brush; + int rop2 = get_rop2_from_rop( rop ); + struct clipped_rects clipped_rects; + DWORD and = 0, xor = 0; + BOOL ret = TRUE; TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); add_clipped_bounds( pdev, &dst->visrect, 0 ); - return brush_rect( pdev, &pdev->brush, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); + if (!get_clipped_rects( &pdev->dib, &dst->visrect, pdev->clip, &clipped_rects )) return TRUE; + + switch (rop2) /* shortcuts for rops that don't involve the brush */ + { + case R2_NOT: and = ~0u; + /* fall through */ + case R2_WHITE: xor = ~0u; + /* fall through */ + case R2_BLACK: + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, and, xor ); + /* fall through */ + case R2_NOP: + break; + default: + ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop2 ); + break; + } + free_clipped_rects( &clipped_rects ); + return ret; } /*********************************************************************** @@ -945,7 +980,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); add_bounds_rect( &bounds, &rect ); - brush_rect( pdev, &pdev->brush, &rect, pdev->clip, GetROP2( dev->hdc ) ); + brush_rect( pdev, &pdev->brush, &rect, pdev->clip ); } release_wine_region( rgn ); @@ -1142,7 +1177,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.top += (pdev->pen_width + 1) / 2; rect.right -= pdev->pen_width / 2; rect.bottom -= pdev->pen_width / 2; - ret = brush_rect( pdev, &pdev->brush, &rect, pdev->clip, GetROP2(dev->hdc) ); + ret = brush_rect( pdev, &pdev->brush, &rect, pdev->clip ); } return ret; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 35164e6..b3f058d 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1991,6 +1991,10 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static BOOL null_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { + if (rop == 1) + { + ERR("(%p, %s, BLACKNESS)\n", pdev, wine_dbgstr_rect(rects)); + } return TRUE; } @@ -2175,14 +2179,3 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) } return color; } - -BOOL brush_rect(dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop) -{ - struct clipped_rects clipped_rects; - BOOL ret; - - if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; - ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop ); - free_clipped_rects( &clipped_rects ); - return ret; -}

1 0

Caron Jensen : wined3d: Recognize AMD Tahiti cards.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 9877df9aebef9d987956aa6c0360fe90137e9097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9877df9aebef9d987956aa6c0… Author: Caron Jensen <caron(a)codeweavers.com> Date: Wed Jul 18 13:33:32 2012 -0500 wined3d: Recognize AMD Tahiti cards. --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 28cb707..f80e80c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,6 +1154,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_830M, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_855GM, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1709,6 +1710,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in } cards[] = { + /* Southern Islands */ + {"HD 7900", CARD_AMD_RADEON_HD7900}, /* Northern Islands */ {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, @@ -1916,6 +1919,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } cards[] = { + /* Southern Islands */ + {"TAHITI", CARD_AMD_RADEON_HD7900}, /* Northern Islands */ {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17d371f..08e9370 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1344,6 +1344,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6700 = 0x68BA, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, + CARD_AMD_RADEON_HD7900 = 0x679A, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Alexandre Julliard : opengl32: Remove redundant fields in the functions hashes.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: fd9b0e300657e527360d5b096ee5b247d943f5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9b0e300657e527360d5b096… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:00:55 2012 +0200 opengl32: Remove redundant fields in the functions hashes. --- dlls/opengl32/make_opengl | 348 ++++++++++++++++++++++----------------------- 1 files changed, 170 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd9b0e300657e527360d5…

1 0

Marcus Meissner : mshtml: Remove superflous check (Coverity).
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: b810fad34c2c0e224e06efd8514cd2f013a9b36e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b810fad34c2c0e224e06efd85… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jul 18 20:27:03 2012 +0200 mshtml: Remove superflous check (Coverity). --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 00e8b4d..3ade07e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2772,7 +2772,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) outer_window->base.inner_window = window; outer_window->pending_window = NULL; - if(outer_window->doc_obj && (outer_window->doc_obj->basedoc.window == outer_window || !outer_window->doc_obj->basedoc.window)) { + if(outer_window->doc_obj->basedoc.window == outer_window || !outer_window->doc_obj->basedoc.window) { if(outer_window->doc_obj->basedoc.doc_node) htmldoc_release(&outer_window->doc_obj->basedoc.doc_node->basedoc); outer_window->doc_obj->basedoc.doc_node = window->doc;

1 0

Henri Verbeet : d3d10: Add support for parsing sample masks to parse_fx10_object().
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 1cfba6cefbef6fe1d2cf1becac8cf183029c14cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfba6cefbef6fe1d2cf1beca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:32 2012 +0200 d3d10: Add support for parsing sample masks to parse_fx10_object(). --- dlls/d3d10/d3d10_private.h | 2 ++ dlls/d3d10/effect.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index be1a87d..46af4f4 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -53,6 +53,7 @@ enum d3d10_effect_object_type D3D10_EOT_PIXELSHADER = 0x7, D3D10_EOT_GEOMETRYSHADER = 0x8, D3D10_EOT_BLEND_FACTOR = 0xa, + D3D10_EOT_SAMPLE_MASK = 0xb, }; enum d3d10_effect_object_operation @@ -158,6 +159,7 @@ struct d3d10_effect_pass struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; + UINT sample_mask; float blend_factor[4]; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2c22520..fc2be61 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -917,6 +917,20 @@ static BOOL read_float_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, floa } } +static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT *out_data, UINT idx) +{ + switch (in_type) + { + case D3D10_SVT_INT: + out_data[idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_size, void *out_data) { @@ -944,6 +958,11 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return FALSE; break; + case D3D10_SVT_UINT: + if (!read_int32_value(value, in_type, out_data, i)) + return FALSE; + break; + default: FIXME("Unhandled out_type %#x.\n", out_type); return FALSE; @@ -999,6 +1018,16 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr hr = S_OK; break; + case D3D10_EOT_SAMPLE_MASK: + if (!read_value_list(data + offset, D3D10_SVT_UINT, 1, &o->pass->sample_mask)) + { + FIXME("Failed to read sample mask.\n"); + return E_FAIL; + } + + hr = S_OK; + break; + case D3D10_EOT_BLEND_FACTOR: if (!read_value_list(data + offset, D3D10_SVT_FLOAT, 4, &o->pass->blend_factor[0])) { @@ -2547,6 +2576,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa } } + desc->SampleMask = This->sample_mask; memcpy(desc->BlendFactor, This->blend_factor, 4 * sizeof(float)); return S_OK;

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureString operates internally in pixels but in/ out rectangles are in device units.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: b20a1f56b0c915b24f70b8be83fbf76ea7378123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20a1f56b0c915b24f70b8be8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 16 14:58:33 2012 +0900 gdiplus: GdipMeasureString operates internally in pixels but in/out rectangles are in device units. --- dlls/gdiplus/graphics.c | 35 ++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphics.c | 6 ------ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 59dd77b..5dcd30a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4908,6 +4908,30 @@ static GpStatus measure_ranges_callback(HDC hdc, return stat; } +static void rect_to_pixels(const RectF *in, const GpGraphics *graphics, RectF *out) +{ + REAL dpi; + + GdipGetDpiX((GpGraphics *)graphics, &dpi); + out->X = units_to_pixels(in->X, graphics->unit, dpi); + out->Width = units_to_pixels(in->Width, graphics->unit, dpi); + GdipGetDpiY((GpGraphics *)graphics, &dpi); + out->Y = units_to_pixels(in->Y, graphics->unit, dpi); + out->Height = units_to_pixels(in->Height, graphics->unit, dpi); +} + +static void rect_to_units(const RectF *in, const GpGraphics *graphics, RectF *out) +{ + REAL dpi; + + GdipGetDpiX((GpGraphics *)graphics, &dpi); + out->X = pixels_to_units(in->X, graphics->unit, dpi); + out->Width = pixels_to_units(in->Width, graphics->unit, dpi); + GdipGetDpiY((GpGraphics *)graphics, &dpi); + out->Y = pixels_to_units(in->Y, graphics->unit, dpi); + out->Height = pixels_to_units(in->Height, graphics->unit, dpi); +} + GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, @@ -5011,6 +5035,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, struct measure_string_args args; HDC temp_hdc=NULL, hdc; GpPointF pt[3]; + RectF rect_pixels; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5048,8 +5073,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); - bounds->X = rect->X; - bounds->Y = rect->Y; + rect_to_pixels(rect, graphics, &rect_pixels); + + bounds->X = rect_pixels.X; + bounds->Y = rect_pixels.Y; bounds->Width = 0.0; bounds->Height = 0.0; @@ -5057,9 +5084,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(hdc, string, length, font, rect, format, + gdip_format_string(hdc, string, length, font, &rect_pixels, format, measure_string_callback, &args); + rect_to_units(bounds, graphics, bounds); + SelectObject(hdc, oldfont); DeleteObject(gdifont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b1d4616..7c53ced 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3350,9 +3350,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(102.499985, bounds.Width, 11.5); -todo_wine expectf_(31.968744, bounds.Height, 3.1); } else @@ -3372,9 +3370,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(76.875000, bounds.Width, 10.0); -todo_wine expectf_(23.976563, bounds.Height, 2.1); status = GdipSetPageUnit(graphics, UnitMillimeter); @@ -3391,9 +3387,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(27.119789, bounds.Width, 2.7); -todo_wine expectf_(8.458398, bounds.Height, 0.8); GdipDeleteStringFormat(format);

1 0