October 2011 - Wine-commits

Jacek Caban : vbscript: Fixed local variable count calculation.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 851856af67accf8cb901ec8252f83661b96290c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851856af67accf8cb901ec825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 24 12:30:48 2011 +0200 vbscript: Fixed local variable count calculation. --- dlls/vbscript/compile.c | 2 +- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 153e9b0..9b3f3e6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -746,6 +746,7 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return E_FAIL; } + ctx->func->var_cnt++; if(!dim_decl->next) break; dim_decl = dim_decl->next; @@ -753,7 +754,6 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) dim_decl->next = ctx->dim_decls; ctx->dim_decls = stat->dim_decls; - ctx->func->var_cnt++; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ec552b1..0025d69 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -470,6 +470,7 @@ Sub TestSubLocalVal x = false Call ok(not x, "local x is not false?") Dim x + Dim a,b, c End Sub x = true

1 0

Alexandre Julliard : mmdevapi/tests: Don't crash on test failure.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 6c68319863ee68f97e113d291b1501d15b5d095a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c68319863ee68f97e113d291… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 14:28:08 2011 +0200 mmdevapi/tests: Don't crash on test failure. --- dlls/mmdevapi/tests/render.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 494c00d..ff0aa62 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -719,6 +719,7 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac1); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) return; hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); @@ -730,6 +731,11 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac2); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) + { + IAudioClient_Release(ses1_ac1); + return; + } hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid);

1 0

Piotr Caban : msxml3: Don't report fatal errors many times.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: f8112cc548ec77719ac56e84ed25b6443645c649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8112cc548ec77719ac56e84e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:54:47 2011 +0200 msxml3: Don't report fatal errors many times. --- dlls/msxml3/saxreader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0be595c..b2c3f25 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1458,6 +1458,9 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; + if(This->ret != S_OK) + return; + va_start(args, msg); vsprintf(message, msg, args); va_end(args);

1 0

