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

Paul Chitescu : user32: Use a safer method of freeing user handles to prevent zeroing out a newly allocated handle .
by Alexandre Julliard 18 Jun '10

18 Jun '10

Module: wine Branch: master Commit: bb6769f4754d5bc8961b62219e20674058546fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6769f4754d5bc8961b62219… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Jun 18 14:09:38 2010 +0300 user32: Use a safer method of freeing user handles to prevent zeroing out a newly allocated handle. --- dlls/user32/win.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4dd8962..cbc949c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -107,7 +107,7 @@ HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) assert( index < NB_USER_HANDLES ); ptr->handle = handle; ptr->type = type; - user_handles[index] = ptr; + InterlockedExchangePointer( &user_handles[index], ptr ); } return handle; } @@ -161,8 +161,8 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) SERVER_START_REQ( free_user_handle ) { req->handle = wine_server_user_handle( handle ); - if (!wine_server_call( req )) user_handles[index] = NULL; - else ptr = NULL; + if (wine_server_call( req )) ptr = NULL; + else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; release_user_handle_ptr( ptr ); @@ -243,7 +243,6 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, index = USER_HANDLE_TO_INDEX(handle); assert( index < NB_USER_HANDLES ); - user_handles[index] = win; win->obj.handle = handle; win->obj.type = USER_WINDOW; win->parent = full_parent; @@ -251,6 +250,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, win->class = class; win->winproc = get_class_winproc( class ); win->cbWndExtra = extra_bytes; + InterlockedExchangePointer( &user_handles[index], win ); if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE; return win; } @@ -271,8 +271,8 @@ static void free_window_handle( HWND hwnd ) SERVER_START_REQ( destroy_window ) { req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) user_handles[index] = NULL; - else ptr = NULL; + if (wine_server_call_err( req )) ptr = NULL; + else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; release_user_handle_ptr( ptr ); @@ -815,7 +815,7 @@ static void destroy_thread_window( HWND hwnd ) if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = (HMENU)wndPtr->wIDmenu; sys_menu = wndPtr->hSysMenu; free_dce( wndPtr->dce, hwnd ); - user_handles[index] = NULL; + InterlockedCompareExchangePointer( &user_handles[index], NULL, wndPtr ); } USER_Unlock();

1 0

Vitaly Lipatov : Update Russian translations.
by Alexandre Julliard 18 Jun '10

18 Jun '10

Module: wine Branch: master Commit: b974852ce154bd0dfd6de6fe67c7ad653b22e545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b974852ce154bd0dfd6de6fe6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Jun 17 19:18:08 2010 +0400 Update Russian translations. --- dlls/avifil32/avifile_Ru.rc | 2 +- dlls/comdlg32/cdlg_Ru.rc | 10 +++++----- dlls/localui/ui_Ru.rc | 2 +- dlls/mshtml/Ru.rc | 2 +- dlls/oledlg/oledlg_Ru.rc | 2 +- dlls/sane.ds/sane_Ru.rc | 2 +- dlls/setupapi/Ru.rc | 2 +- dlls/user32/resources/user32_Ru.rc | 2 +- dlls/wineps.drv/wps_Ru.rc | 2 +- dlls/winmm/winmm_Ru.rc | 4 ++-- dlls/wldap32/wldap32_Ru.rc | 4 ++-- programs/cmd/Ru.rc | 4 ++-- programs/cmdlgtst/Ru.rc | 4 ++-- programs/notepad/Ru.rc | 4 ++-- programs/oleview/Ru.rc | 36 ++++++++++++++++++------------------ programs/progman/Ru.rc | 2 +- programs/regedit/Ru.rc | 2 +- programs/start/Ru.rc | 18 +++++++++--------- programs/taskmgr/Ru.rc | 14 +++++++------- programs/view/Ru.rc | 2 +- programs/wineboot/wineboot_Ru.rc | 2 +- programs/winecfg/Ru.rc | 10 +++++----- programs/winedbg/rsrc_Ru.rc | 2 +- programs/winefile/Ru.rc | 6 +++--- programs/winhlp32/Ru.rc | 2 +- programs/wordpad/Ru.rc | 30 +++++++++++++++--------------- programs/xcopy/Ru.rc | 2 +- 27 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b974852ce154bd0dfd6de…

1 0

