June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/monthcal: Fix title to use properly localized year/month format.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 035d0a159431d9d6b9affff46ce7ff84d1d0e990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035d0a159431d9d6b9affff46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 11:57:21 2015 +0300 comctl32/monthcal: Fix title to use properly localized year/month format. --- dlls/comctl32/monthcal.c | 76 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a49fad7..5accbe6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -866,10 +866,16 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direc /* paint a title with buttons and month/year string */ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { - static const WCHAR fmt_monthW[] = { '%','s',' ','%','l','d',0 }; + static const WCHAR mmmmW[] = {'M','M','M','M',0}; + static const WCHAR mmmW[] = {'M','M','M',0}; + static const WCHAR mmW[] = {'M','M',0}; + static const WCHAR fmtyearW[] = {'%','l','d',0}; + static const WCHAR fmtmmW[] = {'%','0','2','d',0}; + static const WCHAR fmtmW[] = {'%','d',0}; RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; - WCHAR buf_month[80], buf_fmt[80]; + WCHAR monthW[80], strW[80], fmtW[80], yearW[6] /* valid year range is 1601-30827 */; + int yearoffset, monthoffset, shiftX; SIZE sz; /* fill header box */ @@ -880,21 +886,65 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU SetTextColor(hdc, infoPtr->colors[MCSC_TITLETEXT]); SelectObject(hdc, infoPtr->hBoldFont); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1 + st->wMonth - 1, - buf_month, countof(buf_month)); + /* draw formatted date string */ + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_YEARMONTH, st, NULL, strW, countof(strW)); + DrawTextW(hdc, strW, strlenW(strW), title, DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, fmtW, countof(fmtW)); + wsprintfW(yearW, fmtyearW, st->wYear); + + /* month is trickier as it's possible to have different format pictures, we'll + test for M, MM, MMM, and MMMM */ + if (strstrW(fmtW, mmmmW)) + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+st->wMonth-1, monthW, countof(monthW)); + else if (strstrW(fmtW, mmmW)) + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVMONTHNAME1+st->wMonth-1, monthW, countof(monthW)); + else if (strstrW(fmtW, mmW)) + wsprintfW(monthW, fmtmmW, st->wMonth); + else + wsprintfW(monthW, fmtmW, st->wMonth); - wsprintfW(buf_fmt, fmt_monthW, buf_month, st->wYear); - DrawTextW(hdc, buf_fmt, strlenW(buf_fmt), title, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + /* update hit boxes */ + yearoffset = 0; + while (strW[yearoffset]) + { + if (!strncmpW(&strW[yearoffset], yearW, strlenW(yearW))) + break; + yearoffset++; + } - /* update title rectangles with current month - used while testing hits */ - GetTextExtentPoint32W(hdc, buf_fmt, strlenW(buf_fmt), &sz); - infoPtr->calendars[calIdx].titlemonth.left = title->right / 2 + title->left / 2 - sz.cx / 2; - infoPtr->calendars[calIdx].titleyear.right = title->right / 2 + title->left / 2 + sz.cx / 2; + monthoffset = 0; + while (strW[monthoffset]) + { + if (!strncmpW(&strW[monthoffset], monthW, strlenW(monthW))) + break; + monthoffset++; + } + + /* for left limits use offsets */ + sz.cx = 0; + if (yearoffset) + GetTextExtentPoint32W(hdc, strW, yearoffset, &sz); + infoPtr->calendars[calIdx].titleyear.left = sz.cx; + + sz.cx = 0; + if (monthoffset) + GetTextExtentPoint32W(hdc, strW, monthoffset, &sz); + infoPtr->calendars[calIdx].titlemonth.left = sz.cx; - GetTextExtentPoint32W(hdc, buf_month, strlenW(buf_month), &sz); + /* for right limits use actual string parts lengths */ + GetTextExtentPoint32W(hdc, &strW[yearoffset], strlenW(yearW), &sz); + infoPtr->calendars[calIdx].titleyear.right = infoPtr->calendars[calIdx].titleyear.left + sz.cx; + + GetTextExtentPoint32W(hdc, monthW, strlenW(monthW), &sz); infoPtr->calendars[calIdx].titlemonth.right = infoPtr->calendars[calIdx].titlemonth.left + sz.cx; - infoPtr->calendars[calIdx].titleyear.left = infoPtr->calendars[calIdx].titlemonth.right; + + /* Finally translate rectangles to match center aligned string, + hit rectangles are relative to title rectangle before translation. */ + GetTextExtentPoint32W(hdc, strW, strlenW(strW), &sz); + shiftX = (title->right - title->left - sz.cx) / 2 + title->left; + OffsetRect(&infoPtr->calendars[calIdx].titleyear, shiftX, 0); + OffsetRect(&infoPtr->calendars[calIdx].titlemonth, shiftX, 0); } static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx)

