October 2013 - Wine-Commits

Dmitry Timoshkov : user32/tests: Fix broadcast tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 3c4d7f0d72383d45b2902785e741e2a480e9cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4d7f0d72383d45b2902785e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:10 2013 +0900 user32/tests: Fix broadcast tests compilation with __WINESRC__ defined. --- dlls/user32/tests/broadcast.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index daddf96..0476c99 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -59,7 +59,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR static BOOL init_procs(void) { WNDCLASSA cls; - HANDLE user32 = GetModuleHandle("user32"); + HANDLE user32 = GetModuleHandleA("user32.dll"); pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessageA"); if (!pBroadcastA) pBroadcastA = (PBROADCAST)GetProcAddress(user32, "BroadcastSystemMessage"); @@ -82,7 +82,7 @@ static BOOL init_procs(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "MainWindowClass"; @@ -92,7 +92,7 @@ static BOOL init_procs(void) if (!CreateWindowExA(0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, - 200, 0, 0, GetModuleHandle(0), NULL)) + 200, 0, 0, GetModuleHandleA(NULL), NULL)) return FALSE; return TRUE; }

1 0

Dmitry Timoshkov : user32/tests: Fix cursor and icon tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 76037001699951da4a2a604d768a69af43c1ac5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76037001699951da4a2a604d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:26 2013 +0900 user32/tests: Fix cursor and icon tests compilation with __WINESRC__ defined. --- dlls/user32/tests/cursoricon.c | 64 ++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76037001699951da4a2a6…

1 0

Frédéric Delanoy : comdlg32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 3e3efd1e1bcfe0149cfa7e46f1d0ab71aa4e8b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3efd1e1bcfe0149cfa7e46f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:49 2013 +0200 comdlg32: Use BOOL type where appropriate. --- dlls/comdlg32/colordlg.c | 28 ++++++++++++------------ dlls/comdlg32/filedlg.c | 4 +- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/fontdlg.c | 53 +++++++++++++++++++++++--------------------- 4 files changed, 45 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e3efd1e1bcfe0149cfa7…

1 0

André Hentschel : ntdll: vm86 is not available on PowerPC.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: e0e7a0770b82c66ad9d14d7b400f7d091ca1bd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e7a0770b82c66ad9d14d7b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 22 20:18:22 2013 +0200 ntdll: vm86 is not available on PowerPC. --- dlls/ntdll/signal_powerpc.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 3d461ee..ac8095a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -43,10 +43,6 @@ # endif #endif -#ifdef HAVE_SYS_VM86_H -# include <sys/vm86.h> -#endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif

1 0

Dmitry Timoshkov : user32/tests: Fix DCE tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 6d00d0472653120ac7fb0f10dc76b7e126182acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d00d0472653120ac7fb0f10d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:30 2013 +0900 user32/tests: Fix DCE tests compilation with __WINESRC__ defined. --- dlls/user32/tests/dce.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index f75e6b3..78c1af2 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -581,7 +581,7 @@ START_TEST(dce) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "cache_class";

1 0

Dmitry Timoshkov : user32/tests: Fix clipboard tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 23, 2013

Oct. 23, 2013

Module: wine Branch: master Commit: 5eb648c8f088b8ea6b036e19ef39a76f561e6b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb648c8f088b8ea6b036e19e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:18 2013 +0900 user32/tests: Fix clipboard tests compilation with __WINESRC__ defined. --- dlls/user32/tests/clipboard.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e2e727c..d9ebb23 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -282,7 +282,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA break; } - return DefWindowProc(hwnd, msg, wp, lp); + return DefWindowProcA(hwnd, msg, wp, lp); } static DWORD WINAPI clipboard_thread(void *param) @@ -307,14 +307,14 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - r = PostMessage(win, WM_USER, 0, 0); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0; } static void test_messages(void) { - WNDCLASS cls; + WNDCLASSA cls; HWND win; MSG msg; HANDLE thread; @@ -324,25 +324,25 @@ static void test_messages(void) memset(&cls, 0, sizeof(cls)); cls.lpfnWndProc = clipboard_wnd_proc; - cls.hInstance = GetModuleHandle(0); + cls.hInstance = GetModuleHandleA(NULL); cls.lpszClassName = "clipboard_test"; - RegisterClass(&cls); + RegisterClassA(&cls); - win = CreateWindow("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + win = CreateWindowA("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); ok(win != NULL, "CreateWindow failed: %d\n", GetLastError()); thread = CreateThread(NULL, 0, clipboard_thread, (void*)win, 0, &tid); ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); - while(GetMessage(&msg, NULL, 0, 0)) { + while(GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); - UnregisterClass("clipboard_test", GetModuleHandle(0)); + UnregisterClassA("clipboard_test", GetModuleHandleA(NULL)); DeleteCriticalSection(&clipboard_cs); }

