May 2008 - Wine-Commits - list.winehq.org

Ken Thomases : winex11: Bias MapVirtualKeyEx(MAPVK_VSC_TO_VK) against numpad vkeys.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: c2bc0e21a2dbca935ef0a80e9e09a3ab301a128d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bc0e21a2dbca935ef0a80e9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 16 10:37:07 2008 -0500 winex11: Bias MapVirtualKeyEx(MAPVK_VSC_TO_VK) against numpad vkeys. The scan codes for the numeric keypad keys and those for the arrow keys and keys like Home, End, etc. often match (ignoring the extended key bit). However, if you map from one of those scan codes to a vkey, Windows reliably prefers the non-numpad vkey. --- dlls/user32/tests/input.c | 28 ++++++++++++++++++++++++++++ dlls/winex11.drv/keyboard.c | 14 ++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index dd597d8..e5ac852 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1115,6 +1115,18 @@ static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); UINT kL, kR, s, sL; + int i; + static const UINT numpad_collisions[][2] = { + { VK_NUMPAD0, VK_INSERT }, + { VK_NUMPAD1, VK_END }, + { VK_NUMPAD2, VK_DOWN }, + { VK_NUMPAD3, VK_NEXT }, + { VK_NUMPAD4, VK_LEFT }, + { VK_NUMPAD6, VK_RIGHT }, + { VK_NUMPAD7, VK_HOME }, + { VK_NUMPAD8, VK_UP }, + { VK_NUMPAD9, VK_PRIOR }, + }; s = MapVirtualKeyEx(VK_SHIFT, MAPVK_VK_TO_VSC, kl); ok(s != 0, "MapVirtualKeyEx(VK_SHIFT) should return non-zero\n"); @@ -1130,6 +1142,22 @@ static void test_key_map(void) ok(kL == VK_LSHIFT, "Scan code -> vKey = %x (not VK_LSHIFT)\n", kL); kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK_EX, kl); ok(kR == VK_RSHIFT, "Scan code -> vKey = %x (not VK_RSHIFT)\n", kR); + + /* test that MAPVK_VSC_TO_VK prefers the non-numpad vkey if there's ambiguity */ + for (i = 0; i < sizeof(numpad_collisions)/sizeof(numpad_collisions[0]); i++) + { + UINT numpad_scan = MapVirtualKeyEx(numpad_collisions[i][0], MAPVK_VK_TO_VSC, kl); + UINT other_scan = MapVirtualKeyEx(numpad_collisions[i][1], MAPVK_VK_TO_VSC, kl); + + /* do they really collide for this layout? */ + if (numpad_scan && other_scan == numpad_scan) + { + UINT vkey = MapVirtualKeyEx(numpad_scan, MAPVK_VSC_TO_VK, kl); + ok(vkey != numpad_collisions[i][0], + "Got numpad vKey %x for scan code %x when there was another choice\n", + vkey, numpad_scan); + } + } } START_TEST(input) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 981e4df..d10dc46 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2082,19 +2082,25 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) case MAPVK_VSC_TO_VK_EX: { int keyc; - UINT vkey; + UINT vkey = 0; /* let's do scan -> keycode -> vkey */ for (keyc = min_keycode; keyc <= max_keycode; keyc++) - if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) break; + if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) + { + vkey = keyc2vkey[keyc] & 0xFF; + /* Only stop if it's not a numpad vkey; otherwise keep + looking for a potential better vkey. */ + if (vkey && (vkey < VK_NUMPAD0 || VK_DIVIDE < vkey)) + break; + } - if (keyc > max_keycode) + if (vkey == 0) { TRACE("returning no vkey-code.\n"); return 0; } - vkey = keyc2vkey[keyc] & 0xFF; if (wMapType == MAPVK_VSC_TO_VK) switch (vkey) {

1 0

Alexandre Julliard : kernel32: Add some test cases for profile file sharing modes.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 1dcaddee9922a1a4e8cd0719b79530b2e7dbaab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcaddee9922a1a4e8cd0719b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 14:23:44 2008 +0200 kernel32: Add some test cases for profile file sharing modes. Based on a patch by Louis Lenders. --- dlls/kernel32/tests/profile.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8611c11..54ad6da 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -29,6 +29,7 @@ #define SECTION "Test" #define TESTFILE ".\\testwine.ini" #define TESTFILE2 ".\\testwine2.ini" +#define TESTFILE3 ".\\testwine3.ini" struct _profileInt { LPCSTR section; @@ -266,10 +267,63 @@ static void test_profile_sections_names(void) ok( bufW[1] != 0, "returned buffer terminated with double-null\n" ); } +/* If the ini-file has already been opened with CreateFile, WritePrivateProfileString failed in wine with an error ERROR_SHARING_VIOLATION, some testing here */ +static void test_profile_existing(void) +{ + static const struct { + DWORD dwDesiredAccess; + DWORD dwShareMode; + DWORD error; + } pe[] = { + {GENERIC_READ, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, + {GENERIC_READ, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, + {GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, + {GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION}, + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION}, + {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, + {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, + /*Thief demo (bug 5024) opens .ini file like this*/ + {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0}, + }; + + int i; + BOOL ret; + DWORD size; + HANDLE h = 0; + char buffer[MAX_PATH]; + + for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) + { + h = CreateFile(TESTFILE3, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); + SetLastError(0xdeadbeef); + ret = WritePrivateProfileString(SECTION, KEY, "12345", TESTFILE3); + if (!pe[i].error) + { + ok( ret, "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); + CloseHandle(h); + size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, TESTFILE3); + ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); + } + else + { + DWORD err = GetLastError(); + ok( !ret, "%d: WritePrivateProfileString succeeded\n", i ); + if (!ret) ok( err == pe[i].error, "%d: WritePrivateProfileString failed with error %u/%u\n", i, err, pe[i].error ); + CloseHandle(h); + size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, TESTFILE3); + ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size ); + } + ok( DeleteFile(TESTFILE3), "delete failed\n" ); + } +} + START_TEST(profile) { test_profile_int(); test_profile_string(); test_profile_sections(); test_profile_sections_names(); + test_profile_existing(); }

1 0

Alexandre Julliard : kernel32: Fix the profile file sharing modes.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 8b97263daee7f17fdb2e9f47e654096c6d82aed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b97263daee7f17fdb2e9f47e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 14:23:29 2008 +0200 kernel32: Fix the profile file sharing modes. Based on a patch by Louis Lenders. --- dlls/kernel32/profile.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index f58a989..a412e1e 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -666,7 +666,8 @@ static BOOL PROFILE_FlushFile(void) if (!CurProfile->changed) return TRUE; - hFile = CreateFileW(CurProfile->filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(CurProfile->filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -752,9 +753,10 @@ static BOOL PROFILE_Open( LPCWSTR filename ) } TRACE("path: %s\n", debugstr_w(buffer)); - - hFile = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - + + hFile = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND)) { WARN("Error %d opening file %s\n", GetLastError(), debugstr_w(buffer));

1 0

wiki/winehq winehq.py
by Dimi Paun May 21, 2008

May 21, 2008

ChangeSet ID: 1211382831615523716042848 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2008/05/21 08:13:51 Modified files: winehq : winehq.py Log message: Rico Schüller <kgbricola(a)web.de> Add the Wine Forum link to the WineHQ Menu in the wiki. Old revision New revision Changes Path 1.5 1.6 +1 -0 wiki/winehq/winehq.py Index: wiki/winehq/winehq.py diff -u -p wiki/winehq/winehq.py:1.5 wiki/winehq/winehq.py:1.6 --- wiki/winehq/winehq.py 21 May 2008 15:13:51 -0000 +++ /dev/null 21 May 2008 15:13:51 -0000 @@ -283,6 +283,7 @@ searchBlur(e); u' <li class="wikilink"><a href="http://appdb.winehq.org/">AppDB</a></li>', u' <li class="wikilink"><a href="http://bugs.winehq.org/">Bugzilla</a></li>', u' <li class="wikilink"><a href="http://wiki.winehq.org/">Wine Wiki</a></li>', + u' <li class="wikilink"><a href="http://forum.winehq.org/">Wine Forums</a></li>', u' </ul>', u' </div>', u'</div>',

1 0

Alexandre Julliard : user32: Add an ASCII window procedure for scrollbars.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 79b64fdc83619c1c1defdc2e01cc337c627d10a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b64fdc83619c1c1defdc2e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 11:44:05 2008 +0200 user32: Add an ASCII window procedure for scrollbars. --- dlls/user32/scroll.c | 32 +++++++++++++++++++++++++++----- dlls/user32/tests/class.c | 3 ++- dlls/user32/winproc.c | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 6f52754..ddfacd6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -108,7 +108,8 @@ static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, INT thumbSize, INT thumbPos, UINT flags, BOOL vertical, BOOL top_selected, BOOL bottom_selected ); -static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); /********************************************************************* @@ -119,8 +120,8 @@ const struct builtin_class_descr SCROLL_builtin_class = { scrollbarW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - NULL, /* procA (winproc is Unicode only) */ - ScrollBarWndProc, /* procW */ + ScrollBarWndProcA, /* procA */ + ScrollBarWndProcW, /* procW */ sizeof(SCROLLBAR_INFO), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -1371,7 +1372,7 @@ static BOOL SCROLL_SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal) /*********************************************************************** * ScrollBarWndProc */ -static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +static LRESULT ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { if (!IsWindow( hwnd )) return 0; @@ -1550,12 +1551,33 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam, if (message >= WM_USER) WARN("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam ); - return DefWindowProcW( hwnd, message, wParam, lParam ); + if (unicode) + return DefWindowProcW( hwnd, message, wParam, lParam ); + else + return DefWindowProcA( hwnd, message, wParam, lParam ); } return 0; } +/*********************************************************************** + * ScrollBarWndProcA + */ +static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return ScrollBarWndProc( hwnd, message, wParam, lParam, FALSE ); +} + + +/*********************************************************************** + * ScrollBarWndProcW + */ +static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return ScrollBarWndProc( hwnd, message, wParam, lParam, TRUE ); +} + + /************************************************************************* * SetScrollInfo (USER32.@) * diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 486e227..8412e8b 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -570,13 +570,14 @@ static void test_instances(void) static void test_builtinproc(void) { - /* Edit behaves differently. ScrollBar have currently only a Unicode winproc */ + /* Edit behaves differently */ static const CHAR NORMAL_CLASSES[][10] = { "Button", "Static", "ComboBox", "ComboLBox", "ListBox", + "ScrollBar", "#32770", /* dialog */ }; static const int NUM_NORMAL_CLASSES = (sizeof(NORMAL_CLASSES)/sizeof(NORMAL_CLASSES[0])); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 6c85d91..6de86e8 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -52,7 +52,7 @@ typedef struct tagWINDOWPROC #define WINPROC_HANDLE (~0UL >> 16) #define MAX_WINPROCS 8192 -#define BUILTIN_WINPROCS 8 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ +#define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ WNDPROC EDIT_winproc_handle = 0;

1 0

Dmitry Timoshkov : kernel32: Update locale info for Esperanto.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 248cc53d865b231f43a65ca338260cf906c51394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248cc53d865b231f43a65ca33… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 21 18:39:13 2008 +0900 kernel32: Update locale info for Esperanto. --- dlls/kernel32/nls/eox.nls | 64 ++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 10a967f..4b263d8 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -39,41 +39,41 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"" LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"" + LOCALE_ICENTURY L"0" LOCALE_ICOUNTRY L"" - LOCALE_ICURRDIGITS L"" + LOCALE_ICURRDIGITS L"2" LOCALE_ICURRENCY L"3" LOCALE_IDATE L"1" LOCALE_IDAYLZERO L"" - LOCALE_IDEFAULTANSICODEPAGE L"" - LOCALE_IDEFAULTCODEPAGE L"" + LOCALE_IDEFAULTANSICODEPAGE L"0" + LOCALE_IDEFAULTCODEPAGE L"1" LOCALE_IDEFAULTCOUNTRY L"" - LOCALE_IDEFAULTEBCDICCODEPAGE L"" + LOCALE_IDEFAULTEBCDICCODEPAGE L"500" LOCALE_IDEFAULTLANGUAGE L"048f" - LOCALE_IDEFAULTMACCODEPAGE L"" - LOCALE_IDEFAULTUNIXCODEPAGE L"" + LOCALE_IDEFAULTMACCODEPAGE L"2" + LOCALE_IDEFAULTUNIXCODEPAGE L"65001" LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"" - LOCALE_IFIRSTDAYOFWEEK L"" - LOCALE_IFIRSTWEEKOFYEAR L"" - LOCALE_IINTLCURRDIGITS L"" + LOCALE_IDIGITSUBSTITUTION L"1" + LOCALE_IFIRSTDAYOFWEEK L"0" + LOCALE_IFIRSTWEEKOFYEAR L"0" + LOCALE_IINTLCURRDIGITS L"2" LOCALE_ILANGUAGE L"048f" - LOCALE_ILDATE L"" + LOCALE_ILDATE L"1" LOCALE_ILZERO L"1" LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"" + LOCALE_IMONLZERO L"0" LOCALE_INEGCURR L"8" - LOCALE_INEGNUMBER L"" - LOCALE_INEGSEPBYSPACE L"" - LOCALE_INEGSIGNPOSN L"" - LOCALE_INEGSYMPRECEDES L"" - LOCALE_IOPTIONALCALENDAR L"" - LOCALE_IPAPERSIZE L"" - LOCALE_IPOSSEPBYSPACE L"" - LOCALE_IPOSSIGNPOSN L"" - LOCALE_IPOSSYMPRECEDES L"" + LOCALE_INEGNUMBER L"1" + LOCALE_INEGSEPBYSPACE L"1" + LOCALE_INEGSIGNPOSN L"1" + LOCALE_INEGSYMPRECEDES L"0" + LOCALE_IOPTIONALCALENDAR L"0" + LOCALE_IPAPERSIZE L"9" + LOCALE_IPOSSEPBYSPACE L"1" + LOCALE_IPOSSIGNPOSN L"1" + LOCALE_IPOSSYMPRECEDES L"0" LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"" + LOCALE_ITIMEMARKPOSN L"0" LOCALE_ITLZERO L"1" LOCALE_S1159 L"" LOCALE_S2359 L"" @@ -111,9 +111,9 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SDAYNAME7 L"diman\x00e6o" LOCALE_SDECIMAL L"," LOCALE_SENGCOUNTRY L"" - LOCALE_SENGCURRNAME L"" + LOCALE_SENGCURRNAME L"Euro" LOCALE_SENGLANGUAGE L"Esperanto" - LOCALE_SGROUPING L"" + LOCALE_SGROUPING L"0;0" LOCALE_SINTLSYMBOL L"EMU" LOCALE_SISO3166CTRYNAME L"" LOCALE_SISO639LANGNAME L"eo" @@ -138,17 +138,17 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP L"." LOCALE_SNAME L"eo" LOCALE_SNATIVECTRYNAME L"" - LOCALE_SNATIVECURRNAME L"" - LOCALE_SNATIVEDIGITS L"" + LOCALE_SNATIVECURRNAME L"Euro" + LOCALE_SNATIVEDIGITS L"0123456789" LOCALE_SNATIVELANGNAME L"Esperanto" - LOCALE_SNEGATIVESIGN L"" + LOCALE_SNEGATIVESIGN L"-" LOCALE_SPOSITIVESIGN L"" - LOCALE_SSHORTDATE L"yyyy.mm.dd" - LOCALE_SSORTNAME L"" + LOCALE_SSHORTDATE L"yyyy-mm-dd" + LOCALE_SSORTNAME L"Default" LOCALE_STHOUSAND L"." LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"" - LOCALE_SYEARMONTH L"" + LOCALE_STIMEFORMAT L"HH:mm:ss" + LOCALE_SYEARMONTH L"MMMM yyyy" LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe"

1 0

Alexandre Julliard : user32: Support creating cursors and icons from DIB section bitmaps.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 0528a2b660f3aa01d274ecae5f2de02d5fb52ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0528a2b660f3aa01d274ecae5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 11:39:38 2008 +0200 user32: Support creating cursors and icons from DIB section bitmaps. --- dlls/user32/cursoricon.c | 76 +++++++++++++++++++++++++++++++++------ dlls/user32/tests/cursoricon.c | 66 ++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index c5d192d..a1ba570 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1790,9 +1790,10 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) */ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { - BITMAP bmpXor,bmpAnd; + DIBSECTION bmpXor; + BITMAP bmpAnd; HICON16 hObj; - int sizeXor,sizeAnd; + int xor_objsize = 0, sizeXor = 0, sizeAnd, planes, bpp; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1800,19 +1801,24 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) if (!iconinfo->hbmMask) return 0; + planes = GetDeviceCaps( screen_dc, PLANES ); + bpp = GetDeviceCaps( screen_dc, BITSPIXEL ); + if (iconinfo->hbmColor) { - GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); + xor_objsize = GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor ); TRACE("color: width %d, height %d, width bytes %d, planes %u, bpp %u\n", - bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, - bmpXor.bmPlanes, bmpXor.bmBitsPixel); + bmpXor.dsBm.bmWidth, bmpXor.dsBm.bmHeight, bmpXor.dsBm.bmWidthBytes, + bmpXor.dsBm.bmPlanes, bmpXor.dsBm.bmBitsPixel); + /* we can use either depth 1 or screen depth for xor bitmap */ + if (bmpXor.dsBm.bmPlanes == 1 && bmpXor.dsBm.bmBitsPixel == 1) planes = bpp = 1; + sizeXor = bmpXor.dsBm.bmHeight * planes * get_bitmap_width_bytes( bmpXor.dsBm.bmWidth, bpp ); } GetObjectW( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd ); TRACE("mask: width %d, height %d, width bytes %d, planes %u, bpp %u\n", bmpAnd.bmWidth, bmpAnd.bmHeight, bmpAnd.bmWidthBytes, bmpAnd.bmPlanes, bmpAnd.bmBitsPixel); - sizeXor = iconinfo->hbmColor ? (bmpXor.bmHeight * bmpXor.bmWidthBytes) : 0; sizeAnd = bmpAnd.bmHeight * get_bitmap_width_bytes(bmpAnd.bmWidth, 1); hObj = GlobalAlloc16( GMEM_MOVEABLE, @@ -1837,11 +1843,11 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) if (iconinfo->hbmColor) { - info->nWidth = bmpXor.bmWidth; - info->nHeight = bmpXor.bmHeight; - info->nWidthBytes = bmpXor.bmWidthBytes; - info->bPlanes = bmpXor.bmPlanes; - info->bBitsPerPixel = bmpXor.bmBitsPixel; + info->nWidth = bmpXor.dsBm.bmWidth; + info->nHeight = bmpXor.dsBm.bmHeight; + info->nWidthBytes = bmpXor.dsBm.bmWidthBytes; + info->bPlanes = planes; + info->bBitsPerPixel = bpp; } else { @@ -1883,7 +1889,53 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) GetBitmapBits( hbmp_mono, sizeAnd, (char*)(info + 1) ); DeleteObject( hbmp_mono ); } - if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); + + if (iconinfo->hbmColor) + { + char *dst_bits = (char*)(info + 1) + sizeAnd; + + if (bmpXor.dsBm.bmPlanes == planes && bmpXor.dsBm.bmBitsPixel == bpp) + GetBitmapBits( iconinfo->hbmColor, sizeXor, dst_bits ); + else + { + BITMAPINFO bminfo; + int dib_width = get_dib_width_bytes( info->nWidth, info->bBitsPerPixel ); + int bitmap_width = get_bitmap_width_bytes( info->nWidth, info->bBitsPerPixel ); + + bminfo.bmiHeader.biSize = sizeof(bminfo); + bminfo.bmiHeader.biWidth = info->nWidth; + bminfo.bmiHeader.biHeight = info->nHeight; + bminfo.bmiHeader.biPlanes = info->bPlanes; + bminfo.bmiHeader.biBitCount = info->bBitsPerPixel; + bminfo.bmiHeader.biCompression = BI_RGB; + bminfo.bmiHeader.biSizeImage = info->nHeight * dib_width; + bminfo.bmiHeader.biXPelsPerMeter = 0; + bminfo.bmiHeader.biYPelsPerMeter = 0; + bminfo.bmiHeader.biClrUsed = 0; + bminfo.bmiHeader.biClrImportant = 0; + + /* swap lines for dib sections */ + if (xor_objsize == sizeof(DIBSECTION)) + bminfo.bmiHeader.biHeight = -bminfo.bmiHeader.biHeight; + + if (dib_width != bitmap_width) /* need to fixup alignment */ + { + char *src_bits = HeapAlloc( GetProcessHeap(), 0, bminfo.bmiHeader.biSizeImage ); + + if (src_bits && GetDIBits( screen_dc, iconinfo->hbmColor, 0, info->nHeight, + src_bits, &bminfo, DIB_RGB_COLORS )) + { + int y; + for (y = 0; y < info->nHeight; y++) + memcpy( dst_bits + y * bitmap_width, src_bits + y * dib_width, bitmap_width ); + } + HeapFree( GetProcessHeap(), 0, src_bits ); + } + else + GetDIBits( screen_dc, iconinfo->hbmColor, 0, info->nHeight, + dst_bits, &bminfo, DIB_RGB_COLORS ); + } + } GlobalUnlock16( hObj ); } return HICON_32(hObj); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 40f3a14..dcac002 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -504,13 +504,14 @@ static void test_CreateIcon(void) static const BYTE bmp_bits[1024]; HICON hIcon; HBITMAP hbmMask, hbmColor; + BITMAPINFO bmpinfo; ICONINFO info; HDC hdc; + void *bits; UINT display_bpp; hdc = GetDC(0); display_bpp = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); /* these crash under XP hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, NULL); @@ -581,6 +582,69 @@ static void test_CreateIcon(void) DeleteObject(hbmMask); DeleteObject(hbmColor); + + /* test creating an icon from a DIB section */ + + memset( &bmpinfo, 0, sizeof(bmpinfo) ); + bmpinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmpinfo.bmiHeader.biWidth = 32; + bmpinfo.bmiHeader.biHeight = 32; + bmpinfo.bmiHeader.biPlanes = 1; + bmpinfo.bmiHeader.biBitCount = 8; + bmpinfo.bmiHeader.biCompression = BI_RGB; + hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + bmpinfo.bmiHeader.biBitCount = 1; + hbmMask = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmColor; + info.hbmColor = hbmMask; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 32, 32, 8); + DestroyIcon(hIcon); + DeleteObject(hbmColor); + + bmpinfo.bmiHeader.biBitCount = 16; + hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmColor; + info.hbmColor = hbmMask; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 32, 32, 8); + DestroyIcon(hIcon); + DeleteObject(hbmColor); + + bmpinfo.bmiHeader.biBitCount = 32; + hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + + info.fIcon = TRUE; + info.xHotspot = 8; + info.yHotspot = 8; + info.hbmMask = hbmColor; + info.hbmColor = hbmMask; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 32, 32, 8); + DestroyIcon(hIcon); + + DeleteObject(hbmMask); + DeleteObject(hbmColor); + + ReleaseDC(0, hdc); } /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */

