September 2013 - Wine-Commits

Stefan Dösinger : wined3d: Pass position_transformed and gl_info to find_ps_compile_args.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: b4d8b52fa76b04d4af74b699345d75603690bc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d8b52fa76b04d4af74b6993… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 11 11:31:18 2013 +0200 wined3d: Pass position_transformed and gl_info to find_ps_compile_args. --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 5 +++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6ebd7fd..2972e19 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4521,12 +4521,13 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, const struct wined3d_context *context, const struct wined3d_shader *shader, struct arb_ps_compile_args *args) { + const struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_ps_compile_args(state, shader, &args->super); + find_ps_compile_args(state, shader, device->stream_info.position_transformed, &args->super, gl_info); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0bd1180..2413095 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5837,7 +5837,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ps_compile_args ps_compile_args; pshader = state->pixel_shader; - find_ps_compile_args(state, pshader, &ps_compile_args); + find_ps_compile_args(state, pshader, device->stream_info.position_transformed, &ps_compile_args, gl_info); ps_id = find_glsl_pshader(context, &priv->shader_buffer, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3eee934..fee9c77 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2025,11 +2025,9 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d return WINED3D_OK; } -void find_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct ps_compile_args *args) +void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_gl_info *gl_info) { - struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_texture *texture; UINT i; @@ -2158,7 +2156,7 @@ void find_ps_compile_args(const struct wined3d_state *state, } if (shader->reg_maps.shader_version.major >= 3) { - if (device->stream_info.position_transformed) + if (position_transformed) args->vp_mode = pretransformed; else if (use_vs(state)) args->vp_mode = vertexshader; @@ -2174,7 +2172,7 @@ void find_ps_compile_args(const struct wined3d_state *state, switch (state->render_states[WINED3D_RS_FOGTABLEMODE]) { case WINED3D_FOG_NONE: - if (device->stream_info.position_transformed || use_vs(state)) + if (position_transformed || use_vs(state)) { args->fog = WINED3D_FFP_PS_FOG_LINEAR; break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9cabceb..3548094 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2774,8 +2774,9 @@ struct wined3d_shader }; void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) DECLSPEC_HIDDEN; -void find_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN; +void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + BOOL position_transformed, struct ps_compile_args *args, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, WORD swizzle_map, struct vs_compile_args *args) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : rpcrt4: Don' t try to decode the authorization value in the first leg.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 057c98323e6d3ba5623d5a484b6fd0adcd8645b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=057c98323e6d3ba5623d5a484… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 11 13:49:40 2013 +0200 rpcrt4: Don't try to decode the authorization value in the first leg. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d89e5ad..e8bdd49 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2653,7 +2653,7 @@ static RPC_STATUS do_authorization(HINTERNET request, SEC_WCHAR *servername, in_desc.pBuffers = &in; p = auth_value + scheme_len; - if (*p == ' ') + if (!first && *p == ' ') { int len = strlenW(++p); in.cbBuffer = decode_base64(p, len, NULL);

1 0

Thomas Faber : ntdll/tests: Use correct prototype for RtlCreateUnicodeString[FromAsciiz].
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: d518ce7ea2060bcd4326f0e3367f070729002031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d518ce7ea2060bcd4326f0e33… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Sep 10 23:56:51 2013 +0200 ntdll/tests: Use correct prototype for RtlCreateUnicodeString[FromAsciiz]. --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c101a2e..ca84399 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -26,7 +26,7 @@ #include "stdlib.h" static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); -static NTSTATUS (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 076948e..1594665 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -115,7 +115,7 @@ typedef enum _KEY_VALUE_INFORMATION_CLASS { #endif -static NTSTATUS (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static BOOLEAN (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static void (WINAPI * pRtlInitUnicodeString)(PUNICODE_STRING,PCWSTR); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); @@ -134,7 +134,7 @@ static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); -static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); +static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); static NTSTATUS (WINAPI * pRtlUnicodeStringToAnsiString)(PSTRING, PUNICODE_STRING, BOOL);

1 0

Henri Verbeet : ddraw: Get rid of get_config_key().
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 9ccced6f411e69cf1e68a52955fc94d31c272931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccced6f411e69cf1e68a5295… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:50 2013 +0200 ddraw: Get rid of get_config_key(). --- dlls/ddraw/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 8e7b098..61b2586 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -819,19 +819,6 @@ DestroyCallback(IDirectDrawSurface7 *surf, } /*********************************************************************** - * get_config_key - * - * Reads a config key from the registry. Taken from WineD3D - * - ***********************************************************************/ -static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) -{ - if (0 != appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - if (0 != defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - return ERROR_FILE_NOT_FOUND; -} - -/*********************************************************************** * DllMain (DDRAW.0) * * Could be used to register DirectDraw drivers, if we have more than

1 0

Alexandre Julliard : gdi32: Add a check for overflow in DIB dimensions.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 69abf20fcdbd34cdc80af6a2edc0ea2d59b604b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69abf20fcdbd34cdc80af6a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 11 17:30:46 2013 +0200 gdi32: Add a check for overflow in DIB dimensions. --- dlls/gdi32/dib.c | 5 +++++ dlls/gdi32/tests/bitmap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ad2a4dc..adf29ea 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -128,6 +128,11 @@ static BOOL is_valid_dib_format( const BITMAPINFOHEADER *info, BOOL allow_compre if (!info->biPlanes) return FALSE; + /* check for size overflow */ + if (!info->biBitCount) return FALSE; + if (UINT_MAX / info->biBitCount < info->biWidth) return FALSE; + if (UINT_MAX / get_dib_stride( info->biWidth, info->biBitCount ) < abs( info->biHeight )) return FALSE; + switch (info->biBitCount) { case 1: diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f72574a..6b52356 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1207,6 +1207,49 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+2); ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+2\n" ); + bi->bmiHeader.biWidth = 0x4000; + bi->bmiHeader.biHeight = 0x4000; + bi->bmiHeader.biBitCount = 1; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib != NULL, "CreateDIBSection failed with large size\n" ); + DeleteObject( hdib ); + + bi->bmiHeader.biWidth = 0x8001; + bi->bmiHeader.biHeight = 0x8001; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + + bi->bmiHeader.biWidth = 1; + bi->bmiHeader.biHeight = 0x40000001; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + + bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biHeight = 0x40000001; + bi->bmiHeader.biBitCount = 16; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + + bi->bmiHeader.biWidth = 0x40000001; + bi->bmiHeader.biHeight = 1; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + + bi->bmiHeader.biWidth = 0x40000001; + bi->bmiHeader.biHeight = 4; + bi->bmiHeader.biBitCount = 8; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteDC( memdc ); DeleteObject( hbmp ); ReleaseDC( 0, hdc );

1 0

Stefan Dösinger : wined3d: Pass the swizzle map to find_vs_compile_args.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: dfeee9077cd0965d1f7a804b4bb156c11fe7aaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfeee9077cd0965d1f7a804b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 11 11:31:17 2013 +0200 wined3d: Pass the swizzle map to find_vs_compile_args. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05f7557..6ebd7fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4584,7 +4584,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, int i; WORD int_skip; - find_vs_compile_args(state, shader, &args->super); + find_vs_compile_args(state, shader, device->stream_info.swizzle_map, &args->super); args->clip.boolclip_compare = 0; if (use_ps(state)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37661d3..0bd1180 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5807,7 +5807,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct vs_compile_args vs_compile_args; vshader = state->vertex_shader; - find_vs_compile_args(state, vshader, &vs_compile_args); + find_vs_compile_args(state, vshader, device->stream_info.swizzle_map, &vs_compile_args); vs_id = find_glsl_vshader(context, &priv->shader_buffer, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2948aa9..3eee934 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1817,14 +1817,14 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) { args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - args->swizzle_map = shader->device->stream_info.swizzle_map; + args->swizzle_map = swizzle_map; } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6753ad3..9cabceb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2777,8 +2777,8 @@ void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN; -void find_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct vs_compile_args *args) DECLSPEC_HIDDEN; +void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, + WORD swizzle_map, struct vs_compile_args *args) DECLSPEC_HIDDEN; void shader_buffer_clear(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN; BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : rpcrt4: Don' t remove the authorization header if the scheme is Basic.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 6f2c4bac58dc6fa2d5217b4753a658cd69ac1ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2c4bac58dc6fa2d5217b475… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 11 13:49:05 2013 +0200 rpcrt4: Don't remove the authorization header if the scheme is Basic. --- dlls/rpcrt4/rpc_transport.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c68f141..d89e5ad 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2803,7 +2803,9 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request drain_content(request); } - HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) + HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + destroy_authinfo(info); return status; }

1 0

Henri Verbeet : ddraw: Avoid LPBYTE.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 73a0327487a9cc5ee3a92c74da8d8a120fb7a0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a0327487a9cc5ee3a92c74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:52 2013 +0200 ddraw: Avoid LPBYTE. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 575c58f..44933d3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -306,7 +306,7 @@ struct d3d_device DWORD vertex_type; DWORD render_flags; DWORD nb_vertices; - LPBYTE sysmem_vertex_buffer; + BYTE *sysmem_vertex_buffer; DWORD vertex_size; DWORD buffer_size; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0c6b88e..79033fc 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -860,7 +860,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) DWORD type, data, size; size = sizeof(data); - if (!RegQueryValueExA( hkey, "ForceRefreshRate", NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + if (!RegQueryValueExA(hkey, "ForceRefreshRate", NULL, &type, (BYTE *)&data, &size) && type == REG_DWORD) { TRACE("ForceRefreshRate set; overriding refresh rate to %d Hz\n", data); force_refresh_rate = data;

1 0

Alexandre Julliard : gdi32: Add more helpers for converting font sizes to logical coordinates.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 08e82d4686f58c9a270c53c5dd35cb74d3bec311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e82d4686f58c9a270c53c5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 11 18:31:01 2013 +0200 gdi32: Add more helpers for converting font sizes to logical coordinates. --- dlls/gdi32/font.c | 119 ++++++++++++++++++++++++---------------------------- 1 files changed, 55 insertions(+), 64 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9e516be..68b2713 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -69,6 +69,18 @@ static inline INT INTERNAL_YDSTOWS(DC *dc, INT height) return GDI_ROUND(floatHeight); } +/* scale width and height but don't mirror them */ + +static inline INT width_to_LP( DC *dc, INT width ) +{ + return GDI_ROUND( (double)width * fabs( dc->xformVport2World.eM11 )); +} + +static inline INT height_to_LP( DC *dc, INT height ) +{ + return GDI_ROUND( (double)height * fabs( dc->xformVport2World.eM22 )); +} + static inline INT INTERNAL_XWSTODS(DC *dc, INT width) { POINT pt[2]; @@ -1372,26 +1384,17 @@ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) metrics->tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); metrics->tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); - -#define WDPTOLP(x) ((x<0)? \ - (-abs(INTERNAL_XDSTOWS(dc, (x)))): \ - (abs(INTERNAL_XDSTOWS(dc, (x))))) -#define HDPTOLP(y) ((y<0)? \ - (-abs(INTERNAL_YDSTOWS(dc, (y)))): \ - (abs(INTERNAL_YDSTOWS(dc, (y))))) - - metrics->tmHeight = HDPTOLP(metrics->tmHeight); - metrics->tmAscent = HDPTOLP(metrics->tmAscent); - metrics->tmDescent = HDPTOLP(metrics->tmDescent); - metrics->tmInternalLeading = HDPTOLP(metrics->tmInternalLeading); - metrics->tmExternalLeading = HDPTOLP(metrics->tmExternalLeading); - metrics->tmAveCharWidth = WDPTOLP(metrics->tmAveCharWidth); - metrics->tmMaxCharWidth = WDPTOLP(metrics->tmMaxCharWidth); - metrics->tmOverhang = WDPTOLP(metrics->tmOverhang); + metrics->tmHeight = height_to_LP( dc, metrics->tmHeight ); + metrics->tmAscent = height_to_LP( dc, metrics->tmAscent ); + metrics->tmDescent = height_to_LP( dc, metrics->tmDescent ); + metrics->tmInternalLeading = height_to_LP( dc, metrics->tmInternalLeading ); + metrics->tmExternalLeading = height_to_LP( dc, metrics->tmExternalLeading ); + metrics->tmAveCharWidth = width_to_LP( dc, metrics->tmAveCharWidth ); + metrics->tmMaxCharWidth = width_to_LP( dc, metrics->tmMaxCharWidth ); + metrics->tmOverhang = width_to_LP( dc, metrics->tmOverhang ); ret = TRUE; -#undef WDPTOLP -#undef HDPTOLP - TRACE("text metrics:\n" + + TRACE("text metrics:\n" " Weight = %03i\t FirstChar = %i\t AveCharWidth = %i\n" " Italic = % 3i\t LastChar = %i\t\t MaxCharWidth = %i\n" " UnderLined = %01i\t DefaultChar = %i\t Overhang = %i\n" @@ -1622,46 +1625,38 @@ UINT WINAPI GetOutlineTextMetricsW( { output->otmTextMetrics.tmDigitizedAspectX = GetDeviceCaps(hdc, LOGPIXELSX); output->otmTextMetrics.tmDigitizedAspectY = GetDeviceCaps(hdc, LOGPIXELSY); - -#define WDPTOLP(x) ((x<0)? \ - (-abs(INTERNAL_XDSTOWS(dc, (x)))): \ - (abs(INTERNAL_XDSTOWS(dc, (x))))) -#define HDPTOLP(y) ((y<0)? \ - (-abs(INTERNAL_YDSTOWS(dc, (y)))): \ - (abs(INTERNAL_YDSTOWS(dc, (y))))) - - output->otmTextMetrics.tmHeight = HDPTOLP(output->otmTextMetrics.tmHeight); - output->otmTextMetrics.tmAscent = HDPTOLP(output->otmTextMetrics.tmAscent); - output->otmTextMetrics.tmDescent = HDPTOLP(output->otmTextMetrics.tmDescent); - output->otmTextMetrics.tmInternalLeading = HDPTOLP(output->otmTextMetrics.tmInternalLeading); - output->otmTextMetrics.tmExternalLeading = HDPTOLP(output->otmTextMetrics.tmExternalLeading); - output->otmTextMetrics.tmAveCharWidth = WDPTOLP(output->otmTextMetrics.tmAveCharWidth); - output->otmTextMetrics.tmMaxCharWidth = WDPTOLP(output->otmTextMetrics.tmMaxCharWidth); - output->otmTextMetrics.tmOverhang = WDPTOLP(output->otmTextMetrics.tmOverhang); - output->otmAscent = HDPTOLP(output->otmAscent); - output->otmDescent = HDPTOLP(output->otmDescent); - output->otmLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmLineGap)); - output->otmsCapEmHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsCapEmHeight)); - output->otmsXHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsXHeight)); - output->otmrcFontBox.top = HDPTOLP(output->otmrcFontBox.top); - output->otmrcFontBox.bottom = HDPTOLP(output->otmrcFontBox.bottom); - output->otmrcFontBox.left = WDPTOLP(output->otmrcFontBox.left); - output->otmrcFontBox.right = WDPTOLP(output->otmrcFontBox.right); - output->otmMacAscent = HDPTOLP(output->otmMacAscent); - output->otmMacDescent = HDPTOLP(output->otmMacDescent); - output->otmMacLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmMacLineGap)); - output->otmptSubscriptSize.x = WDPTOLP(output->otmptSubscriptSize.x); - output->otmptSubscriptSize.y = HDPTOLP(output->otmptSubscriptSize.y); - output->otmptSubscriptOffset.x = WDPTOLP(output->otmptSubscriptOffset.x); - output->otmptSubscriptOffset.y = HDPTOLP(output->otmptSubscriptOffset.y); - output->otmptSuperscriptSize.x = WDPTOLP(output->otmptSuperscriptSize.x); - output->otmptSuperscriptSize.y = HDPTOLP(output->otmptSuperscriptSize.y); - output->otmptSuperscriptOffset.x = WDPTOLP(output->otmptSuperscriptOffset.x); - output->otmptSuperscriptOffset.y = HDPTOLP(output->otmptSuperscriptOffset.y); - output->otmsStrikeoutSize = abs(INTERNAL_YDSTOWS(dc,output->otmsStrikeoutSize)); - output->otmsStrikeoutPosition = HDPTOLP(output->otmsStrikeoutPosition); - output->otmsUnderscoreSize = HDPTOLP(output->otmsUnderscoreSize); - output->otmsUnderscorePosition = HDPTOLP(output->otmsUnderscorePosition); + output->otmTextMetrics.tmHeight = height_to_LP( dc, output->otmTextMetrics.tmHeight ); + output->otmTextMetrics.tmAscent = height_to_LP( dc, output->otmTextMetrics.tmAscent ); + output->otmTextMetrics.tmDescent = height_to_LP( dc, output->otmTextMetrics.tmDescent ); + output->otmTextMetrics.tmInternalLeading = height_to_LP( dc, output->otmTextMetrics.tmInternalLeading ); + output->otmTextMetrics.tmExternalLeading = height_to_LP( dc, output->otmTextMetrics.tmExternalLeading ); + output->otmTextMetrics.tmAveCharWidth = width_to_LP( dc, output->otmTextMetrics.tmAveCharWidth ); + output->otmTextMetrics.tmMaxCharWidth = width_to_LP( dc, output->otmTextMetrics.tmMaxCharWidth ); + output->otmTextMetrics.tmOverhang = width_to_LP( dc, output->otmTextMetrics.tmOverhang ); + output->otmAscent = height_to_LP( dc, output->otmAscent); + output->otmDescent = height_to_LP( dc, output->otmDescent); + output->otmLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmLineGap)); + output->otmsCapEmHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsCapEmHeight)); + output->otmsXHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsXHeight)); + output->otmrcFontBox.top = height_to_LP( dc, output->otmrcFontBox.top); + output->otmrcFontBox.bottom = height_to_LP( dc, output->otmrcFontBox.bottom); + output->otmrcFontBox.left = width_to_LP( dc, output->otmrcFontBox.left); + output->otmrcFontBox.right = width_to_LP( dc, output->otmrcFontBox.right); + output->otmMacAscent = height_to_LP( dc, output->otmMacAscent); + output->otmMacDescent = height_to_LP( dc, output->otmMacDescent); + output->otmMacLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmMacLineGap)); + output->otmptSubscriptSize.x = width_to_LP( dc, output->otmptSubscriptSize.x); + output->otmptSubscriptSize.y = height_to_LP( dc, output->otmptSubscriptSize.y); + output->otmptSubscriptOffset.x = width_to_LP( dc, output->otmptSubscriptOffset.x); + output->otmptSubscriptOffset.y = height_to_LP( dc, output->otmptSubscriptOffset.y); + output->otmptSuperscriptSize.x = width_to_LP( dc, output->otmptSuperscriptSize.x); + output->otmptSuperscriptSize.y = height_to_LP( dc, output->otmptSuperscriptSize.y); + output->otmptSuperscriptOffset.x = width_to_LP( dc, output->otmptSuperscriptOffset.x); + output->otmptSuperscriptOffset.y = height_to_LP( dc, output->otmptSuperscriptOffset.y); + output->otmsStrikeoutSize = abs(INTERNAL_YDSTOWS(dc,output->otmsStrikeoutSize)); + output->otmsStrikeoutPosition = height_to_LP( dc, output->otmsStrikeoutPosition); + output->otmsUnderscoreSize = height_to_LP( dc, output->otmsUnderscoreSize); + output->otmsUnderscorePosition = height_to_LP( dc, output->otmsUnderscorePosition); #undef WDPTOLP #undef HDPTOLP if(output != lpOTM) @@ -1748,13 +1743,9 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, if (ret) { -#define WDPTOLP(x) ((x<0)? \ - (-abs(INTERNAL_XDSTOWS(dc, (x)))): \ - (abs(INTERNAL_XDSTOWS(dc, (x))))) /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) - *buffer = WDPTOLP(*buffer); -#undef WDPTOLP + *buffer = width_to_LP( dc, *buffer ); } release_dc_ptr( dc ); return ret;

1 0

Aric Stewart : gdi32: GetCharWidth32A/ W return positive widths for all layouts and various DC transforms.
by Alexandre Julliard Sept. 11, 2013

Sept. 11, 2013

Module: wine Branch: master Commit: 4a300d2423d18abe915ad070b9611e72749dec4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a300d2423d18abe915ad070b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 11 07:46:53 2013 -0500 gdi32: GetCharWidth32A/W return positive widths for all layouts and various DC transforms. --- dlls/gdi32/font.c | 6 ++- dlls/gdi32/tests/font.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cc66000..9e516be 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1748,9 +1748,13 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, if (ret) { +#define WDPTOLP(x) ((x<0)? \ + (-abs(INTERNAL_XDSTOWS(dc, (x)))): \ + (abs(INTERNAL_XDSTOWS(dc, (x))))) /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) - *buffer = INTERNAL_XDSTOWS(dc, *buffer); + *buffer = WDPTOLP(*buffer); +#undef WDPTOLP } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 84e47ed..11299f3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -42,6 +42,8 @@ static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWOR static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); +static BOOL (WINAPI *pGetCharWidth32A)(HDC hdc, UINT first, UINT last, LPINT buffer); +static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -83,6 +85,8 @@ static void init(void) pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); + pGetCharWidth32A = (void *)GetProcAddress(hgdi32, "GetCharWidth32A"); + pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -5348,6 +5352,109 @@ static void test_vertical_order(void) DeleteDC( hdc ); } +static void test_GetCharWidth32(void) +{ + BOOL ret; + HDC hdc; + LOGFONTA lf; + HFONT hfont; + INT bufferA; + INT bufferW; + HWND hwnd; + + if (!pGetCharWidth32A || !pGetCharWidth32W) + { + win_skip("GetCharWidth32A/W not available on this platform\n"); + return; + } + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hdc = GetDC(0); + hfont = SelectObject(hdc, hfont); + + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ret = pGetCharWidth32A(hdc, 'a', 'a', &bufferA); + ok(ret, "GetCharWidth32A should have succeeded\n"); + ok (bufferA == bufferW, "Widths should be the same\n"); + ok (bufferA > 0," Width should be greater than zero\n"); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode( hdc, MM_ANISOTROPIC ); + SelectObject(hdc, hfont); + + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetWindowExtEx(hdc, -1,-1,NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetGraphicsMode(hdc, GM_ADVANCED); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + todo_wine ok (bufferW > 0," Width should be greater than zero\n"); + SetWindowExtEx(hdc, 1,1,NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetGraphicsMode(hdc, GM_ADVANCED); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode( hdc, MM_ANISOTROPIC ); + SelectObject(hdc, hfont); + + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetWindowExtEx(hdc, -1,-1,NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetGraphicsMode(hdc, GM_ADVANCED); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetWindowExtEx(hdc, 1,1,NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + ok (bufferW > 0," Width should be greater than zero\n"); + SetGraphicsMode(hdc, GM_ADVANCED); + ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ok(ret, "GetCharWidth32W should have succeeded\n"); + todo_wine ok (bufferW > 0," Width should be greater than zero\n"); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); +} START_TEST(font) { @@ -5407,6 +5514,7 @@ START_TEST(font) test_east_asian_font_selection(); test_max_height(); test_vertical_order(); + test_GetCharWidth32(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0