1 0

Piotr Caban : msvcrt: Don' t output __ptr64 when UNDNAME_NO_MS_KEYWORDS is used.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: d218d82af4658e94208e12db89c03f514fe52996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d218d82af4658e94208e12db8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 22 16:47:06 2013 +0200 msvcrt: Don't output __ptr64 when UNDNAME_NO_MS_KEYWORDS is used. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 037c88f..c8ff25d 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1320,6 +1320,7 @@ static void test_demangle(void) "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, +/* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", NULL, 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7cd8468..beaec4f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -406,9 +406,12 @@ static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char *ptr_modif = NULL; if (*sym->current == 'E') { - *ptr_modif = "__ptr64"; - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) - *ptr_modif = *ptr_modif + 2; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + *ptr_modif = "__ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + *ptr_modif = *ptr_modif + 2; + } sym->current++; } switch (*sym->current++) @@ -431,10 +434,13 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, if (*sym->current == 'E') { - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) - ptr_modif = " ptr64"; - else - ptr_modif = " __ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + ptr_modif = " ptr64"; + else + ptr_modif = " __ptr64"; + } sym->current++; }

1 0

Nikolay Sivov : comctl32/tests: Preparation for switching __WINESRC__ on.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 44ebba9d5ebae263a7b48b4a741fa331afd6b196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ebba9d5ebae263a7b48b4a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 22 19:12:18 2013 +0400 comctl32/tests: Preparation for switching __WINESRC__ on. --- dlls/comctl32/tests/comboex.c | 88 ++-- dlls/comctl32/tests/datetime.c | 173 +++--- dlls/comctl32/tests/header.c | 237 ++++---- dlls/comctl32/tests/imagelist.c | 4 +- dlls/comctl32/tests/ipaddress.c | 12 +- dlls/comctl32/tests/listview.c | 1271 ++++++++++++++++++++------------------- dlls/comctl32/tests/misc.c | 6 +- 7 files changed, 894 insertions(+), 897 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44ebba9d5ebae263a7b48…

1 0

Piotr Caban : msvcrt: Fix __ptr64 displaying when UNDNAME_NO_LEADING_UNDERSCORES flag is used.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 47908f7ac21f1dd7d5ce930b53ad7d5ad28f6140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47908f7ac21f1dd7d5ce930b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 22 16:46:52 2013 +0200 msvcrt: Fix __ptr64 displaying when UNDNAME_NO_LEADING_UNDERSCORES flag is used. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index f25fd4a..037c88f 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1319,6 +1319,7 @@ static void test_demangle(void) "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, +/* 127 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d4695c8..7cd8468 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -407,6 +407,8 @@ static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char if (*sym->current == 'E') { *ptr_modif = "__ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + *ptr_modif = *ptr_modif + 2; sym->current++; } switch (*sym->current++) @@ -429,7 +431,10 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, if (*sym->current == 'E') { - ptr_modif = " __ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + ptr_modif = " ptr64"; + else + ptr_modif = " __ptr64"; sym->current++; }

1 0

Piotr Caban : msvcrt: Add support for UNDNAME_NO_THISTYPE flag in __unDName .
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 0d17c4748065b337927962c053e0fdcc272251c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d17c4748065b337927962c05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 22 16:46:43 2013 +0200 msvcrt: Add support for UNDNAME_NO_THISTYPE flag in __unDName. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e545a5f..f25fd4a 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1318,6 +1318,7 @@ static void test_demangle(void) /* 125 */ {"?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z", "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, +/* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 396a003..d4695c8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1235,6 +1235,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) mark = sym->stack.num; if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; if (sym->flags & UNDNAME_NAME_ONLY) args_str = modifier = NULL; + if (sym->flags & UNDNAME_NO_THISTYPE) modifier = NULL; sym->stack.num = mark; /* Note: '()' after 'Z' means 'throws', but we don't care here

1 0