June 2011 - Wine-commits - list.winehq.org

Piotr Caban : comctl32: Improved setting button state.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: d2c9a5cfae5251ba03cf6ff639012a2a9216a39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c9a5cfae5251ba03cf6ff63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:59 2011 +0200 comctl32: Improved setting button state. --- dlls/comctl32/theme_button.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 488c751..90e1172 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -246,18 +246,26 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - ButtonState drawState = IsWindowEnabled(hwnd) ? STATE_NORMAL : STATE_DISABLED; + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if (paint) + if(!paint) + return FALSE; + + if(IsWindowEnabled(hwnd)) { - hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); - if (!hParamDC) EndPaint(hwnd, &ps); - return TRUE; + if(state & BST_PUSHED) drawState = STATE_PRESSED; + else if(state & BST_HOT) drawState = STATE_HOT; + else if(state & BST_FOCUS) drawState = STATE_DEFAULTED; + else drawState = STATE_NORMAL; } + else drawState = STATE_DISABLED; - return FALSE; /* Delegate drawing to the non-themed code. */ + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + paint(theme, hwnd, hDC, drawState, dtFlags); + if (!hParamDC) EndPaint(hwnd, &ps); + return TRUE; } /**********************************************************************

1 0

Piotr Caban : comctl32: Make themed button hot when mouse is over it.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7d17bc55ebd93d50195753994d998ef51564c404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d17bc55ebd93d50195753994… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:22:26 2011 +0200 comctl32: Make themed button hot when mouse is over it. --- dlls/comctl32/theme_button.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 90e1172..01f16fb 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -317,6 +317,37 @@ LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + case WM_MOUSEMOVE: + { + TRACKMOUSEEVENT mouse_event; + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hwnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + break; + } + + case WM_MOUSEHOVER: + { + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hwnd, 0, state|BST_HOT); + InvalidateRect(hwnd, NULL, FALSE); + break; + } + + case WM_MOUSELEAVE: + { + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hwnd, 0, state&(~BST_HOT)); + InvalidateRect(hwnd, NULL, FALSE); + break; + } + default: /* Call old proc */ return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam);

1 0

Piotr Caban : comctl32: Prevent double theme closing when WM_DESTROY is called many times.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7e3103199cc8e115e0828bcad9441a5b940e4b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3103199cc8e115e0828bcad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:22:40 2011 +0200 comctl32: Prevent double theme closing when WM_DESTROY is called many times. --- dlls/comctl32/theme_dialog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 915db07..cdca2dd 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -54,7 +54,9 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, case WM_DESTROY: CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + SetWindowTheme( hWnd, NULL, NULL ); + OpenThemeData( hWnd, NULL ); + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); case WM_THEMECHANGED: CloseThemeData ( theme );

1 0