Piotr Caban : msxml3: Return parser result in detach_url.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 41eba1c30ddd4050fa8064a205c84418a3d31859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41eba1c30ddd4050fa8064a20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:00 2011 +0200 msxml3: Return parser result in detach_url. --- dlls/msxml3/bsc.c | 11 +++++++++-- dlls/msxml3/domdoc.c | 7 +++++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/saxreader.c | 4 +--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 9a8be97..a0b9022 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -53,6 +53,7 @@ struct bsc_t { IBinding *binding; IStream *memstream; + HRESULT hres; }; static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -173,7 +174,7 @@ static HRESULT WINAPI bsc_OnStopBinding( DWORD len = GlobalSize(hglobal); char *ptr = GlobalLock(hglobal); - hr = This->onDataAvailable(This->obj, ptr, len); + This->hres = hr = This->onDataAvailable(This->obj, ptr, len); GlobalUnlock(hglobal); } @@ -281,6 +282,7 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi bsc->onDataAvailable = onDataAvailable; bsc->binding = NULL; bsc->memstream = NULL; + bsc->hres = S_OK; hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if(SUCCEEDED(hr)) @@ -309,11 +311,16 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi return hr; } -void detach_bsc(bsc_t *bsc) +HRESULT detach_bsc(bsc_t *bsc) { + HRESULT hres; + if(bsc->binding) IBinding_Abort(bsc->binding); bsc->obj = NULL; + hres = bsc->hres; IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); + + return hres; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 144648e..24df895 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2075,8 +2075,11 @@ static HRESULT doread( domdoc *This, LPWSTR filename ) if(FAILED(hr)) return hr; - if(This->bsc) - detach_bsc(This->bsc); + if(This->bsc) { + hr = detach_bsc(This->bsc); + if(FAILED(hr)) + return hr; + } This->bsc = bsc; return S_OK; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b9ec423..3e057bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -467,7 +467,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; HRESULT bind_url(LPCWSTR, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; -void detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b2c3f25..fe78375 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2298,9 +2298,7 @@ static HRESULT internal_parseURL( if(FAILED(hr)) return hr; - detach_bsc(bsc); - - return S_OK; + return detach_bsc(bsc); } static HRESULT internal_putProperty(

1 0

Piotr Caban : msxml3: Prefer to report msxml error over libxml parsing error.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 6927a11eabe50c911d4d7ac943fda5c797be555d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6927a11eabe50c911d4d7ac94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:13 2011 +0200 msxml3: Prefer to report msxml error over libxml parsing error. --- dlls/msxml3/saxreader.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fe78375..45f7e909 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1458,8 +1458,10 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if(This->ret != S_OK) + if(This->ret != S_OK) { + xmlStopParser(This->pParserCtxt); return; + } va_start(args, msg); vsprintf(message, msg, args); @@ -1966,8 +1968,10 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz locator->pParserCtxt->userData = locator; This->isParsing = TRUE; - if(xmlParseDocument(locator->pParserCtxt) == -1) hr = E_FAIL; - else hr = locator->ret; + if(xmlParseDocument(locator->pParserCtxt)==-1 && locator->ret==S_OK) + hr = E_FAIL; + else + hr = locator->ret; This->isParsing = FALSE; if(locator->pParserCtxt) @@ -2010,7 +2014,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt if(dataRead != sizeof(data)) { ret = xmlParseChunk(locator->pParserCtxt, data, 0, 1); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; } else { @@ -2021,14 +2025,14 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt if (FAILED(hr)) break; ret = xmlParseChunk(locator->pParserCtxt, data, dataRead, 0); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; if (hr != S_OK) break; if (dataRead != sizeof(data)) { ret = xmlParseChunk(locator->pParserCtxt, data, 0, 1); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; break; } }

1 0

Piotr Caban : msxml3/tests: Added saxreader error handling test.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 5eb6994dc2e3bf48f1b6d3b25feec430b4a27afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb6994dc2e3bf48f1b6d3b25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:22 2011 +0200 msxml3/tests: Added saxreader error handling test. --- dlls/msxml3/tests/saxreader.c | 70 +++++++++++++++++++++++++++------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c52e03b..e1c20cc 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -81,7 +81,10 @@ typedef enum _CH { CH_CHARACTERS, CH_IGNORABLEWHITESPACE, CH_PROCESSINGINSTRUCTION, - CH_SKIPPEDENTITY + CH_SKIPPEDENTITY, + EH_ERROR, + EH_FATALERROR, + EG_IGNORABLEWARNING } CH; static const WCHAR szSimpleXML[] = { @@ -125,6 +128,7 @@ typedef struct _contenthandlercheck { const char *arg1; const char *arg2; const char *arg3; + HRESULT ret; } content_handler_test; static content_handler_test contentHandlerTest1[] = { @@ -165,6 +169,19 @@ static content_handler_test contentHandlerTest2[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTestError[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, NULL, NULL, NULL, E_FAIL }, + { EH_FATALERROR, 0, 0, NULL, NULL, NULL, E_FAIL }, + { CH_ENDTEST } +}; + +static content_handler_test contentHandlerTestCallbackResults[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, NULL, NULL, NULL, S_FALSE }, + { CH_STARTDOCUMENT, 0, 0, NULL, NULL, NULL, S_FALSE }, + { EH_FATALERROR, 0, 0, NULL, NULL, NULL, S_FALSE }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; @@ -248,8 +265,7 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( locator = pLocator; test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startDocument( @@ -260,8 +276,7 @@ static HRESULT WINAPI contentHandler_startDocument( test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endDocument( @@ -272,8 +287,7 @@ static HRESULT WINAPI contentHandler_endDocument( test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startPrefixMapping( @@ -290,8 +304,7 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( test_saxstr(__LINE__, pUri, nUri, expectCall->arg2); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endPrefixMapping( @@ -305,8 +318,7 @@ static HRESULT WINAPI contentHandler_endPrefixMapping( test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startElement( @@ -327,8 +339,7 @@ static HRESULT WINAPI contentHandler_startElement( test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endElement( @@ -348,8 +359,7 @@ static HRESULT WINAPI contentHandler_endElement( test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_characters( @@ -363,8 +373,7 @@ static HRESULT WINAPI contentHandler_characters( test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_ignorableWhitespace( @@ -378,8 +387,7 @@ static HRESULT WINAPI contentHandler_ignorableWhitespace( test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_processingInstruction( @@ -396,8 +404,7 @@ static HRESULT WINAPI contentHandler_processingInstruction( test_saxstr(__LINE__, pData, nData, expectCall->arg2); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_skippedEntity( @@ -411,8 +418,7 @@ static HRESULT WINAPI contentHandler_skippedEntity( test_saxstr(__LINE__, pName, nName, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } @@ -473,6 +479,7 @@ static HRESULT WINAPI isaxerrorHandler_error( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + ok(0, "unexpected call\n"); return S_OK; } @@ -482,6 +489,12 @@ static HRESULT WINAPI isaxerrorHandler_fatalError( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + if(!test_expect_call(EH_FATALERROR)) + return E_FAIL; + + ok(hrErrorCode == expectCall->ret, "hrErrorCode = %x, expected %x\n", hrErrorCode, expectCall->ret); + + expectCall++; return S_OK; } @@ -491,6 +504,7 @@ static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + ok(0, "unexpected call\n"); return S_OK; } @@ -1141,6 +1155,16 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + expectCall = contentHandlerTestError; + hr = ISAXXMLReader_parseURL(reader, testXmlW); + ok(hr == E_FAIL, "Expected E_FAIL, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + expectCall = contentHandlerTestCallbackResults; + hr = ISAXXMLReader_parseURL(reader, testXmlW); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + DeleteFileA(testXmlA); hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER,

1 0

Marcus Meissner : winex11.drv: WORD and BYTE swapped in 555-> 1 bit converter (Coverity).
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 0101149c7a28f0863b3f5a8e0faa2913ccede6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0101149c7a28f0863b3f5a8e0… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 24 07:51:30 2011 +0200 winex11.drv: WORD and BYTE swapped in 555->1 bit converter (Coverity). --- dlls/winex11.drv/dib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index a1ce9bb..b70dcfa 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -594,12 +594,13 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, } else if (bmpImage->blue_mask==0x7c00) { /* ==== bgr 555 bmp -> pal 1 dib ==== */ for (h=0; h<lines; h++) { - WORD dstval; + BYTE dstval; srcpixel=srcbits; dstbyte=dstbits; dstval=0; for (x=0; x<width; x++) { - BYTE srcval; + WORD srcval; + srcval=*srcpixel++; dstval|=(X11DRV_DIB_GetNearestIndex (colors, 2,

1 0

Alexandre Julliard : gdi32: Add a few helper functions for computing font metrics.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: ca4177997c01d69795cabbc5a8dccb4122b08ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4177997c01d69795cabbc5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:09:33 2011 +0200 gdi32: Add a few helper functions for computing font metrics. --- dlls/gdi32/freetype.c | 192 ++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca4177997c01d69795cab…

1 0

Alexandre Julliard : gdi32: Implement GetTextMetrics as a standard driver entry point.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 20070d0838e5b28a75a64a1a26ef3eef14eeb80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20070d0838e5b28a75a64a1a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:12:23 2011 +0200 gdi32: Implement GetTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 10 +++------- dlls/gdi32/freetype.c | 22 +++++++++++----------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d08ba4b..9770f1e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1222,17 +1222,13 @@ BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) */ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) { + PHYSDEV physdev; BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if (dc->gdiFont) - ret = WineEngGetTextMetrics(dc->gdiFont, metrics); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); - } + physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); if (ret) { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad20bf8..a2b57eb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6209,16 +6209,22 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, } /************************************************************* - * WineEngGetTextMetrics - * + * freetype_GetTextMetrics */ -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) +static BOOL freetype_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); BOOL ret; + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); + return dev->funcs->pGetTextMetrics( dev, metrics ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_text_metrics( font, ptm ); + ret = get_text_metrics( physdev->font, metrics ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7089,7 +7095,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextMetrics */ + freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ NULL, /* pLineTo */ @@ -7196,12 +7202,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, return GDI_ERROR; } -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, OUTLINETEXTMETRICW *potm) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ad7b049..51fbf2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -312,7 +312,6 @@ extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) D extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the device parameter to SetupForBlit() const.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 284ba950ef164dce77d86637ac75f50012e7dd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284ba950ef164dce77d86637a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:24:01 2011 +0200 wined3d: Make the device parameter to SetupForBlit() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2742b54..66460d9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1717,7 +1717,7 @@ static inline void set_blit_dimension(UINT width, UINT height) { * *****************************************************************************/ /* Context activation is done by the caller. */ -static void SetupForBlit(struct wined3d_device *device, struct wined3d_context *context) +static void SetupForBlit(const struct wined3d_device *device, struct wined3d_context *context) { int i; const struct wined3d_gl_info *gl_info = context->gl_info;

1 0