October 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the device parameter to context_setup_target().
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 89d0d3ffd8dc0e1bb8eddb69281269a04d120c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d0d3ffd8dc0e1bb8eddb692… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:28 2011 +0200 wined3d: Get rid of the device parameter to context_setup_target(). --- dlls/wined3d/context.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1def817..f11b8db 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2402,8 +2402,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de return TRUE; } -static void context_setup_target(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *target) +static void context_setup_target(struct wined3d_context *context, struct wined3d_surface *target) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; @@ -2507,7 +2506,7 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi } context_update_window(context); - context_setup_target(device, context, target); + context_setup_target(context, target); context_enter(context); if (!context->valid) return context;

1 0

Alex Henrie : kernel32: Output message to stderr in current Unix codepage.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 3aff781f63fd7d61e6f42898dc88ef1eaaed9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aff781f63fd7d61e6f42898d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 25 16:16:21 2011 -0600 kernel32: Output message to stderr in current Unix codepage. Fixes a bug in which the command "wine /." outputs a garbled error message in languages other than English. Supersedes "kernel32: Output message to stderr in UTF-8" --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6d42696..b6c0b9d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1252,7 +1252,7 @@ void CDECL __wine_kernel_init(void) args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); - WideCharToMultiByte( CP_ACP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); + WideCharToMultiByte( CP_UNIXCP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); MESSAGE( "wine: %s", msg ); ExitProcess( error ); }

1 0

