September 2013 - Wine-commits

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

11 Sep '13

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

Stefan Dösinger : wined3d: Pass the swizzle map to find_vs_compile_args.
by Alexandre Julliard 11 Sep '13

11 Sep '13

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

Stefan Dösinger : wined3d: Pass position_transformed and gl_info to find_ps_compile_args.
by Alexandre Julliard 11 Sep '13

11 Sep '13

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

Aric Stewart : gdi32: GetCharWidth32A/ W return positive widths for all layouts and various DC transforms.
by Alexandre Julliard 11 Sep '13

11 Sep '13

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

Alexandre Julliard : gdi32: Add more helpers for converting font sizes to logical coordinates.
by Alexandre Julliard 11 Sep '13

11 Sep '13

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

Alexandre Julliard : gdi32: Add a check for overflow in DIB dimensions.
by Alexandre Julliard 11 Sep '13

11 Sep '13

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

Alexandre Julliard : taskmgr: Use definitions from winternl. h instead of duplicating them.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 31f889367834bea2f280319c9dda35b4f30a441b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f889367834bea2f280319c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 11 18:04:33 2013 +0200 taskmgr: Use definitions from winternl.h instead of duplicating them. --- include/winternl.h | 2 +- programs/taskmgr/perfdata.c | 141 ++++++++++----------- programs/taskmgr/perfdata.h | 285 +------------------------------------------ programs/taskmgr/taskmgr.c | 1 - 4 files changed, 72 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f889367834bea2f2803…

1 0

Bruno Jesus : ws2_32: Fix WSADuplicateSocket implementation.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: d71bf64e878aba9a8be6a2dd8d8a60bfeaab78d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71bf64e878aba9a8be6a2dd8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 11 10:05:18 2013 -0300 ws2_32: Fix WSADuplicateSocket implementation. --- dlls/ws2_32/socket.c | 31 +++++++-- dlls/ws2_32/tests/sock.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d71bf64e878aba9a8be6a…

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 63e1b7afe1d8b6ee4075cd0ccd908c9bcfd700e0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=63e1b7afe1d8b6ee4075cd0cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:56 2013 +0200 winedev: Assorted formatting & tagging fixes. --- en/winedev-debugging.sgml | 14 +++++++------- en/winedev-documentation.sgml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/en/winedev-debugging.sgml b/en/winedev-debugging.sgml index cd4d6e9..1dcc4d7 100644 --- a/en/winedev-debugging.sgml +++ b/en/winedev-debugging.sgml @@ -324,19 +324,19 @@ WINEDEBUG=trace+reg,warn-file <para> also, the pseudo-channel all is also supported and it has the intuitive semantics: - </para> <screen> -WINEDEBUG=+all -- enables all debug messages -WINEDEBUG=-all -- disables all debug messages -WINEDEBUG=<replaceable>yyy</replaceable>+all -- enables debug messages for class <replaceable>yyy</replaceable> on all channels. -WINEDEBUG=<replaceable>yyy</replaceable>-all -- disables debug messages for class <replaceable>yyy</replaceable> on all channels. +WINEDEBUG=+all <lineannotation>-- enables all debug messages</lineannotation> +WINEDEBUG=-all <lineannotation>-- disables all debug messages</lineannotation> +WINEDEBUG=<replaceable>yyy</replaceable>+all <lineannotation>-- enables debug messages for class <replaceable>yyy</replaceable> on all channels</lineannotation> +WINEDEBUG=<replaceable>yyy</replaceable>-all <lineannotation>-- disables debug messages for class <replaceable>yyy</replaceable> on all channels</lineannotation> </screen> + </para> <para> So, for example: - </para> <screen> -WINEDEBUG=warn-all -- disables all warning messages. +WINEDEBUG=warn-all <lineannotation>-- disables all warning messages</lineannotation> </screen> + </para> </listitem> </itemizedlist> diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 51c6651..71ad92c 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -257,7 +257,7 @@ Parameters documented in the comment should be formatted as follows: </para> -<screen> +<programlisting> /************************************************************************* * PathRelativePathToW [SHLWAPI.@] * @@ -271,7 +271,7 @@ * dwAttrTo [I] File attributes of destination path * */ -</screen> +</programlisting> <para> The parameters section starts with <literal>PARAMS</literal> on its own line.

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 2b7c66dc429bf25d51462764d1a8f86a128f1402 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2b7c66dc429bf25d51462764d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:57 2013 +0200 wineusr: Assorted formatting & tagging fixes. --- en/wineusr-bugs.sgml | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 5a66456..931ed6e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -154,8 +154,15 @@ <para> <ulink url="http://www.freenode.net">Freenode.net</ulink> hosts an IRC channel for Wine. You can access it by using - any IRC client such as Xchat. The settings you'll need are: - server = irc.freenode.net, port = 6667, and channel = #winehq + any IRC client such as <application>Xchat</application>. The settings you'll need are: + <simplelist type="horiz" columns="2"> + <member>server</member> + <member>irc.freenode.net</member> + <member>port</member> + <member>6667</member> + <member>channel</member> + <member>#winehq</member> + </simplelist> </para> </listitem> <listitem> @@ -173,9 +180,9 @@ <listitem> <para> Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially wine-users. The - wine-devel list may be appropriate depending on the type of - problem you are experiencing. If you post to wine-devel you + lists</ulink> may also help, especially <literal>wine-users</literal>. The + <literal>wine-devel</literal> list may be appropriate depending on the type of + problem you are experiencing. If you post to <literal>wine-devel</literal> you should be prepared to do a little work to help diagnose the problem. Read the section below to find out how to debug the source of your problem.

1 0