November 2012 - Wine-commits

Ken Thomases : opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 26670de2107ebe2c59711b52e74426acf96c85c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26670de2107ebe2c59711b52e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Nov 4 17:28:51 2012 -0600 opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl. --- dlls/opengl32/make_opengl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 0651904..bd230b2 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -821,7 +821,8 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; +print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;

1 0

Christian Costa : dmusic: Remove unused variables.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f7a9df5ecbc9d398d43ebda68ef99991cf2da3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a9df5ecbc9d398d43ebda68… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:45 2012 +0100 dmusic: Remove unused variables. --- dlls/dmusic/collection.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c1545b2..e4ac798 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -489,7 +489,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ ULARGE_INTEGER dlibCollectionPosition, dlibInstrumentPosition, dlibWavePoolPosition; @@ -689,8 +689,6 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case FOURCC_LIST: { IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID)); - ListSize[2] = chunk.dwSize - sizeof(FOURCC); - ListCount[2] = 0; switch (chunk.fccID) { default: { TRACE_(dmfile)(": unknown (skipping)\n");

1 0

Christian Costa : dmusic: Init port caps dwSize member before calling GetPortCaps.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f3e883878d8bfb6efc128293a461df8aa089e228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e883878d8bfb6efc128293a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:13 2012 +0100 dmusic: Init port caps dwSize member before calling GetPortCaps. --- dlls/dmusic/dmusic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index d914ce4..bdefe3a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -389,6 +389,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { + port->caps.dwSize = sizeof(port->caps); hr = IDirectMusicSynth8_GetPortCaps(synth, &port->caps); IDirectMusicSynth8_Release(synth); }

1 0

Christian Costa : d3dxof/tests: Pass level by value in process_data rather than a pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 6be32ec80c0a3561bb2705a6e3bc707de11adee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be32ec80c0a3561bb2705a6e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:47:06 2012 +0100 d3dxof/tests: Pass level by value in process_data rather than a pointer. --- dlls/d3dxof/tests/d3dxof.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9ff76b2..e25b4ab 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -613,7 +613,7 @@ static void test_syntax(void) * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 -static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) +static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) { HRESULT hr; char name[100]; @@ -636,7 +636,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); debugstr_guid(str_clsid, &clsid); debugstr_guid(str_clsid_type, clsid_type); @@ -657,7 +657,9 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) } printf("\n"); } - (*plevel)++; + + level++; + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(lpDirectXFileData, &pChildObj))) { LPDIRECTXFILEDATA p1; @@ -668,17 +670,17 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileData, (void **) &p1); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data (%d)\n", j); - process_data(p1, plevel); + process_data(p1, level); IDirectXFileData_Release(p1); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileDataReference, (void **) &p2); if (SUCCEEDED(hr)) { LPDIRECTXFILEDATA pfdo; - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); #if 0 @@ -688,21 +690,21 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); #endif IDirectXFileDataReference_Resolve(p2, &pfdo); - process_data(pfdo, plevel); + process_data(pfdo, level); IDirectXFileData_Release(pfdo); IDirectXFileDataReference_Release(p2); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileBinary, (void **) &p3); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } IDirectXFileObject_Release(pChildObj); } - (*plevel)--; + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } @@ -761,9 +763,8 @@ static void test_dump(void) while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) { - int level = 0; printf("\n"); - process_data(lpDirectXFileData, &level); + process_data(lpDirectXFileData, 0); IDirectXFileData_Release(lpDirectXFileData); } ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr);

1 0

Frédéric Delanoy : msvfw32: Fix a leak (coverity) .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 86544ce98f90cbd8ef504ea63c0bf50063bf7364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86544ce98f90cbd8ef504ea63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 2 23:49:29 2012 +0100 msvfw32: Fix a leak (coverity). --- dlls/msvfw32/msvideo_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index f27d3ec..f418481 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1512,7 +1512,10 @@ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode) fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); if (fnGetFileName == NULL) + { + FreeLibrary(hComdlg32); return FALSE; + } /* FIXME: need to add OFN_ENABLEHOOK and our own handler */ ret = fnGetFileName(lpofn);

1 0

Detlef Riekenberg : winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 8a3211af4cdee3832514693a667c562c4aedfc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3211af4cdee3832514693a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:01:08 2012 +0100 winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option. --- dlls/winhttp/session.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3617b20..3889922 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -182,6 +182,9 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RECEIVE_TIMEOUT: session->recv_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: + FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

André Hentschel : d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7d1fa526e6b5e6588c819af7a4aa6f73ebaa4f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1fa526e6b5e6588c819af7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 18:06:03 2012 +0100 d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub. --- dlls/d3dx9_36/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 65adff1..d2bc4bc 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -301,7 +301,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ IDirect3D9 *d3d; HRESULT hr; - FIXME("(%p, %p, %p): stub\n", device, desc, font); + TRACE("(%p, %p, %p)\n", device, desc, font); if( !device || !desc || !font ) return D3DERR_INVALIDCALL;

1 0