Alexandre Julliard : shell32: Flesh out the stub DDE query for Progman groups a little.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 30feb19d1967aad35b3a1eeb7234e995c4296ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30feb19d1967aad35b3a1eeb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 16:08:06 2010 +0200 shell32: Flesh out the stub DDE query for Progman groups a little. --- dlls/shell32/dde.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 129f753..817fd33 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "ddeml.h" #include "shellapi.h" @@ -36,9 +37,17 @@ static HSZ hszAsterisk; static HSZ hszShell; static HSZ hszAppProperties; static HSZ hszFolders; +static HSZ hszGroups; /* DDE Instance ID */ static DWORD dwDDEInst; +static const char *debugstr_hsz( HSZ hsz ) +{ + WCHAR buffer[256]; + if (!DdeQueryStringW( dwDDEInst, hsz, buffer, sizeof(buffer)/sizeof(WCHAR), CP_WINUNICODE )) + return "<unknown>"; + return debugstr_w( buffer ); +} static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) { @@ -55,7 +64,7 @@ static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) static inline void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) { - FIXME("stub\n"); + TRACE( "%p %s %s\n", hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszService) ); } static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) @@ -67,7 +76,13 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem) { - FIXME("stub\n"); + if (hszTopic == hszProgmanTopic && hszItem == hszGroups && uFmt == CF_TEXT) + { + static BYTE groups_data[] = "Accessories\r\nStartup\r\n"; + FIXME( "returning fake program groups list\n" ); + return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 ); + } + FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); return NULL; } @@ -79,7 +94,7 @@ static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) if (!pszCommand) return DDE_FNOTPROCESSED; - FIXME("stub: %s\n", pszCommand); + FIXME("stub: %s %s\n", debugstr_hsz(hszTopic), pszCommand); DdeUnaccessData(hdata); @@ -88,7 +103,7 @@ static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) static inline void Dde_OnDisconnect(HCONV hconv) { - FIXME("stub\n"); + TRACE( "%p\n", hconv ); } static HDDEDATA CALLBACK DdeCallback( @@ -146,6 +161,7 @@ void WINAPI ShellDDEInit(BOOL bInit) static const WCHAR wszAppProperties[] = {'A','p','p','P','r','o','p','e','r','t','i','e','s',0}; static const WCHAR wszFolders[] = {'F','o','l','d','e','r','s',0}; + static const WCHAR wszGroups[] = {'G','r','o','u','p','s',0}; DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); @@ -155,6 +171,7 @@ void WINAPI ShellDDEInit(BOOL bInit) hszShell = DdeCreateStringHandleW(dwDDEInst, wszShell, CP_WINUNICODE); hszAppProperties = DdeCreateStringHandleW(dwDDEInst, wszAppProperties, CP_WINUNICODE); hszFolders = DdeCreateStringHandleW(dwDDEInst, wszFolders, CP_WINUNICODE); + hszGroups = DdeCreateStringHandleW(dwDDEInst, wszGroups, CP_WINUNICODE); DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER); DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER);

1 0

