May 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : comdlg32: Return combined color from HSL -> RGB transform.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 31351376d110ea59b08bdb708e5d43ca853e296d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31351376d110ea59b08bdb708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 08:48:28 2013 +0400 comdlg32: Return combined color from HSL -> RGB transform. --- dlls/comdlg32/colordlg.c | 62 ++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 622dc76..1c52529 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -87,21 +87,10 @@ typedef struct CCPRIVATE HWND hwndFocus; /* handle last focused item */ } CCPRIV, *LPCCPRIV; -/*********************************************************************** - * CC_HSLtoRGB [internal] - */ -static int CC_HSLtoRGB(char c, int hue, int sat, int lum) +static int hsl_to_x(int hue, int sat, int lum) { int res = 0, maxrgb; - /* hue */ - switch(c) - { - case 'R': if (hue > 80) hue -= 80; else hue += 160; break; - case 'G': if (hue > 160) hue -= 160; else hue += 80; break; - case 'B': break; - } - /* l below 120 */ maxrgb = (256 * min(120,lum)) / 120; /* 0 .. 256 */ if (hue < 80) @@ -133,6 +122,25 @@ static int CC_HSLtoRGB(char c, int hue, int sat, int lum) } /*********************************************************************** + * CC_HSLtoRGB [internal] + */ +static COLORREF CC_HSLtoRGB(int hue, int sat, int lum) +{ + int h, r, g, b; + + /* r */ + h = hue > 80 ? hue-80 : hue+160; + r = hsl_to_x(h, sat, lum); + /* g */ + h = hue > 160 ? hue-160 : hue+80; + g = hsl_to_x(h, sat, lum); + /* b */ + b = hsl_to_x(hue, sat, lum); + + return RGB(r, g, b); +} + +/*********************************************************************** * CC_RGBtoHSL [internal] */ static int CC_RGBtoHSL(char c, int r, int g, int b) @@ -555,7 +563,7 @@ static void CC_PaintCross( HWND hDlg, int x, int y) */ static void CC_PrepareColorGraph( HWND hDlg ) { - int sdif, hdif, xdif, ydif, r, g, b, hue, sat; + int sdif, hdif, xdif, ydif, hue, sat; HWND hwnd = GetDlgItem(hDlg, IDC_COLOR_GRAPH); LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); HBRUSH hbrush; @@ -580,10 +588,7 @@ static void CC_PrepareColorGraph( HWND hDlg ) for(sat = 0; sat < 240 + sdif; sat += sdif) { rect.top = rect.bottom - ydif; - r = CC_HSLtoRGB('R', hue, sat, 120); - g = CC_HSLtoRGB('G', hue, sat, 120); - b = CC_HSLtoRGB('B', hue, sat, 120); - hbrush = CreateSolidBrush( RGB(r, g, b)); + hbrush = CreateSolidBrush(CC_HSLtoRGB(hue, sat, 120)); FillRect(lpp->hdcMem, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; @@ -625,7 +630,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) { HWND hwnd = GetDlgItem(hDlg, IDC_COLOR_LUMBAR); RECT rect, client; - int lum, ldif, ydif, r, g, b; + int lum, ldif, ydif; HBRUSH hbrush; HDC hDC; @@ -640,10 +645,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) for (lum = 0; lum < 240 + ldif; lum += ldif) { rect.top = max(0, rect.bottom - ydif); - r = CC_HSLtoRGB('R', hue, sat, lum); - g = CC_HSLtoRGB('G', hue, sat, lum); - b = CC_HSLtoRGB('B', hue, sat, lum); - hbrush = CreateSolidBrush( RGB(r, g, b) ); + hbrush = CreateSolidBrush(CC_HSLtoRGB(hue, sat, lum)); FillRect(hDC, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; @@ -1008,10 +1010,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif } if (xx) /* something has changed */ { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_PaintCross(hDlg, lpp->h, lpp->s); @@ -1120,7 +1119,6 @@ static LRESULT CC_WMLButtonUp( HWND hDlg ) static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b; if (lpp->capturedGraph) { @@ -1132,10 +1130,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) } if (CC_MouseCheckColorGraph( hDlg, lpp->capturedGraph, ptrh, ptrs, lParam)) { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); CC_PaintCross(hDlg, lpp->h, lpp->s); @@ -1181,10 +1176,7 @@ static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) if ( i == 2 ) { SetCapture(hDlg); - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); } if ( i == 1 ) {

1 0

Nikolay Sivov : comdlg32: Pass full colorref to RGB -> HSL conversion function.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 1616eb6fcabdde0429819df24e13cad3a236d45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1616eb6fcabdde0429819df24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 09:03:22 2013 +0400 comdlg32: Pass full colorref to RGB -> HSL conversion function. --- dlls/comdlg32/colordlg.c | 67 ++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 1c52529..8b5d8fb 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -143,10 +143,14 @@ static COLORREF CC_HSLtoRGB(int hue, int sat, int lum) /*********************************************************************** * CC_RGBtoHSL [internal] */ -static int CC_RGBtoHSL(char c, int r, int g, int b) +static int CC_RGBtoHSL(char c, COLORREF rgb) { WORD maxi, mini, mmsum, mmdif, result = 0; - int iresult = 0; + int iresult = 0, r, g, b; + + r = GetRValue(rgb); + g = GetGValue(rgb); + b = GetBValue(rgb); maxi = max(r, b); maxi = max(maxi, g); @@ -682,23 +686,24 @@ static void CC_EditSetRGB( HWND hDlg, COLORREF cr ) /*********************************************************************** * CC_EditSetHSL [internal] */ -static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) +static void CC_EditSetHSL( HWND hDlg ) { - char buffer[10]; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + CCPRIV *lpp = GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, IDC_COLOR_GRAPH) )) /* if full size */ { + char buffer[10]; + lpp->updating = TRUE; - sprintf(buffer, "%d", h); + sprintf(buffer, "%d", lpp->h); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_H), buffer); - sprintf(buffer, "%d", s); + sprintf(buffer, "%d", lpp->s); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_S), buffer); - sprintf(buffer, "%d", l); + sprintf(buffer, "%d", lpp->l); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_L), buffer); lpp->updating = FALSE; } - CC_PaintLumBar(hDlg, h, s); + CC_PaintLumBar(hDlg, lpp->h, lpp->s); } /*********************************************************************** @@ -707,7 +712,6 @@ static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) { int i; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); EnableWindow( GetDlgItem(hDlg, IDC_COLOR_DEFINE), FALSE); CC_PrepareColorGraph(hDlg); @@ -727,7 +731,7 @@ static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) ShowWindow( GetDlgItem(hDlg, IDC_COLOR_RESULT), SW_SHOW); CC_EditSetRGB(hDlg, result); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); ShowWindow( GetDlgItem( hDlg, IDC_COLOR_GRAPH), SW_SHOW); UpdateWindow( GetDlgItem(hDlg, IDC_COLOR_GRAPH) ); } @@ -932,9 +936,9 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) b = GetBValue(lpp->lpcc->rgbResult); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ SetDlgItemInt(hDlg, IDC_COLOR_EDIT_H, lpp->h, TRUE); @@ -985,10 +989,10 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif { lpp->lpcc->rgbResult = RGB(r, g, b); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); } @@ -1038,13 +1042,10 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif ReleaseDC(hDlg, hdc); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); break; @@ -1132,7 +1133,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); @@ -1153,8 +1154,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b, i; - i = 0; + int i = 0; if (CC_MouseCheckPredefColorArray(lpp, hDlg, IDC_COLOR_PREDEF, 6, 8, lParam)) i = 1; @@ -1180,17 +1180,14 @@ static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) } if ( i == 1 ) { - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); } if (i) { CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);

1 0

Nikolay Sivov : comdlg32: Simplify some internal helpers.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 489707f9e3f3a690ac957a384b6b2737fb92bfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489707f9e3f3a690ac957a384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 09:38:09 2013 +0400 comdlg32: Simplify some internal helpers. --- dlls/comdlg32/colordlg.c | 187 +++++++++++++++++++++++---------------------- 1 files changed, 96 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=489707f9e3f3a690ac957…

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: d72787521e09d1ce8287b8b2175412586488d07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72787521e09d1ce8287b8b21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 13 12:29:22 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 14 ++++++++++++++ dlls/oledb32/tests/convert.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3d7d23d..65a2bf6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1113,6 +1113,20 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { switch (src_type) { + case DBTYPE_VARIANT: + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR); + VariantClear(&v); + } + else + return hr; + } + break; case DBTYPE_STR: if(src_len) *dst_len = (*src_len + 1) * sizeof(WCHAR); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7f3e3ee..64562b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2339,6 +2339,7 @@ static void test_getconversionsize(void) BSTR str; static WCHAR strW[] = {'t','e','s','t',0}; static char strTest[] = "test"; + VARIANT var; /* same way as CanConvert fails here */ dst_len = 0; @@ -2394,6 +2395,33 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 42, "%ld\n", dst_len); + + dst_len = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_I4; + V_I4(&var) = 4; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dst_len == 110, "%ld\n", dst_len); + VariantClear(&var); + } static void test_converttovar(void)

