wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

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

23 Oct '13

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

Frédéric Delanoy : comdlg32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: e5d954096bbac8b7b2a06d05d82d5afae9526994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d954096bbac8b7b2a06d05d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:52 2013 +0200 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cfa964a..d96d976 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -111,7 +111,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -120,7 +120,7 @@ static void test_DialogCancel(void) "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); @@ -143,7 +143,7 @@ static void test_DialogCancel(void) win_skip("GetOpenFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -153,7 +153,7 @@ static void test_DialogCancel(void) win_skip("GetSaveFileNameW is not implemented\n"); else { - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -928,12 +928,12 @@ static void test_getfolderpath(void) ofn.lpstrInitialDir = szInitialDir; result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected 0, got %d\n", result); + ok(FALSE == result, "expected FALSE, got %d\n", result); ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } @@ -956,7 +956,7 @@ static void test_resizable2(void) ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.Flags = OFN_EXPLORER; -#define ISSIZABLE 1 +#define ISSIZABLE TRUE ret = GetOpenFileNameA(&ofn); ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); ret = CommDlgExtendedError();

1 0

Frédéric Delanoy : wineboot: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 189ac56e6d673a505208ac6de9e741affc55d1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ac56e6d673a505208ac6de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:51 2013 +0200 wineboot: Use BOOL type where appropriate. --- programs/wineboot/shutdown.c | 4 ++-- programs/wineboot/wineboot.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ac3019c..a5f5f5a 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -335,14 +335,14 @@ static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) if (hdesk == NULL) { WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } if (!SetThreadDesktop( hdesk )) { CloseDesktop( hdesk ); WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); - return 0; + return FALSE; } CloseDesktop( hdesk ); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4f9adb0..a062d81 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -948,7 +948,7 @@ static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) } /* execute rundll32 on the wine.inf file if necessary */ -static void update_wineprefix( int force ) +static void update_wineprefix( BOOL force ) { const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); @@ -1123,11 +1123,12 @@ int main( int argc, char *argv[] ) /* First, set the current directory to SystemRoot */ int optc; - int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; + BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; SECURITY_ATTRIBUTES sa; BOOL is_wow64; + end_session = force = init = kill = restart = shutdown = update = FALSE; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); @@ -1160,13 +1161,13 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = 1; break; - case 'f': force = 1; break; - case 'i': init = 1; break; - case 'k': kill = 1; break; - case 'r': restart = 1; break; - case 's': shutdown = 1; break; - case 'u': update = 1; break; + case 'e': end_session = TRUE; break; + case 'f': force = TRUE; break; + case 'i': init = TRUE; break; + case 'k': kill = TRUE; break; + case 'r': restart = TRUE; break; + case 's': shutdown = TRUE; break; + case 'u': update = TRUE; break; case 'h': usage(); return 0; case '?': usage(); return 1; }

1 0

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

23 Oct '13

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

Frédéric Delanoy : user.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 1c4456f7a22a14fb657cbb7f9fc840fe75404a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4456f7a22a14fb657cbb7f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 22:21:50 2013 +0200 user.exe16: Use BOOL type where appropriate. --- dlls/user.exe16/comm.c | 6 +++--- dlls/user.exe16/user.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9c99899..a9141db 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); struct DosDeviceStruct { HANDLE handle; - int suspended; + BOOL suspended; int unget,xmit; int evtchar; /* events */ @@ -577,7 +577,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid) return -1; } - ptr->suspended = 1; + ptr->suspended = TRUE; ptr->commerror = 0; return 0; } @@ -594,7 +594,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid) FIXME("no cid=%d found!\n", cid); return -1; } - ptr->suspended = 0; + ptr->suspended = FALSE; ptr->commerror = 0; return 0; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 9500f59..7a518b3 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2792,7 +2792,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, */ static BOOL DRAG_QueryUpdate16( HWND hQueryWnd, SEGPTR spDragInfo ) { - BOOL bResult = 0; + BOOL bResult; WPARAM wParam; POINT pt, old_pt; LPDRAGINFO16 ptrDragInfo = MapSL(spDragInfo);

1 0

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

23 Oct '13

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

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

22 Oct '13

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@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise@bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex@M@0@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@M@0@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

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

22 Oct '13

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@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise@bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, +/* 127 */ {"??Xstd@@YAAEAV?$complex@M@0@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 22 Oct '13

22 Oct '13

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@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z", "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", "?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, +/* 126 */ {"?_Doraise@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

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

22 Oct '13

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

← Newer
1
...
18
19
20
21
22
23
24
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013