Alexandre Julliard : gdi32: Fix the sign of the vertical text position in ExtTextOutW.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 69d5a56103bf35f955fc4b76a5a9e0ccd8e07f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d5a56103bf35f955fc4b76a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 17:25:04 2010 +0200 gdi32: Fix the sign of the vertical text position in ExtTextOutW. --- dlls/gdi32/font.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 637c7d6..2d51445 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1935,7 +1935,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (align & TA_UPDATECP) { pt.x = x + width.x; - pt.y = y - width.y; + pt.y = y + width.y; DPtoLP(hdc, &pt, 1); MoveToEx(hdc, pt.x, pt.y, NULL); } @@ -1943,12 +1943,12 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, case TA_CENTER: x -= width.x / 2; - y += width.y / 2; + y -= width.y / 2; break; case TA_RIGHT: x -= width.x; - y += width.y; + y -= width.y; if (align & TA_UPDATECP) { pt.x = x; @@ -2129,7 +2129,7 @@ done: pts[0].x = x - underlinePos * sinEsc; pts[0].y = y - underlinePos * cosEsc; pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y - width.y - underlinePos * cosEsc; + pts[1].y = y + width.y - underlinePos * cosEsc; pts[2].x = pts[1].x + underlineWidth * sinEsc; pts[2].y = pts[1].y + underlineWidth * cosEsc; pts[3].x = pts[0].x + underlineWidth * sinEsc; @@ -2145,7 +2145,7 @@ done: pts[0].x = x - strikeoutPos * sinEsc; pts[0].y = y - strikeoutPos * cosEsc; pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y - width.y - strikeoutPos * cosEsc; + pts[1].y = y + width.y - strikeoutPos * cosEsc; pts[2].x = pts[1].x + strikeoutWidth * sinEsc; pts[2].y = pts[1].y + strikeoutWidth * cosEsc; pts[3].x = pts[0].x + strikeoutWidth * sinEsc; @@ -2172,7 +2172,7 @@ done: pts[0].x = x; pts[0].y = y; pts[1].x = x + width.x; - pts[1].y = y - width.y; + pts[1].y = y + width.y; DPtoLP(hdc, pts, 2); MoveToEx(hdc, pts[0].x - underlinePos * sinEsc, pts[0].y - underlinePos * cosEsc, &oldpt); LineTo(hdc, pts[1].x - underlinePos * sinEsc, pts[1].y - underlinePos * cosEsc); @@ -2187,7 +2187,7 @@ done: pts[0].x = x; pts[0].y = y; pts[1].x = x + width.x; - pts[1].y = y - width.y; + pts[1].y = y + width.y; DPtoLP(hdc, pts, 2); MoveToEx(hdc, pts[0].x - strikeoutPos * sinEsc, pts[0].y - strikeoutPos * cosEsc, &oldpt); LineTo(hdc, pts[1].x - strikeoutPos * sinEsc, pts[1].y - strikeoutPos * cosEsc);

1 0

Michael Stefaniuc : notepad: Fix an error in the Bulgarian translation.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: ae942d615a279e25b0ad7670a3ba6cd17ec91de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae942d615a279e25b0ad7670a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 17 16:26:24 2010 +0200 notepad: Fix an error in the Bulgarian translation. --- programs/notepad/Bg.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc index 85fb4fc..5898ea3 100644 --- a/programs/notepad/Bg.rc +++ b/programs/notepad/Bg.rc @@ -53,6 +53,7 @@ POPUP "& POPUP "&��" { MENUITEM "&��...\tCtrl+F", CMD_SEARCH MENUITEM "�� &��\tF3", CMD_SEARCH_NEXT + MENUITEM "&��...\tCtrl+H", CMD_REPLACE } POPUP "&��" { MENUITEM "&��", CMD_HELP_CONTENTS

1 0

Michael Stefaniuc : notepad: Fix an error in the Portuguese (Brazil) translation.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: d47628739e769b04a1fadfd495270afe67525a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47628739e769b04a1fadfd49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 17 11:39:51 2010 +0200 notepad: Fix an error in the Portuguese (Brazil) translation. Translation by Mauricio Teixeira. --- programs/notepad/Pt.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 194225c..a9f244a 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -59,13 +59,14 @@ POPUP "&Editar" { POPUP "&Pesquisa" { MENUITEM "&Localizar...", CMD_SEARCH MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT + MENUITEM "&Substituir...\tCtrl+H", CMD_REPLACE } POPUP "&Ajuda" { MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Sobre o Notepad", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Alexandre Julliard : user32/tests: Expand the DCX_NORESETATTR test to make sure we check the correct DC.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: d8867fa7180a64ed5a1f366e1564e03f9a0d73bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8867fa7180a64ed5a1f366e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 12:56:25 2010 +0200 user32/tests: Expand the DCX_NORESETATTR test to make sure we check the correct DC. --- dlls/user32/tests/dce.c | 75 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 31c6ec0..cfa07e5 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -40,7 +40,8 @@ static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2; static void test_dc_attributes(void) { HDC hdc, old_hdc; - INT rop, def_rop; + HDC hdcs[20]; + INT i, rop, def_rop, found_dc; /* test cache DC */ @@ -57,26 +58,60 @@ static void test_dc_attributes(void) ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); SetROP2( hdc, R2_WHITE ); ReleaseDC( hwnd_cache, hdc ); + old_hdc = hdc; - hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); - rop = GetROP2( hdc ); - /* Win9x seems to silently ignore DCX_NORESETATTRS */ - ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - - SetROP2( hdc, R2_WHITE ); - rop = GetROP2( hdc ); - ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - - ReleaseDC( hwnd_cache, hdc ); - hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); - rop = GetROP2( hdc ); - ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); - ReleaseDC( hwnd_cache, hdc ); - - hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE ); - rop = GetROP2( hdc ); - ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); - ReleaseDC( hwnd_cache, hdc ); + found_dc = 0; + for (i = 0; i < 20; i++) + { + hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); + if (!hdc) break; + rop = GetROP2( hdc ); + if (hdc == old_hdc) + todo_wine ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + else + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + if (hdc == old_hdc) + { + found_dc = 1; + SetROP2( hdc, R2_WHITE ); + } + } + if (!found_dc) + { + trace( "hdc %p not found in cache using %p\n", old_hdc, hdcs[0] ); + old_hdc = hdcs[0]; + SetROP2( old_hdc, R2_WHITE ); + } + while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + + for (i = 0; i < 20; i++) + { + hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); + if (!hdc) break; + rop = GetROP2( hdc ); + if (hdc == old_hdc) + ok( rop == R2_WHITE || broken( rop == def_rop), /* win9x doesn't support DCX_NORESETATTRS */ + "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + else + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + } + while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + + for (i = 0; i < 20; i++) + { + hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE ); + if (!hdc) break; + rop = GetROP2( hdc ); + if (hdc == old_hdc) + { + todo_wine ok( rop == R2_WHITE || broken( rop == def_rop), + "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + SetROP2( old_hdc, def_rop ); + } + else + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + } + while (i >= 0) ReleaseDC( hwnd_cache, hdcs[--i] ); /* test own DC */

1 0

Alexandre Julliard : user32/tests: Ignore repeat key flag that causes occasional failures on Windows.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: fec9dc41f994542f1c9fe889a4380edb5e7ef559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec9dc41f994542f1c9fe889a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 13:37:42 2010 +0200 user32/tests: Ignore repeat key flag that causes occasional failures on Windows. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d67e5c..eb27800 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11663,7 +11663,7 @@ static const struct message wm_popup_menu_1[] = { WM_MENUSELECT, sent|wparam, MAKEWPARAM(200,MF_HILITE) }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'E', 0xf0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 }, - { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001, 0, 0x40000000 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */ { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },

1 0

Alexandre Julliard : user32/tests: Fix some class tests that behave differently on WoW64.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 2649f769a52de4aeef17fb29f06572baf963dc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2649f769a52de4aeef17fb29f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 14:05:42 2010 +0200 user32/tests: Fix some class tests that behave differently on WoW64. --- dlls/user32/tests/class.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index b11b5d2..33c78bf 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -320,6 +320,7 @@ static void test_instances(void) HINSTANCE kernel32 = GetModuleHandleA("kernel32"); HINSTANCE user32 = GetModuleHandleA("user32"); HINSTANCE main_module = GetModuleHandleA(NULL); + HINSTANCE zero_instance = 0; DWORD r; char buffer[0x10]; @@ -397,15 +398,19 @@ static void test_instances(void) /* GetClassInfo with instance 0 finds user32 instance */ SetClassLongPtrA( hwnd, GCLP_HMODULE, (LONG_PTR)user32 ); ok( RegisterClassA( &cls ), "Failed to register local class for kernel32\n" ); + if (!GetClassInfo( 0, name, &wc )) zero_instance = user32; /* instance 0 not supported on wow64 */ + else + { + check_instance( name, 0, 0, kernel32 ); + check_thread_instance( name, 0, 0, kernel32 ); + } check_class( kernel32, name, "kernel32" ); check_class( user32, name, "main_module" ); - check_class( 0, name, "main_module" ); + check_class( zero_instance, name, "main_module" ); check_instance( name, kernel32, kernel32, kernel32 ); - check_instance( name, user32, 0, user32 ); - check_instance( name, 0, 0, kernel32 ); + check_instance( name, user32, zero_instance, user32 ); check_thread_instance( name, kernel32, kernel32, kernel32 ); - check_thread_instance( name, user32, 0, user32 ); - check_thread_instance( name, 0, 0, kernel32 ); + check_thread_instance( name, user32, zero_instance, user32 ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); SetClassLongPtrA( hwnd, GCLP_HMODULE, 0x12345678 ); @@ -551,10 +556,10 @@ static void test_instances(void) /* GetClassInfo sets instance to passed value for global classes */ check_instance( "BUTTON", 0, 0, user32 ); check_instance( "BUTTON", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 ); - check_instance( "BUTTON", user32, 0, user32 ); + check_instance( "BUTTON", user32, zero_instance, user32 ); check_thread_instance( "BUTTON", 0, 0, user32 ); check_thread_instance( "BUTTON", (HINSTANCE)0xdeadbeef, (HINSTANCE)0xdeadbeef, user32 ); - check_thread_instance( "BUTTON", user32, 0, user32 ); + check_thread_instance( "BUTTON", user32, zero_instance, user32 ); /* we can unregister system classes */ ok( GetClassInfo( 0, "BUTTON", &wc ), "Button class not found with null instance\n" ); @@ -656,8 +661,16 @@ static void test_builtinproc(void) ok(IsWindowUnicode(hwnd), "Windows should be Unicode\n"); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)pDefWindowProcA); ok(IsWindowUnicode(hwnd), "Windows should have remained Unicode\n"); - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Invalid ANSI winproc\n"); - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Invalid Unicode winproc\n"); + if (GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA) + { + /* DefWindowProc isn't magic on wow64 */ + ok(IS_WNDPROC_HANDLE(GetWindowLongPtrA(hwnd, GWLP_WNDPROC)), "Ansi winproc is not a handle\n"); + } + else + { + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Invalid Unicode winproc\n"); + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Invalid Ansi winproc\n"); + } SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IsWindowUnicode(hwnd) == FALSE, "SetWindowLongPtrA should have switched window to ANSI\n");