1 0

Hans Leidekker : winhttp: Fix a memory leak.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 93637828b4b07708cbcebc0aadf5f8a44b3b9121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93637828b4b07708cbcebc0aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 13 12:17:36 2013 +0200 winhttp: Fix a memory leak. Reported by Marcus Meissner. --- dlls/winhttp/request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3238aa5..436a02f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1582,6 +1582,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla { ERR("authentication scheme changed from %s to %s\n", debugstr_w(auth_schemes[authinfo->scheme].str), debugstr_w(auth_value)); + destroy_authinfo( authinfo ); + *auth_ptr = NULL; return FALSE; } in.BufferType = SECBUFFER_TOKEN;

1 0

Stefan Dösinger : wined3d: Fix a ~0U assignment.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: e25b96849976574c3ff295efbf3784e0244b2350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25b96849976574c3ff295efb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 12 15:30:23 2013 +0200 wined3d: Fix a ~0U assignment. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7cd73a2..f29252e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4311,7 +4311,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh shader_data->clamp_consts = shader->reg_maps.shader_version.major == 1; if (shader->reg_maps.shader_version.major < 3) - shader_data->input_signature_idx = ~0; + shader_data->input_signature_idx = ~0U; else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature);

1 0

Stefan Dösinger : wined3d: Pass the pixel shader input signature to shader_arb_generate_vshader.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 260e1cb0b3a980915bcecf8a20b939a43a25ceae URL: http://source.winehq.org/git/wine.git/?a=commit;h=260e1cb0b3a980915bcecf8a2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 12 15:30:24 2013 +0200 wined3d: Pass the pixel shader input signature to shader_arb_generate_vshader. --- dlls/wined3d/arb_program_shader.c | 48 +++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f29252e..6756927 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3954,7 +3954,8 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(const struct wined3d_shader *shader, DWORD sig_num, +static void init_output_registers(const struct wined3d_shader *shader, + const struct wined3d_shader_signature_element *ps_input_sig, struct shader_arb_ctx_priv *priv_ctx, struct arb_vs_compiled_shader *compiled) { unsigned int i, j; @@ -3963,8 +3964,6 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig "result.texcoord[0]", "result.texcoord[1]", "result.texcoord[2]", "result.texcoord[3]", "result.texcoord[4]", "result.texcoord[5]", "result.texcoord[6]", "result.texcoord[7]" }; - struct wined3d_device *device = shader->device; - const struct wined3d_shader_signature_element *sig; const char *semantic_name; DWORD semantic_idx, reg_idx; @@ -3978,7 +3977,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig "result.color.primary", "result.color.secondary" }; - if(sig_num == ~0) + if (!ps_input_sig) { TRACE("Pixel shader uses builtin varyings\n"); /* Map builtins to builtins */ @@ -4037,10 +4036,6 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig return; } - /* Instead of searching for the signature in the signature list, read the one from the current pixel shader. - * Its maybe not the shader where the signature came from, but it is the same signature and faster to find - */ - sig = device->stateBlock->state.pixel_shader->input_signature; TRACE("Pixel shader uses declared varyings\n"); /* Map builtin to declared. /dev/null the results by default to the TA temp reg */ @@ -4054,9 +4049,9 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig for(i = 0; i < MAX_REG_INPUT; i++) { - semantic_name = sig[i].semantic_name; - semantic_idx = sig[i].semantic_idx; - reg_idx = sig[i].register_idx; + semantic_name = ps_input_sig[i].semantic_name; + semantic_idx = ps_input_sig[i].semantic_idx; + reg_idx = ps_input_sig[i].register_idx; if (!semantic_name) continue; /* If a declared input register is not written by builtin arguments, don't write to it. @@ -4115,12 +4110,12 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig for(j = 0; j < MAX_REG_INPUT; j++) { - if (!sig[j].semantic_name) continue; + if (!ps_input_sig[j].semantic_name) continue; - if (!strcmp(sig[j].semantic_name, semantic_name) - && sig[j].semantic_idx == shader->output_signature[i].semantic_idx) + if (!strcmp(ps_input_sig[j].semantic_name, semantic_name) + && ps_input_sig[j].semantic_idx == shader->output_signature[i].semantic_idx) { - priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx]; + priv_ctx->vs_output[i] = decl_idx_to_string[ps_input_sig[j].register_idx]; if (!strcmp(priv_ctx->vs_output[i], "result.color.primary") || !strcmp(priv_ctx->vs_output[i], "result.color.secondary")) @@ -4135,7 +4130,8 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig /* Context activation is done by the caller. */ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, - const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) + const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled, + const struct wined3d_shader_signature_element *ps_input_sig) { const struct arb_vshader_private *shader_data = shader->backend_data; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; @@ -4150,7 +4146,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); - init_output_registers(shader, args->ps_signature, &priv_ctx, compiled); + init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -4387,7 +4383,8 @@ static inline BOOL vs_args_equal(const struct arb_vs_compile_args *stored, const } static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *shader, - const struct arb_vs_compile_args *args) + const struct arb_vs_compile_args *args, + const struct wined3d_shader_signature_element *ps_input_sig) { struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -4465,7 +4462,8 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } ret = shader_arb_generate_vshader(shader, gl_info, &buffer, args, - &shader_data->gl_shaders[shader_data->num_gl_shaders]); + &shader_data->gl_shaders[shader_data->num_gl_shaders], + ps_input_sig); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret; @@ -4688,10 +4686,20 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 struct wined3d_shader *vs = state->vertex_shader; struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; + const struct wined3d_shader_signature_element *ps_input_sig; TRACE("Using vertex shader %p\n", vs); find_arb_vs_compile_args(state, context, vs, &compile_args); - compiled = find_arb_vshader(vs, &compile_args); + + /* Instead of searching for the signature in the signature list, read the one from the + * current pixel shader. It's maybe not the shader where the signature came from, but it + * is the same signature and faster to find. */ + if (compile_args.ps_signature == ~0U) + ps_input_sig = NULL; + else + ps_input_sig = state->pixel_shader->input_signature; + + compiled = find_arb_vshader(vs, &compile_args, ps_input_sig); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled;