Bruno Jesus : shell32: Don' t parse command line if numargs is NULL in CommandLineToArgvW.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: f621f8ea787df007b55e4369563502eb69cc421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f621f8ea787df007b55e43695… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 25 23:35:13 2011 -0200 shell32: Don't parse command line if numargs is NULL in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 12 ++++++++---- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 981a245..2561f8c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -92,6 +92,12 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LPWSTR cmdline; int in_quotes,bcount; + if(!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (*lpCmdline==0) { /* Return the path to the executable */ @@ -113,8 +119,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); - if (numargs) - *numargs=1; + *numargs=1; return argv; } @@ -228,8 +233,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) *d='\0'; argv[argc++]=arg; } - if (numargs) - *numargs=argc; + *numargs=argc; return argv; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5542ea5..1c5fe7f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2157,6 +2157,7 @@ static void test_commandline(void) LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; size_t buflen; + DWORD lerror; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2171,6 +2172,15 @@ static void test_commandline(void) ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(cmdline,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(NULL,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + wsprintfW(cmdline,fmt2,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); ok(numargs == 5, "expected 5 args, got %i\n",numargs);

1 0

Matteo Bruni : wined3d: Refuse to create a shader unsupported by the backend.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 095a9a68937a04949a04d707f81fe7b3d75840b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095a9a68937a04949a04d707f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:47 2011 +0200 wined3d: Refuse to create a shader unsupported by the backend. --- dlls/d3d9/tests/shader.c | 22 ++++++++++++++++++++-- dlls/wined3d/device.c | 2 ++ dlls/wined3d/shader.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index f5a2bcb..ab05289 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -233,6 +233,14 @@ static void test_wrong_shader(IDirect3DDevice9 *device_ptr) 0x0000ffff /* END */ }; + const DWORD vs_3_0[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff /* end */ + }; + #if 0 float4 main(const float4 color : COLOR) : SV_TARGET { @@ -263,9 +271,10 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000000, }; - IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DVertexShader9 *vs = NULL; + IDirect3DPixelShader9 *ps = NULL; HRESULT hret; + D3DCAPS9 caps; hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_ps, &vs); ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); @@ -274,6 +283,15 @@ float4 main(const float4 color : COLOR) : SV_TARGET hret = IDirect3DDevice9_CreatePixelShader(device_ptr, ps_4_0, &ps); ok(hret == D3DERR_INVALIDCALL, "CreatePixelShader returned: hret 0x%x, shader_ptr %p.\n", hret, ps); + + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + if (caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, vs_3_0, &vs); + ok(hret == D3DERR_INVALIDCALL, "CreateVertexShader returned: hret 0x%x, shader_ptr %p.\n", hret, vs); + } + else + skip("This GPU supports SM3, skipping unsupported shader test.\n"); } START_TEST(shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5aace82..05a0ad8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5938,6 +5938,8 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (device->shader_backend) { device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->vshader_version = shader_caps.VertexShaderVersion; + device->pshader_version = shader_caps.PixelShaderVersion; device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; device->vs_clipping = shader_caps.VSClipping; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 69bd69d..50ecc2c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1559,6 +1559,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; HRESULT hr; + unsigned int backend_version; TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", shader, byte_code, output_signature, float_const_count); @@ -1602,6 +1603,24 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b WARN("Shader version %d not supported by this D3D API version.\n", reg_maps->shader_version.major); return WINED3DERR_INVALIDCALL; } + switch (type) + { + case WINED3D_SHADER_TYPE_VERTEX: + backend_version = shader->device->vshader_version; + break; + case WINED3D_SHADER_TYPE_PIXEL: + backend_version = shader->device->pshader_version; + break; + default: + FIXME("No backend version-checking for this shader type\n"); + backend_version = 0; + } + if (reg_maps->shader_version.major > backend_version) + { + WARN("Shader version %d.%d not supported by your GPU with the current shader backend.\n", + reg_maps->shader_version.major, reg_maps->shader_version.minor); + return WINED3DERR_INVALIDCALL; + } shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength); if (!shader->function) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b86580..9b510c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1668,6 +1668,7 @@ struct wined3d_device const struct blit_shader *blitter; unsigned int max_ffp_textures; + DWORD vshader_version, pshader_version; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping;

1 0

Alexandre Julliard : gdi32: Move internal path functions to the top of the file to avoid forward declarations .
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: ef34c47c4be511e4da4a824ce7b40739e4384dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef34c47c4be511e4da4a824ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 14:14:17 2011 +0200 gdi32: Move internal path functions to the top of the file to avoid forward declarations. --- dlls/gdi32/path.c | 746 +++++++++++++++++++++++++---------------------------- 1 files changed, 357 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef34c47c4be511e4da4a8…

1 0

Henri Verbeet : wined3d: Move the ARB shader program constant handling to the backend where it belongs .
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 7aac0159a995e35c96d30ffed19630c0320bfc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aac0159a995e35c96d30ffed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:29 2011 +0200 wined3d: Move the ARB shader program constant handling to the backend where it belongs. --- dlls/wined3d/arb_program_shader.c | 106 ++++++++++++++++++++++++++++--------- dlls/wined3d/context.c | 38 +------------- dlls/wined3d/device.c | 2 - dlls/wined3d/glsl_shader.c | 8 +-- dlls/wined3d/shader.c | 4 +- dlls/wined3d/wined3d_private.h | 8 +-- 6 files changed, 89 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aac0159a995e35c96d30…

1 0

Henri Verbeet : gdi32: Update the DC in ExtEscape().
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: aa7bbe1376535efc376a0c38083af25f47b3e6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7bbe1376535efc376a0c380… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:27 2011 +0200 gdi32: Update the DC in ExtEscape(). Specifically, X11DRV_FLUSH_GL_DRAWABLE needs correct clip rects. --- dlls/gdi32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ea15eab..db1d268 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1225,6 +1225,7 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtEscape ); + update_dc( dc ); ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); release_dc_ptr( dc ); }

1 0