1 0

Jacek Caban : secur32: Fixed compilation on very old gnutls versions.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: cae3f98c6938663aab248f6551e9cc7cfbc1ce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae3f98c6938663aab248f655… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 13:06:08 2015 +0200 secur32: Fixed compilation on very old gnutls versions. --- dlls/secur32/schannel_gnutls.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index c0b6f80..d2c64fc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 2.9.10. */ +extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); @@ -77,10 +80,34 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR #if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) +{ + switch(cipher) { + case GNUTLS_CIPHER_3DES_CBC: + return 8; + case GNUTLS_CIPHER_AES_128_CBC: + case GNUTLS_CIPHER_AES_256_CBC: + return 16; + case GNUTLS_CIPHER_ARCFOUR_128: + case GNUTLS_CIPHER_ARCFOUR_40: + return 1; + case GNUTLS_CIPHER_DES_CBC: + return 8; + case GNUTLS_CIPHER_NULL: + return 1; + case GNUTLS_CIPHER_RC2_40_CBC: + return 8; + default: + FIXME("Unknown cipher %#x, returning 1\n", cipher); + return 1; + } +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -474,7 +501,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_certificate_free_credentials) LOAD_FUNCPTR(gnutls_certificate_get_peers) LOAD_FUNCPTR(gnutls_cipher_get) - LOAD_FUNCPTR(gnutls_cipher_get_block_size) LOAD_FUNCPTR(gnutls_cipher_get_key_size) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit) @@ -501,6 +527,12 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_transport_set_push_function) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_get_block_size = wine_dlsym(libgnutls_handle, "gnutls_cipher_get_block_size", NULL, 0))) + { + WARN("gnutls_cipher_get_block_size not found\n"); + pgnutls_cipher_get_block_size = compat_cipher_get_block_size; + } + ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS) {

1 0

Huw Davies : gdi32/tests: Fix Courier test on Arabic locales.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 002cf965e16c296f4c928f42c752ef0ad652b6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=002cf965e16c296f4c928f42c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 18 09:45:35 2015 +0100 gdi32/tests: Fix Courier test on Arabic locales. --- dlls/gdi32/tests/font.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5388df1..a590ce8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5704,9 +5704,11 @@ static void test_stock_fonts(void) { int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; + WORD lang_id; } td[][11] = { { /* ANSI_FIXED_FONT */ + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 } @@ -5769,7 +5771,8 @@ static void test_stock_fonts(void) for (j = 0; td[i][j].face_name[0] != 0; j++) { - if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) || + (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL)) { continue; }

1 0