Tatyana Fokina : ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 9d4fcaf2bbdb0ff148d623b78231441d73162086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4fcaf2bbdb0ff148d623b78… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Fri Nov 2 15:56:50 2012 +0400 ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath. --- dlls/ole32/compobj.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2019b41..9c92c32 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -967,16 +967,14 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, * * Reads a registry value and expands it when necessary */ -static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen) +static DWORD COM_RegReadPath(HKEY hkeyroot, WCHAR * dst, DWORD dstlen) { DWORD ret; - HKEY key; DWORD keytype; WCHAR src[MAX_PATH]; DWORD dwLength = dstlen * sizeof(WCHAR); - if((ret = RegOpenKeyExW(hkeyroot, keyname, 0, KEY_READ, &key)) == ERROR_SUCCESS) { - if( (ret = RegQueryValueExW(key, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { + if( (ret = RegQueryValueExW(hkeyroot, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { if (keytype == REG_EXPAND_SZ) { if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA; } else { @@ -992,9 +990,7 @@ static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *v } lstrcpynW(dst, src, dstlen); } - } - RegCloseKey (key); - } + } return ret; } @@ -1019,7 +1015,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(params->hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(params->hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2383,7 +2379,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -4299,7 +4295,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { WCHAR dllpath[MAX_PATH+1]; - if (COM_RegReadPath(hkey, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(hkey, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

Sam Edwards : opengl32: Implement wglUseFontOutlines curve smoothing.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 2a208bd2ad6442db9b02f3002defce3d9db455b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a208bd2ad6442db9b02f3002… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Thu Nov 1 16:39:47 2012 -0600 opengl32: Implement wglUseFontOutlines curve smoothing. --- dlls/opengl32/wgl.c | 222 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 173 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a208bd2ad6442db9b02f…

1 0

Alexandre Julliard : gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5c02c352d9df394fa97a45965c8d32ddcb1abcd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02c352d9df394fa97a45965… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:32:15 2012 +0100 gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point. --- dlls/gdi32/driver.c | 5 -- dlls/gdi32/font.c | 93 ++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 48 +++++++++++++++-------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 76 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 2ab0778..f5cadbe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -552,11 +552,6 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush return brush; } -static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) -{ - return 0; -} - static HPALETTE nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) { return palette; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 09ea1b7..b289fa9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -260,8 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; - static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) { static const WCHAR desktop[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -279,28 +277,6 @@ static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) return err; } -static enum smoothing get_default_smoothing( void ) -{ - static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; - DWORD type, err; - - /* FIXME: Ignoring FontSmoothing for now since this is - set to off by default in wine.inf */ - - err = get_desktop_value( smoothing_type, &type ); - if (err) return aa_smoothing; - - switch (type) - { - case 1: /* FE_FONTSMOOTHINGSTANDARD */ - return aa_smoothing; - case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ - return subpixel_smoothing; - } - - return aa_smoothing; -} - static UINT get_subpixel_orientation( void ) { static const WCHAR smoothing_orientation[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', @@ -321,39 +297,28 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) +static UINT get_default_smoothing( void ) { - enum smoothing smoothing; + static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; + DWORD type, err; - switch (lf->lfQuality) - { - case NONANTIALIASED_QUALITY: - return GGO_BITMAP; - case ANTIALIASED_QUALITY: - smoothing = aa_smoothing; - break; - case CLEARTYPE_QUALITY: - case CLEARTYPE_NATURAL_QUALITY: - smoothing = subpixel_smoothing; - break; - case DEFAULT_QUALITY: - case DRAFT_QUALITY: - case PROOF_QUALITY: - default: - smoothing = get_default_smoothing(); - } + /* FIXME: Ignoring FontSmoothing for now since this is + set to off by default in wine.inf */ - switch (smoothing) + err = get_desktop_value( smoothing_type, &type ); + if (err) return 0; + + switch (type) { - case subpixel_smoothing: - return get_subpixel_orientation(); - case aa_smoothing: + case 1: /* FE_FONTSMOOTHINGSTANDARD */ return GGO_GRAY4_BITMAP; - default: - return GGO_BITMAP; + case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ + return get_subpixel_orientation(); } + return 0; } + /*********************************************************************** * GdiGetCodePage (GDI32.@) */ @@ -697,6 +662,36 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) /*********************************************************************** + * nulldrv_SelectFont + */ +HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + LOGFONTW lf; + + if (*aa_flags) return 0; + + GetObjectW( font, sizeof(lf), &lf ); + switch (lf.lfQuality) + { + case NONANTIALIASED_QUALITY: + *aa_flags = GGO_BITMAP; + break; + case ANTIALIASED_QUALITY: + *aa_flags = GGO_GRAY4_BITMAP; + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + *aa_flags = get_subpixel_orientation(); + break; + default: + *aa_flags = get_default_smoothing(); + break; + } + return 0; +} + + +/*********************************************************************** * FONT_EnumInstance * * Note: plf is really an ENUMLOGFONTEXW, and ptm is a NEWTEXTMETRICEXW. diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c7b40..fcdcca9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4953,27 +4953,41 @@ found_face: done: if (ret) { - if (!*aa_flags) *aa_flags = ret->aa_flags; - if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); - /* fixup the antialiasing flags for that font */ - switch (*aa_flags) + switch (lf.lfQuality) { - case WINE_GGO_HRGB_BITMAP: - case WINE_GGO_HBGR_BITMAP: - case WINE_GGO_VRGB_BITMAP: - case WINE_GGO_VBGR_BITMAP: - if (is_subpixel_rendering_enabled()) break; - *aa_flags = GGO_GRAY4_BITMAP; - /* fall through */ - case GGO_GRAY4_BITMAP: - if (is_hinting_enabled()) + case NONANTIALIASED_QUALITY: + case ANTIALIASED_QUALITY: + next->funcs->pSelectFont( dev, hfont, aa_flags ); + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + default: + if (!*aa_flags) *aa_flags = ret->aa_flags; + next->funcs->pSelectFont( dev, hfont, aa_flags ); + + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) { - WORD gasp_flags; - if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - *aa_flags = GGO_BITMAP; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } } - break; } dc->gdiFont = ret; physdev->font = ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 084245e..e3fe577 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,9 +278,6 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; -/* font.c */ -extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; - /* freetype.c */ /* Undocumented structure filled in by GdiRealizationInfo */ @@ -394,6 +391,7 @@ extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *ggo_flags ) DECLSPEC_HIDDEN; extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, INT x_src, INT y_src, UINT start, UINT lines, const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;

1 0