Alexandre Julliard : gdi32: Implement GetKerningPairs as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 0c968201047ffe13054e2f3f1ee62eace252709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c968201047ffe13054e2f3f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:39:53 2011 +0200 gdi32: Implement GetKerningPairs as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/freetype.c | 33 +++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 26eba55..9859f3c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2664,7 +2664,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, LPKERNINGPAIR lpKerningPairs ) { DC *dc; - DWORD ret = 0; + DWORD ret; + PHYSDEV dev; TRACE("(%p,%d,%p)\n", hDC, cPairs, lpKerningPairs); @@ -2677,9 +2678,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, dc = get_dc_ptr(hDC); if (!dc) return 0; - if (dc->gdiFont) - ret = WineEngGetKerningPairs(dc->gdiFont, cPairs, lpKerningPairs); - + dev = GET_DC_PHYSDEV( dc, pGetKerningPairs ); + ret = dev->funcs->pGetKerningPairs( dev, cPairs, lpKerningPairs ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a98cf36..6d21cc9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6896,7 +6896,10 @@ static DWORD parse_format0_kern_subtable(GdiFont *font, return nPairs; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) +/************************************************************* + * freetype_GetKerningPairs + */ +static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *kern_pair ) { DWORD length; void *buf; @@ -6904,6 +6907,14 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair const struct TT_kern_subtable *tt_kern_subtable; USHORT i, nTables; USHORT *glyph_to_char; + GdiFont *font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!(font = physdev->font)) + { + dev = GET_NEXT_PHYSDEV( dev, pGetKerningPairs ); + return dev->funcs->pGetKerningPairs( dev, cPairs, kern_pair ); + } GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -6913,11 +6924,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } font->total_kern_pairs = 0; @@ -7038,11 +7049,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } static const struct gdi_dc_funcs freetype_funcs = @@ -7097,7 +7108,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetGlyphOutline, /* pGetGlyphOutline */ NULL, /* pGetICMProfile */ NULL, /* pGetImage */ - NULL, /* pGetKerningPairs */ + freetype_GetKerningPairs, /* pGetKerningPairs */ NULL, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetPixel */ @@ -7267,12 +7278,6 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) -{ - ERR("called but we don't have FreeType\n"); - return 0; -} - BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) { ERR("called but we don't have FreeType\n"); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d0727a2..5e685d3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; -extern DWORD WineEngGetKerningPairs(GdiFont*, DWORD, KERNINGPAIR *) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN; extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetOutlineTextMetrics as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: ce8d7b4601b00f75ecec28e69780fe29e147fdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8d7b4601b00f75ecec28e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:49:18 2011 +0200 gdi32: Implement GetOutlineTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 113 ++++++++++++++++++++-------------------------- dlls/gdi32/freetype.c | 36 +++++++-------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 66 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce8d7b4601b00f75ecec2…

1 0

Alexandre Julliard : gdi32: Implement GetTextCharsetInfo as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 1740f34ffbafc3f250a225ffbdb1d859726711d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1740f34ffbafc3f250a225ffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:55:16 2011 +0200 gdi32: Implement GetTextCharsetInfo as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 24 ++++++++++++++---------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5e55e31..38ad477 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -472,10 +472,7 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, static void update_font_code_page( DC *dc ) { CHARSETINFO csi; - int charset = DEFAULT_CHARSET; - - if (dc->gdiFont) - charset = WineEngGetTextCharsetInfo( dc->gdiFont, NULL, 0 ); + int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) @@ -3261,12 +3258,12 @@ UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) { UINT ret = DEFAULT_CHARSET; DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; if (dc) { - if (dc->gdiFont) - ret = WineEngGetTextCharsetInfo(dc->gdiFont, fs, flags); - + dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); + ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5d5e8a5..31f52b8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6602,10 +6602,20 @@ INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) return n; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) +/************************************************************* + * freetype_GetTextCharsetInfo + */ +static UINT freetype_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) { - if (fs) *fs = font->fs; - return font->charset; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextCharsetInfo ); + return dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); + } + if (fs) *fs = physdev->font->fs; + return physdev->font->charset; } BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) @@ -7119,7 +7129,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ - NULL, /* pGetTextCharsetInfo */ + freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ @@ -7249,12 +7259,6 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD return NULL; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) -{ - FIXME("(%p, %p, %u): stub\n", font, fs, flags); - return DEFAULT_CHARSET; -} - BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) { return FALSE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e9cad6..365d158 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -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 WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN;

1 0