Matteo Bruni : wined3d: Make use of the EXT_BLEND_SUBTRACT flag.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 498e55a1824fccaca826c7edc84a55e729e4e342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498e55a1824fccaca826c7edc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:41 2015 +0200 wined3d: Make use of the EXT_BLEND_SUBTRACT flag. MSDN mentions a fallback to D3DBLENDOP_ADD if the selected blendop is not supported. In theory it would be nice to write a test for that but I don't think this is particularly important and moreover hardware without that cap seems hard to come by (i.e. I have none)... --- dlls/wined3d/directx.c | 17 +++++++++++++++-- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f238fc0..243f5ae 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3399,13 +3399,25 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->supported[NV_POINT_SPRITE] = TRUE; } + if ((!gl_info->supported[EXT_BLEND_MINMAX] || !gl_info->supported[EXT_BLEND_SUBTRACT]) + && gl_version >= MAKEDWORD_VERSION(1, 4)) + { + TRACE("GL CORE: GL_EXT_blend_minmax / GL_EXT_blend_subtract support.\n"); + gl_info->supported[EXT_BLEND_MINMAX] = TRUE; + gl_info->supported[EXT_BLEND_SUBTRACT] = TRUE; + } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_version >= MAKEDWORD_VERSION(2, 0)) { TRACE("GL CORE: GL_ARB_texture_non_power_of_two support.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = TRUE; } - if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + if (gl_info->supported[EXT_BLEND_MINMAX] || gl_info->supported[EXT_BLEND_SUBTRACT]) + gl_info->supported[WINED3D_GL_BLEND_EQUATION] = TRUE; + + if (gl_version >= MAKEDWORD_VERSION(2, 0)) + gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_info->supported[APPLE_FENCE]) { @@ -4760,7 +4772,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPMISCCAPS_CLIPTLVERTS | WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS | WINED3DPMISCCAPS_MASKZ | - WINED3DPMISCCAPS_BLENDOP | WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING; /* TODO: WINED3DPMISCCAPS_NULLREFERENCE @@ -4768,6 +4779,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ + if (gl_info->supported[WINED3D_GL_BLEND_EQUATION]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_BLENDOP; if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; if (gl_info->supported[EXT_DRAW_BUFFERS2]) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f5a9a24..c28798d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -273,23 +273,23 @@ static void state_blendop_w(struct wined3d_context *context, const struct wined3 WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); } -static GLenum gl_blend_op(enum wined3d_blend_op op) +static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_blend_op op) { switch (op) { case WINED3D_BLEND_OP_ADD: - return GL_FUNC_ADD_EXT; + return GL_FUNC_ADD; case WINED3D_BLEND_OP_SUBTRACT: - return GL_FUNC_SUBTRACT_EXT; + return gl_info->supported[EXT_BLEND_SUBTRACT] ? GL_FUNC_SUBTRACT : GL_FUNC_ADD; case WINED3D_BLEND_OP_REVSUBTRACT: - return GL_FUNC_REVERSE_SUBTRACT_EXT; + return gl_info->supported[EXT_BLEND_SUBTRACT] ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD; case WINED3D_BLEND_OP_MIN: - return GL_MIN_EXT; + return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MIN : GL_FUNC_ADD; case WINED3D_BLEND_OP_MAX: - return GL_MAX_EXT; + return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MAX : GL_FUNC_ADD; default: FIXME("Unhandled blend op %#x.\n", op); - return GL_NONE; + return GL_FUNC_ADD; } } @@ -307,8 +307,8 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ return; } - blend_equation = gl_blend_op(state->render_states[WINED3D_RS_BLENDOP]); - blend_equation_alpha = gl_blend_op(state->render_states[WINED3D_RS_BLENDOPALPHA]); + blend_equation = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOP]); + blend_equation_alpha = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOPALPHA]); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) @@ -4997,7 +4997,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite0 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX }, + { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 009dca6..4257cd2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -160,6 +160,7 @@ enum wined3d_gl_extension WGL_EXT_SWAP_CONTROL, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ + WINED3D_GL_BLEND_EQUATION, WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_VERSION_2_0,

1 0