1 0

Hwang YunSong(황윤성) : regedit: Updated Korean resource.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 1db3aa0be5b56f019bb30411d2210772dcc2c5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db3aa0be5b56f019bb30411d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed May 21 09:54:19 2008 +0900 regedit: Updated Korean resource. --- programs/regedit/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index b26ee4f..883243a 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -110,6 +110,7 @@ BEGIN MENUITEM "��(&D)\tDel", ID_EDIT_DELETE MENUITEM "�̸� �ٲٱ�(&R)\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "��(&E) . . .", ID_EDIT_EXPORT MENUITEM "Ű �̸� ��(&C)", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "ã��(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0

Dan Kegel : d3d9/tests: Another wee bit of slop.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 83da377494a6dfa710088b53c7791ebc0b4b62b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83da377494a6dfa710088b53c… Author: Dan Kegel <dank(a)kegel.com> Date: Tue May 20 21:26:35 2008 -0700 d3d9/tests: Another wee bit of slop. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2add48e..d7db4a3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6370,7 +6370,7 @@ out: /* Return true if color is near the expected value */ static int color_near(DWORD color, DWORD expected) { - const BYTE slop = 1; + const BYTE slop = 2; BYTE r, g, b; BYTE rx, gx, bx;

1 0

James Hawkins : setupapi: Fix a few test failures in win2k3.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 5a701ab6b4832598e4537c55b2d3cd30742a96fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a701ab6b4832598e4537c55b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 20:32:40 2008 -0500 setupapi: Fix a few test failures in win2k3. --- dlls/setupapi/tests/devinst.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 727e454..f64d9b4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -804,8 +804,9 @@ static void testDevRegKey(void) DIREG_DRV, 0); todo_wine ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == ERROR_ACCESS_DENIED), /* win2k3 */ + "Expected ERROR_INVALID_DATA or ERROR_ACCESS_DENIED, got %08x\n", GetLastError()); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", @@ -914,12 +915,11 @@ static void testDeviceRegistryPropertyA() todo_wine ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); + /* GetLastError() returns nonsense in win2k3 */ ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, 0); todo_wine - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); SetLastError(0xdeadbeef); ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, (PBYTE)friendlyName, buflen); @@ -937,11 +937,10 @@ static void testDeviceRegistryPropertyA() todo_wine ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); + /* GetLastError() returns nonsense in win2k3 */ ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, buflen, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, 0, &size); @@ -1012,12 +1011,11 @@ static void testDeviceRegistryPropertyW() todo_wine ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); + /* GetLastError() returns nonsense in win2k3 */ ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, 0); todo_wine - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); SetLastError(0xdeadbeef); ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, (PBYTE)friendlyName, buflen); @@ -1035,11 +1033,10 @@ static void testDeviceRegistryPropertyW() todo_wine ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); + /* GetLastError() returns nonsense in win2k3 */ ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, buflen, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, NULL, NULL, 0, &size);

1 0