Alexandre Julliard : msvcp90: Make sure an exported variable is initialized .
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 75c70dcd775db345fb5c2a8c83aa7385591151ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c70dcd775db345fb5c2a8c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 27 15:07:30 2011 -0500 msvcp90: Make sure an exported variable is initialized. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6875144..563c366 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -51,7 +51,7 @@ int locale_id__Id_cnt = 0; /* ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A */ /* ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ -locale__Locimp *locale__Locimp__Clocptr; +locale__Locimp *locale__Locimp__Clocptr = NULL; static const vtable_ptr MSVCP_locale_facet_vtable[];

1 0

Aric Stewart : usp10: Restart Indic syllable processing immediately after malformed syllable.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: cf40ef178e6cb8da6efc552409f03d07dddaef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40ef178e6cb8da6efc55240… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 27 11:00:58 2011 -0500 usp10: Restart Indic syllable processing immediately after malformed syllable. --- dlls/usp10/indic.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index f3b7f3a..43bf0e5 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -353,16 +353,8 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L } else if (index < cChar) { - int i; TRACE("Processing failed at %i\n",index); - for (i = index; i < cChar; i++) - if (lex(input[i])==lex_Generic) - { - TRACE("Restart processing at %i\n",i); - next = i; - index = i; - break; - } + next = ++index; } } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count);

1 0

Dylan Smith : d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 3d7af6a334eadc6f207e97e5eb0a4a65eb67a603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7af6a334eadc6f207e97e5e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jun 25 14:32:16 2011 -0400 d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN. --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c96b94e..98d77d9 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4809,7 +4809,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; + exp_weights[1] = 0.0f / 0.0f; /* NAN */ num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights); @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) for (i = 0; i < num_influences; i++) { ok(exp_vertices[i] == vertices[i], "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); - ok(exp_weights[i] == weights[i], + ok((isnan(exp_weights[i]) && isnan(weights[i])) || exp_weights[i] == weights[i], "influence[%d]: expected weights %g, got %g\n", i, exp_weights[i], weights[i]); }

1 0

Detlef Riekenberg : jscript: Support also VT_UI4 in debugstr_variant.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 738120efa2d45253863363a2d84e244eb3ca2bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=738120efa2d45253863363a2d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 26 18:28:27 2011 +0200 jscript: Support also VT_UI4 in debugstr_variant. --- dlls/jscript/jsutils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 341b928..d795e7d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -41,6 +41,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_NULL}"; case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_UI4: + return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Huw Davies : gdi32: Fix the 8 bpp generated colour table.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: bc653ce20485c0e76fa16cddbf463c525b878bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc653ce20485c0e76fa16cddb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 27 13:26:42 2011 +0100 gdi32: Fix the 8 bpp generated colour table. --- dlls/gdi32/dib.c | 25 ++++++++----------------- dlls/gdi32/tests/bitmap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 07aa609..962a1aa 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -456,7 +456,7 @@ static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palet { 0xf0, 0xfb, 0xff, 0x00 }, { 0xa4, 0xa0, 0xa0, 0x00 }, { 0x80, 0x80, 0x80, 0x00 }, - { 0x00, 0x00, 0xf0, 0x00 }, + { 0x00, 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0x00, 0x00 }, { 0x00, 0xff, 0xff, 0x00 }, { 0xff, 0x00, 0x00, 0x00 }, @@ -639,24 +639,15 @@ INT WINAPI GetDIBits( break; case 8: - { - INT r, g, b; - RGBQUAD *color; - memcpy(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); memcpy(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; - for(r = 0; r <= 5; r++) /* FIXME */ - for(g = 0; g <= 5; g++) - for(b = 0; b <= 5; b++) { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } - + for (i = 10; i < 246; i++) + { + rgbQuads[i].rgbRed = (i & 0x07) << 5; + rgbQuads[i].rgbGreen = (i & 0x38) << 2; + rgbQuads[i].rgbBlue = i & 0xc0; + rgbQuads[i].rgbReserved = 0; + } } } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d21d502..e107d7b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1534,6 +1534,7 @@ static void test_GetDIBits(void) BYTE buf[1024]; char bi_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; BITMAPINFO *bi = (BITMAPINFO *)bi_buf; + PALETTEENTRY pal_ents[32]; hdc = GetDC(0); @@ -1722,6 +1723,50 @@ todo_wine for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]); + /* retrieve 8-bit DIB data */ + memset(bi, 0, sizeof(*bi)); + bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi->bmiHeader.biWidth = bm.bmWidth; + bi->bmiHeader.biHeight = bm.bmHeight; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biBitCount = 8; + bi->bmiHeader.biCompression = BI_RGB; + bi->bmiHeader.biSizeImage = 0; + memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); + memset(buf, 0xAA, sizeof(buf)); + SetLastError(0xdeadbeef); + lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); + ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", + lines, bm.bmHeight, GetLastError()); + + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 32, pal_ents ); + + for (i = 0; i < 256; i++) + { + RGBQUAD expect; + + if (i < 10 || i >= 246) + { + int entry = i < 10 ? i : i - 236; + expect.rgbRed = pal_ents[entry].peRed; + expect.rgbGreen = pal_ents[entry].peGreen; + expect.rgbBlue = pal_ents[entry].peBlue; + } + else + { + expect.rgbRed = (i & 0x07) << 5; + expect.rgbGreen = (i & 0x38) << 2; + expect.rgbBlue = i & 0xc0; + } + expect.rgbReserved = 0; + + ok(!memcmp(bi->bmiColors + i, &expect, sizeof(expect)), + "expected bmiColors[%d] %x %x %x %x - got %x %x %x %x\n", i, + expect.rgbRed, expect.rgbGreen, expect.rgbBlue, expect.rgbReserved, + bi->bmiColors[i].rgbRed, bi->bmiColors[i].rgbGreen, + bi->bmiColors[i].rgbBlue, bi->bmiColors[i].rgbReserved); + } + /* retrieve 24-bit DIB data */ memset(bi, 0, sizeof(*bi)); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