Matteo Bruni : wined3d: Drop WINED3D_RS_TEXTUREPERSPECTIVE handling.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 35a2406900b88ead932cd998c85dabefb8a4b987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a2406900b88ead932cd998c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:40 2015 +0200 wined3d: Drop WINED3D_RS_TEXTUREPERSPECTIVE handling. The hint is not supported on core profiles. It's not guaranteed to do anything on compatibility profile either: "The interpretation of hints is implementation dependent. An implementation may ignore them entirely." This state was only available on D3D 7 and below (and not guaranteed to do anything there either, according to older DX SDK docs). If necessary we could implement it via the GLSL 1.50 "noperspective" interpolation qualifier, which is what we need to use for the equivalent D3D10 feature anyway. --- dlls/wined3d/state.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 67558fd..f5a9a24 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1698,22 +1698,6 @@ static void state_zvisible(struct wined3d_context *context, const struct wined3d FIXME("WINED3D_RS_ZVISIBLE not implemented.\n"); } -static void state_perspective(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (state->render_states[WINED3D_RS_TEXTUREPERSPECTIVE]) - { - gl_info->gl_ops.gl.p_glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST)"); - } - else - { - gl_info->gl_ops.gl.p_glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST)"); - } -} - static void state_stippledalpha(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_STIPPLEDALPHA]) @@ -4939,7 +4923,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ANTIALIAS), { STATE_RENDER(WINED3D_RS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_perspective }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZENABLE), { STATE_RENDER(WINED3D_RS_ZENABLE), state_zenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE },

1 0

Piotr Caban : msvcp110: Fix _Collvec structure layout.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 3f3e2ba2c7008f41e1bc6d4c2bbe7338d464be95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3e2ba2c7008f41e1bc6d4c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:47:36 2015 +0200 msvcp110: Fix _Collvec structure layout. --- dlls/msvcp90/locale.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 66d27ce..b975741 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -62,15 +62,6 @@ const locale* __cdecl locale_classic(void); #if _MSVCP_VER >= 110 wchar_t ** __cdecl ___lc_locale_name_func(void); -static LCID* ___lc_handle_func(void) -{ - LCID *ret; - - _locale_t loc = _get_current_locale(); - ret = loc->locinfo->lc_handle; - _free_locale(loc); - return ret; -} #else LCID* __cdecl ___lc_handle_func(void); #endif @@ -129,8 +120,13 @@ typedef struct { } _Locinfo; typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; +#if _MSVCP_VER >= 110 + wchar_t *lc_name; +#endif } _Collvec; typedef struct { @@ -664,7 +660,11 @@ ULONGLONG __cdecl _Getcoll(void) TRACE("\n"); ret.collvec.page = ___lc_collate_cp_func(); +#if _MSVCP_VER < 110 ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; +#else + ret.collvec.lc_name = ___lc_locale_name_func()[LC_COLLATE]; +#endif return ret.ull; } @@ -1091,10 +1091,11 @@ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2)); - if(coll) - lcid = coll->handle; - else - lcid = ___lc_handle_func()[LC_COLLATE]; +#if _MSVCP_VER < 110 + lcid = (coll ? coll->handle : ___lc_handle_func()[LC_COLLATE]); +#else + lcid = LocaleNameToLCID(coll ? coll->lc_name : ___lc_locale_name_func()[LC_COLLATE], 0); +#endif return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; } @@ -1425,15 +1426,15 @@ static collate* collate_short_use_facet(const locale *loc) int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) { - LCID lcid; - TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); - if(coll) - lcid = coll->handle; - else - lcid = ___lc_handle_func()[LC_COLLATE]; - return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; +#if _MSVCP_VER < 110 + return CompareStringW(coll ? coll->handle : ___lc_handle_func()[LC_COLLATE], + 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; +#else + return CompareStringEx(coll ? coll->lc_name : ___lc_locale_name_func()[LC_COLLATE], + 0, first1, last1-first1, first2, last2-first2, NULL, NULL, 0)-CSTR_EQUAL; +#endif } /* ?do_compare@?$collate(a)_W@std@@MBEHPB_W000(a)Z */

1 0