1 0

Jacek Caban : ole32: Error handling clean up in local_server_thread.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: b4cc5a2114592a5e336ba353688f04db6da0bdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cc5a2114592a5e336ba3536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:31:31 2013 +0200 ole32: Error handling clean up in local_server_thread. --- dlls/ole32/rpc.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5070117..6259380 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1917,16 +1917,12 @@ static DWORD WINAPI local_server_thread(LPVOID param) DWORD ret; ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) - { - CloseHandle(hPipe); break; - } } /* client already connected isn't an error */ else if (error != ERROR_PIPE_CONNECTED) { ERR("ConnectNamedPipe failed with error %d\n", GetLastError()); - CloseHandle(hPipe); break; } } @@ -1935,20 +1931,14 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) - { - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; - } + break; seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; + break; } buflen = ststg.cbSize.u.LowPart; @@ -1957,10 +1947,8 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Read(pStm,buffer,buflen,&res); if (hres) { FIXME("Stream Read failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); HeapFree(GetProcessHeap(),0,buffer); - return hres; + break; } WriteFile(hPipe,buffer,buflen,&res,&ovl); @@ -1974,22 +1962,22 @@ static DWORD WINAPI local_server_thread(LPVOID param) if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); - CloseHandle(hPipe); break; } new_pipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - CloseHandle(hPipe); if (new_pipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; + break; } + CloseHandle(hPipe); hPipe = new_pipe; } + CloseHandle(pipe_event); + CloseHandle(hPipe); return 0; }

1 0

Huw Davies : user32/tests: Add tests to show that WM_CHAR W<-> A mapping uses the codepage associated with the current keyboard layout.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: d3fec2ce9c5d0b7ae42f4cc85736fdfd8db4bab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fec2ce9c5d0b7ae42f4cc85… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 13 12:28:43 2013 +0100 user32/tests: Add tests to show that WM_CHAR W<->A mapping uses the codepage associated with the current keyboard layout. --- dlls/user32/tests/msg.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d88dc7e..3a857e8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11900,6 +11900,93 @@ static void test_dbcs_wm_char(void) DestroyWindow(hwnd2); } +static void test_unicode_wm_char(void) +{ + HWND hwnd; + MSG msg; + struct message seq[2]; + HKL hkl_orig, hkl_greek; + DWORD cp; + LCID thread_locale; + + hkl_orig = GetKeyboardLayout( 0 ); + GetLocaleInfoW( LOWORD( hkl_orig ), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR*)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (cp != 1252) + { + skip( "Default codepage %d\n", cp ); + return; + } + + hkl_greek = LoadKeyboardLayout( "00000408", 0 ); + if (!hkl_greek || hkl_greek == hkl_orig /* win2k */) + { + skip( "Unable to load Greek keyboard layout\n" ); + return; + } + + hwnd = CreateWindowExW( 0, testWindowClassW, NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL ); + flush_sequence(); + + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageW( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x3b1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageW( &msg ); + + memset( seq, 0, sizeof(seq) ); + seq[0].message = WM_CHAR; + seq[0].flags = sent|wparam; + seq[0].wParam = 0x3b1; + + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + flush_sequence(); + + /* greek alpha -> 'a' in cp1252 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x61, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x61; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + thread_locale = GetThreadLocale(); + ActivateKeyboardLayout( hkl_greek, 0 ); + ok( GetThreadLocale() == thread_locale, "locale changed from %08x to %08x\n", + thread_locale, GetThreadLocale() ); + + flush_sequence(); + + /* greek alpha -> 0xe1 in cp1253 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0xe1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x3b1; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + DestroyWindow( hwnd ); + ActivateKeyboardLayout( hkl_orig, 0 ); + UnloadKeyboardLayout( hkl_greek ); +} + #define ID_LISTBOX 0x000f static const struct message wm_lb_setcursel_0[] = @@ -14124,6 +14211,7 @@ START_TEST(msg) test_EndDialog(); test_nullCallback(); test_dbcs_wm_char(); + test_unicode_wm_char(); test_menu_messages(); test_paintingloop(); test_defwinproc();

1 0

André Hentschel : po: Fix typo in German translation.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: a3a1913373a730287298f74abef941bb41ff9ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a1913373a730287298f74ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 13 19:37:01 2013 +0200 po: Fix typo in German translation. --- po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 8b28f26..7728925 100644 --- a/po/de.po +++ b/po/de.po @@ -10502,7 +10502,7 @@ msgstr "Unbekannte Protokolle" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "TCP-Statisktik für IPv4" +msgstr "TCP-Statistik für IPv4" #: netstat.rc:42 msgid "Active Opens"

1 0