Jacek Caban : include: Added wpcapi.idl.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 811c3591c801d52a363e7ce2aee9a7c298f12284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811c3591c801d52a363e7ce2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 24 19:37:16 2011 +0200 include: Added wpcapi.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/wpcapi.idl | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index aa3abb0..aa73888 100644 --- a/.gitignore +++ b/.gitignore @@ -243,6 +243,7 @@ include/wine/itss.h include/wine/svcctl.h include/wine/winedxgi.h include/winsxs.h +include/wpcapi.h include/wtypes.h include/wuapi.h include/xmllite.h diff --git a/include/Makefile.in b/include/Makefile.in index 383b674..9c94a23 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ PUBLIC_IDL_H_SRCS = \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ + wpcapi.idl \ wtypes.idl \ wuapi.idl \ xmllite.idl diff --git a/include/wpcapi.idl b/include/wpcapi.idl new file mode 100644 index 0000000..19c5256 --- /dev/null +++ b/include/wpcapi.idl @@ -0,0 +1,107 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + uuid(8fdf6ca1-0189-47e4-b670-1a8a4636e340), + object +] +interface IWPCSettings : IUnknown +{ + HRESULT IsLoggingRequired( + [out] BOOL *pfRequired); + + HRESULT GetLastSettingsChangeTime( + [out] SYSTEMTIME *pTime) ; + + HRESULT GetRestrictions( + [out] DWORD *pdwRestrictions); +} + +[ + uuid(95e87780-e158-489e-b452-bbb850790715), + object +] +interface IWPCGamesSettings : IWPCSettings +{ + HRESULT IsBlocked( + [in] GUID guidAppID, + [out] DWORD *pdwReasons); +} + +[ + uuid(ffccbdb8-0992-4c30-b0f1-1cbb09c240aa), + object +] +interface IWPCWebSettings : IWPCSettings +{ + typedef enum tagWPCFLAG_WEB_SETTING { + WPCFLAG_WEB_SETTING_NOTBLOCKED = 0, + WPCFLAG_WEB_SETTING_DOWNLOADSBLOCKED = 1 + } WPCFLAG_WEB_SETTING; + + HRESULT GetSettings( + [out] DWORD *pdwSettings); + + HRESULT RequestURLOverride( + [in] HWND hWnd, + [in] LPCWSTR pcszURL, + [in] DWORD cURLs, + [in] LPCWSTR *ppcszSubURLs, + [out] BOOL *pfChanged); +} + +typedef enum tagWPCFLAG_VISIBILITY { + WPCFLAG_WPC_VISIBLE = 0, + WPCFLAG_WPC_HIDDEN = 1 +} WPCFLAG_VISIBILITY; + +[ + uuid(4FF40A0F-3F3B-4d7c-A41B-4F39D7B44D05), + object +] +interface IWindowsParentalControlsCore : IUnknown +{ + HRESULT GetVisibility( + [out] WPCFLAG_VISIBILITY *peVisibility) ; + + HRESULT GetUserSettings( + [in] LPCWSTR pcszSID, + [out] IWPCSettings **ppSettings); + + HRESULT GetWebSettings( + [in] LPCWSTR pcszSID, + [out] IWPCWebSettings **ppSettings); + + HRESULT GetWebFilterInfo( + [out] GUID *pguidID, + [in] LPWSTR *ppszName); +} + +[ + uuid(4ff40a0f-3f3b-4d7c-a41b-4f39d7b44d05), + object +] +interface IWindowsParentalControls : IWindowsParentalControlsCore +{ + HRESULT GetGamesSettings( + [in] LPCWSTR pcszSID, + [out] IWPCGamesSettings **ppSettings) ; +}

1 0

Jacek Caban : widl: Insert standard windows.h and ole2. h includes to generated headers.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 63d5462ced7e8ed936beb723e80fd40155880d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d5462ced7e8ed936beb723e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 24 19:34:54 2011 +0200 widl: Insert standard windows.h and ole2.h includes to generated headers. --- tools/widl/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9d12696..4dee484 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1338,6 +1338,11 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" ); + fprintf(header, "#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)\n"); + fprintf(header, "#include <windows.h>\n"); + fprintf(header, "#include <ole2.h>\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#ifndef __WIDL_%s\n", header_token); fprintf(header, "#define __WIDL_%s\n\n", header_token);

1 0