Piotr Caban : msvcr120: Add ___lc_locale_name_func implementation.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: f55192aabc999b665886fd8dead69cfb00526f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55192aabc999b665886fd8de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 17 11:46:42 2015 +0200 msvcr120: Add ___lc_locale_name_func implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 51 +++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 88 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 5 ++- 6 files changed, 146 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55192aabc999b665886f…

1 0

Hans Leidekker : winhttp: Fix handling of the headers length parameter in WinHttpAddRequestHeaders and WinHttpSendRequest.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 9e96beefae97bb63845b1cac6f372de515465ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e96beefae97bb63845b1cac6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:11:50 2015 +0200 winhttp: Fix handling of the headers length parameter in WinHttpAddRequestHeaders and WinHttpSendRequest. --- dlls/winhttp/request.c | 7 +++++-- dlls/winhttp/tests/winhttp.c | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 05d494f..bdcbb96 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -486,7 +486,8 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD if (len == ~0u) len = strlenW( headers ); if (!len) return TRUE; if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - strcpyW( buffer, headers ); + memcpy( buffer, headers, len * sizeof(WCHAR) ); + buffer[len] = 0; p = buffer; do @@ -530,7 +531,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD TRACE("%p, %s, 0x%x, 0x%08x\n", hrequest, debugstr_w(headers), len, flags); - if (!headers) + if (!headers || !len) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1251,6 +1252,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade return FALSE; } + if (headers && !headers_len) headers_len = strlenW( headers ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { send_request_t *s; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8b72d08..d808ff6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -410,7 +410,7 @@ static void test_WinHttpAddHeaders(void) BOOL ret, reverse; WCHAR buffer[MAX_PATH]; WCHAR check_buffer[MAX_PATH]; - DWORD index, len, oldlen; + DWORD err, index, len, oldlen; static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; @@ -420,6 +420,9 @@ static void test_WinHttpAddHeaders(void) {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','p','o','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; + static const WCHAR test_header_range[] = {'R','a','n','g','e',0}; + static const WCHAR test_header_range_bytes[] = {'R','a','n','g','e',':',' ','b','y','t','e','s','=','0','-','7','7','3','\r','\n',0}; + static const WCHAR test_header_bytes[] = {'b','y','t','e','s','=','0','-','7','7','3',0}; static const WCHAR test_flag_coalesce[] = {'t','e','s','t','2',',',' ','t','e','s','t','4',0}; static const WCHAR test_flag_coalesce_reverse[] = {'t','e','s','t','3',',',' ','t','e','s','t','4',0}; @@ -780,6 +783,26 @@ static void test_WinHttpAddHeaders(void) ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(!memcmp(buffer, value, sizeof(value)) || ! memcmp(buffer, value_nospace, sizeof(value_nospace)), "unexpected result\n"); + SetLastError(0xdeadbeef); + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, 0, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, ~0u, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "failed to add header: %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_range, buffer, &len, &index); + ok(ret, "failed to get range header %u\n", GetLastError()); + ok(!memcmp(buffer, test_header_bytes, sizeof(test_header_bytes)), "incorrect string returned\n"); + ok(len == lstrlenW(test_header_bytes) * sizeof(WCHAR), "wrong length %u\n", len); + ok(index == 1, "wrong index %u\n", index); + ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: @@ -1923,7 +1946,8 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /not_modified")) { - send(c, notmodified, sizeof notmodified - 1, 0); + if (strstr(buffer, "If-Modified-Since:")) send(c, notmodified, sizeof notmodified - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); continue; } if (strstr(buffer, "HEAD /head")) @@ -2395,11 +2419,12 @@ static void test_not_modified(int port) { static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; + static const WCHAR ifmodified2W[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; BOOL ret; HINTERNET session, request, connection; - DWORD status, size, start = GetTickCount(); + DWORD index, len, status, size, start = GetTickCount(); SYSTEMTIME st; - WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3]; + WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3], buffer[32]; memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); GetSystemTime(&st); @@ -2416,12 +2441,18 @@ static void test_not_modified(int port) WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); - ret = WinHttpSendRequest(request, today, ~0u, NULL, 0, 0, 0); + ret = WinHttpSendRequest(request, today, 0, NULL, 0, 0, 0); ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + ifmodified2W, buffer, &len, &index); + ok(ret, "failed to get header %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER,

1 0

Hans Leidekker : winhttp/tests: Fix a test failure on win2k.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: d9d8e6f0312f6d6f4d79ef2486091cfa1c52b566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8e6f0312f6d6f4d79ef248… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:11:22 2015 +0200 winhttp/tests: Fix a test failure on win2k. --- dlls/winhttp/tests/winhttp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 10a3f06..8b72d08 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -942,6 +942,11 @@ static void test_request_parameter_defaults(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */ + { + win_skip("invalid response\n"); + goto done; + } ok(ret, "failed to receive response %u\n", GetLastError()); status = 0xdeadbeef;

1 0

Hans Leidekker : advapi32/tests: Add tests to show that reading the SACL requires a special privilege.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 1fb3f9cb1552d1968de77f3f00636467fa09d584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb3f9cb1552d1968de77f3f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:09:39 2015 +0200 advapi32/tests: Add tests to show that reading the SACL requires a special privilege. --- dlls/advapi32/tests/security.c | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b43f212..f141b3e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5835,6 +5835,92 @@ static void test_AddAce(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); } +static void test_system_security_access(void) +{ + static const WCHAR testkeyW[] = + {'S','O','F','T','W','A','R','E','\\','W','i','n','e','\\','S','A','C','L','t','e','s','t',0}; + LONG res; + HKEY hkey; + PSECURITY_DESCRIPTOR sd; + ACL *sacl; + DWORD err, len = 128; + TOKEN_PRIVILEGES priv, *priv_prev; + HANDLE token; + LUID luid; + BOOL ret; + + if (!OpenProcessToken( GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token )) return; + if (!LookupPrivilegeValueA( NULL, SE_SECURITY_NAME, &luid )) + { + CloseHandle( token ); + return; + } + + /* ACCESS_SYSTEM_SECURITY requires special privilege */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); + todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res ); + + priv.PrivilegeCount = 1; + priv.Privileges[0].Luid = luid; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + priv_prev = HeapAlloc( GetProcessHeap(), 0, len ); + ret = AdjustTokenPrivileges( token, FALSE, &priv, len, priv_prev, &len ); + ok( ret, "got %u\n", GetLastError()); + + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); + ok( !res, "got %d\n", res ); + + /* restore privileges */ + ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL ); + ok( ret, "got %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + + /* privilege is checked on access */ + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + + priv.PrivilegeCount = 1; + priv.Privileges[0].Luid = luid; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + priv_prev = HeapAlloc( GetProcessHeap(), 0, len ); + ret = AdjustTokenPrivileges( token, FALSE, &priv, len, priv_prev, &len ); + ok( ret, "got %u\n", GetLastError()); + + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + RegCloseKey( hkey ); + LocalFree( sd ); + + /* handle created without ACCESS_SYSTEM_SECURITY, privilege held */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + sd = NULL; + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_SUCCESS, "got %u\n", err ); + RegCloseKey( hkey ); + LocalFree( sd ); + + /* restore privileges */ + ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL ); + ok( ret, "got %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + + /* handle created without ACCESS_SYSTEM_SECURITY, privilege not held */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + RegCloseKey( hkey ); + + res = RegDeleteKeyW( HKEY_LOCAL_MACHINE, testkeyW ); + ok( !res, "got %d\n", res ); + CloseHandle( token ); +} + START_TEST(security) { init(); @@ -5877,4 +5963,5 @@ START_TEST(security) test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); test_AddAce(); + test_system_security_access(); }

1 0