1 0

Alexander Scott-Johns : msvcrt/tests: Rename a variable.
by Alexandre Julliard 17 Jun '10

17 Jun '10

Module: wine Branch: master Commit: 5fd1409c6a82e01d2cb1cf664095ea5d26783f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd1409c6a82e01d2cb1cf664… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Jun 16 22:34:06 2010 +0100 msvcrt/tests: Rename a variable. --- dlls/msvcrt/tests/misc.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 68f47f8..82dda5d 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -23,7 +23,7 @@ #include "msvcrt.h" static int (__cdecl *prand_s)(unsigned int *); -static int (__cdecl *memcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); +static int (__cdecl *pmemcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static void init(void) @@ -31,7 +31,7 @@ static void init(void) HMODULE hmod = GetModuleHandleA("msvcrt.dll"); prand_s = (void *)GetProcAddress(hmod, "rand_s"); - memcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); + pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); pI10_OUTPUT = (void*)GetProcAddress(hmod, "$I10_OUTPUT"); } @@ -61,46 +61,46 @@ static void test_memcpy_s(void) static char dest[32]; int ret; - if(!memcpy_s) + if(!pmemcpy_s) { - win_skip("memcpy_s in not available\n"); + win_skip("memcpy_s is not available\n"); return; } errno = 0xdeadbeef; - ret = memcpy_s(NULL, 0, NULL, 0); + ret = pmemcpy_s(NULL, 0, NULL, 0); ok(ret == 0, "ret = %x\n", ret); ok(errno == 0xdeadbeef, "errno = %x\n", errno); errno = 0xdeadbeef; dest[0] = 'x'; - ret = memcpy_s(dest, 10, NULL, 0); + ret = pmemcpy_s(dest, 10, NULL, 0); ok(ret == 0, "ret = %x\n", ret); ok(errno == 0xdeadbeef, "errno = %x\n", errno); ok(dest[0] == 'x', "dest[0] != \'x\'\n"); errno = 0xdeadbeef; - ret = memcpy_s(NULL, 10, data, 10); + ret = pmemcpy_s(NULL, 10, data, 10); ok(ret == EINVAL, "ret = %x\n", ret); ok(errno == EINVAL, "errno = %x\n", errno); errno = 0xdeadbeef; dest[7] = 'x'; - ret = memcpy_s(dest, 10, data, 5); + ret = pmemcpy_s(dest, 10, data, 5); ok(ret == 0, "ret = %x\n", ret); ok(errno == 0xdeadbeef, "errno = %x\n", errno); ok(memcmp(dest, data, 10), "All data copied\n"); ok(!memcmp(dest, data, 5), "First five bytes are different\n"); errno = 0xdeadbeef; - ret = memcpy_s(data, 10, data, 10); + ret = pmemcpy_s(data, 10, data, 10); ok(ret == 0, "ret = %x\n", ret); ok(errno == 0xdeadbeef, "errno = %x\n", errno); ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n"); errno = 0xdeadbeef; dest[0] = 'x'; - ret = memcpy_s(dest, 5, data, 10); + ret = pmemcpy_s(dest, 5, data, 10); ok(ret == ERANGE, "ret = %x\n", ret); ok(errno == ERANGE, "errno = %x\n", errno); ok(dest[0] == '\0', "dest[0] != \'\\0\'\n");

1 0