October 2013 - Wine-Commits

Dmitry Timoshkov : kernel32/tests: Fix timer tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 7e39bfc04be7915768aebbd3e666833e8a648897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e39bfc04be7915768aebbd3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:49 2013 +0900 kernel32/tests: Fix timer tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index a06217a..bcc800c 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -28,7 +28,7 @@ static void test_timer(void) { HANDLE (WINAPI *pCreateWaitableTimerA)( SECURITY_ATTRIBUTES*, BOOL, LPSTR ); BOOL (WINAPI *pSetWaitableTimer)(HANDLE, LARGE_INTEGER*, LONG, PTIMERAPCROUTINE, LPVOID, BOOL); - HMODULE hker = GetModuleHandle("kernel32"); + HMODULE hker = GetModuleHandleA("kernel32.dll"); HANDLE handle; BOOL r; LARGE_INTEGER due;

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 1f6e66babe9f26d38a22bac70015c0eb8c9dab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6e66babe9f26d38a22bac70… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:11 2013 +0200 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/comboex.c | 6 +++--- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/msg.h | 2 +- dlls/comctl32/tests/subclass.c | 6 +++--- dlls/comctl32/tests/treeview.c | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index cc17327..9a5bee3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -473,7 +473,7 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -485,7 +485,7 @@ static int init(void) if (!pInitCommonControlsEx) { win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); iccex.dwICC = ICC_USEREX_CLASSES; @@ -510,7 +510,7 @@ static int init(void) assert(hComboExParentWnd != NULL); hMainHinst = GetModuleHandleA(NULL); - return 1; + return TRUE; } static void cleanup(void) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 02fa61a..f6c6481 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1635,7 +1635,7 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1650,7 +1650,7 @@ static int init(void) if (!pInitCommonControlsEx) { skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); @@ -1686,7 +1686,7 @@ static int init(void) NULL, NULL, GetModuleHandleA(NULL), 0); assert(hHeaderParentWnd != NULL); ShowWindow(hHeaderParentWnd, SW_SHOW); - return 1; + return TRUE; } /* maximum 8 items allowed */ diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 1d78ffe..fbe8fe7 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -106,7 +106,7 @@ static inline void flush_sequences(struct msg_sequence **seq, int n) } static void ok_sequence_(struct msg_sequence **seq, int sequence_index, - const struct message *expected, const char *context, int todo, + const struct message *expected, const char *context, BOOL todo, const char *file, int line) { struct msg_sequence *msg_seq = seq[sequence_index]; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 8511275..e32919b 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -279,7 +279,7 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -static int init_function_pointers(void) +static BOOL init_function_pointers(void) { HMODULE hmod; void *ptr; @@ -299,7 +299,7 @@ static int init_function_pointers(void) if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); - return 0; + return FALSE; } /* test named exports */ @@ -316,7 +316,7 @@ static int init_function_pointers(void) #undef TESTNAMED } - return 1; + return TRUE; } START_TEST(subclass) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index b784140..d523c23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -957,8 +957,8 @@ static void test_get_set_tooltips(void) static void test_get_set_unicodeformat(void) { - BOOL bPreviousSetting = 0; - BOOL bNewSetting = 0; + BOOL bPreviousSetting = FALSE; + BOOL bNewSetting = FALSE; HWND hTree; hTree = create_treeview_control(0); @@ -966,19 +966,19 @@ static void test_get_set_unicodeformat(void) /* Check that an invalid format returned by NF_QUERY defaults to ANSI */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bPreviousSetting == 0, "Format should be ANSI.\n"); + ok(bPreviousSetting == FALSE, "Format should be ANSI.\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Set to Unicode */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_SETUNICODEFORMAT, 1, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 1, "Unicode setting did not work.\n"); + ok(bNewSetting == TRUE, "Unicode setting did not work.\n"); /* Set to ANSI */ SendMessage( hTree, TVM_SETUNICODEFORMAT, 0, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 0, "ANSI setting did not work.\n"); + ok(bNewSetting == FALSE, "ANSI setting did not work.\n"); /* Revert to original setting */ SendMessage( hTree, TVM_SETUNICODEFORMAT, bPreviousSetting, 0 );

1 0

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

Oct. 22, 2013

Module: wine Branch: master Commit: 6eadc8ca4efe2758a7de336f32e8832af6f0ca94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eadc8ca4efe2758a7de336f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:10 2013 +0200 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 3a421da..cb1ac55 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -70,7 +70,7 @@ static void WINHELP_InitFonts(HWND hWnd) #define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) static HFONT fonts[FONTS_LEN]; - static BOOL init = 0; + static BOOL init = FALSE; win->fonts_len = FONTS_LEN; win->fonts = fonts; @@ -84,7 +84,7 @@ static void WINHELP_InitFonts(HWND hWnd) fonts[i] = CreateFontIndirectW(&logfontlist[i]); } - init = 1; + init = TRUE; } }

1 0

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

Oct. 22, 2013

Module: wine Branch: master Commit: 0666ac3ed8cb2f3cd692d239c8bd48145553d043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666ac3ed8cb2f3cd692d239c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:09 2013 +0200 shell32: Use BOOL type where appropriate. --- dlls/shell32/classes.c | 4 ++-- dlls/shell32/control.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 7 ++++--- dlls/shell32/shlview_cmenu.c | 3 ++- dlls/shell32/xdg.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 10ff970..70abfe6 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -58,7 +58,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; @@ -92,7 +92,7 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 659a871..fe392e3 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -711,7 +711,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) signed sp = -1; LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; - int quoted = 0; + BOOL quoted = FALSE; CPlApplet *applet; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); @@ -746,7 +746,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) if (extraPmtsBuf != NULL) { beg = end = extraPmtsBuf; - quoted = 0; + quoted = FALSE; for (;;) { ch = *end; diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6a58879..6b511d2 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -209,7 +209,7 @@ static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) if (lstrcpynW ( lpwStr, lpOle, nwStr)) { return lstrlenW (lpwStr); } - return 0; + return FALSE; } BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 4bd964c..357e4ff 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1138,7 +1138,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, { IGenericSFImpl *This = impl_from_ISFHelper(iface); WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; + BOOL bRes; HRESULT hres = E_FAIL; TRACE ("(%p)(%s %p)\n", This, debugstr_w(pwszName), ppidlOut); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 686edb0..ac7fd48 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -255,7 +255,8 @@ static DWORD get_drive_map(void) 'P','o','l','i','c','i','e','s','\\', 'E','x','p','l','o','r','e','r',0}; static const WCHAR nodrivesW[] = {'N','o','D','r','i','v','e','s',0}; - static DWORD drive_mask, init_done; + static DWORD drive_mask; + static BOOL init_done = FALSE; if (!init_done) { @@ -277,7 +278,7 @@ static DWORD get_drive_map(void) RegCloseKey( hkey ); } drive_mask = mask; - init_done = 1; + init_done = TRUE; } return GetLogicalDrives() & ~drive_mask; @@ -626,7 +627,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, static const WCHAR wantsForParsingW[] = { 'W','a','n','t','s','F','o','r','P','a','r','s','i','n', 'g',0 }; - int bWantsForParsing = FALSE; + BOOL bWantsForParsing = FALSE; WCHAR szRegPath[100]; LONG r; diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fb4ef4e..0705948 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -203,7 +203,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) { - UINT i, bFolderFound = FALSE; + UINT i; + BOOL bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei; diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index d05539c..6eb4163 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -282,7 +282,7 @@ BOOL XDG_MakeDirs(const char *path) */ static int dskentry_encode(const char *value, char *output) { - int only_spc = TRUE; + BOOL only_spc = TRUE; int num_written = 0; const char *c; for (c = value; *c; c++)

1 0

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

Oct. 22, 2013

Module: wine Branch: master Commit: 411ef80ac7040a6af7d0af11df4f3630a507b31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=411ef80ac7040a6af7d0af11d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:08 2013 +0200 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index faecba0..4b0b2ad 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -72,7 +72,7 @@ typedef struct RECT checkbox; /* checkbox allowing the control to be enabled/disabled */ RECT calbutton; /* button that toggles the dropdown of the monthcal control */ BOOL bCalDepressed; /* TRUE = cal button is depressed */ - int bDropdownEnabled; + BOOL bDropdownEnabled; int select; WCHAR charsEntered[4]; int nCharsEntered;

1 0

Dmitry Timoshkov : kernel32/tests: Fix version tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 7dab5fe9980410cd7c435542f69b1cfdefcab696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dab5fe9980410cd7c435542f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:57 2013 +0900 kernel32/tests: Fix version tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/version.c | 50 ++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 4b9a4f3..bd379fa 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -156,7 +156,7 @@ static void test_GetVersionEx(void) static void test_VerifyVersionInfo(void) { - OSVERSIONINFOEX info; + OSVERSIONINFOEXA info; BOOL ret; DWORD servicepack, error; @@ -169,8 +169,8 @@ static void test_VerifyVersionInfo(void) /* Before we start doing some tests we should check what the version of * the ServicePack is. Tests on a box with no ServicePack will fail otherwise. */ - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionExA((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); servicepack = info.wServicePackMajor; memset(&info, 0, sizeof(info)); @@ -223,8 +223,8 @@ static void test_VerifyVersionInfo(void) VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMinor++; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -240,37 +240,37 @@ static void test_VerifyVersionInfo(void) } else { - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor--; ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER)); ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor--; ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); } - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor++; ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS)); ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor++; ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS_EQUAL)); ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor--; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -282,8 +282,8 @@ static void test_VerifyVersionInfo(void) /* test the failure hierarchy for the four version fields */ - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.wServicePackMajor++; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -293,8 +293,8 @@ static void test_VerifyVersionInfo(void) ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.dwMinorVersion++; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -304,8 +304,8 @@ static void test_VerifyVersionInfo(void) ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.dwMajorVersion++; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -319,8 +319,8 @@ static void test_VerifyVersionInfo(void) pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.dwBuildNumber++; SetLastError(0xdeadbeef); ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -335,8 +335,8 @@ static void test_VerifyVersionInfo(void) ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); /* test bad dwOSVersionInfoSize */ - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + GetVersionExA((OSVERSIONINFOA *)&info); info.dwOSVersionInfoSize = 0; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL));

1 0

Nikolay Sivov : ole32: Support activation context in ProgIDFromCLSID().
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 03dbbe21039e6b4387ee5e37c06051af530c5006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dbbe21039e6b4387ee5e37c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 23:11:46 2013 +0400 ole32: Support activation context in ProgIDFromCLSID(). --- dlls/ole32/compobj.c | 22 ++++++++++++++++++++++ dlls/ole32/tests/compobj.c | 9 ++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d70bfc1..b8954fb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2227,6 +2227,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) { static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; + ACTCTX_SECTION_KEYED_DATA data; HKEY hkey; HRESULT ret; LONG progidlen = 0; @@ -2238,6 +2239,27 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) } *ppszProgID = NULL; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data)) + { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + if (comclass->progid_len) + { + WCHAR *ptrW; + + *ppszProgID = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR)); + if (!*ppszProgID) return E_OUTOFMEMORY; + + ptrW = (WCHAR*)((BYTE*)comclass + comclass->progid_offset); + memcpy(*ppszProgID, ptrW, comclass->progid_len + sizeof(WCHAR)); + return S_OK; + } + else + return REGDB_E_CLASSNOTREG; + } + ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); if (FAILED(ret)) return ret; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8998251..3bc98fc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -309,19 +309,14 @@ static void test_ProgIDFromCLSID(void) static const WCHAR customfontW[] = {'C','u','s','t','o','m','F','o','n','t',0}; hr = ProgIDFromCLSID(&CLSID_non_existent, &progid); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - { - ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); - CoTaskMemFree(progid); - } + ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); + CoTaskMemFree(progid); /* try something registered and redirected */ progid = NULL; hr = ProgIDFromCLSID(&CLSID_StdFont, &progid); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpiW(progid, customfontW), "got wrong progid %s\n", wine_dbgstr_w(progid)); CoTaskMemFree(progid);

1 0

Dmitry Timoshkov : kernel32/tests: Fix path tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: b2e9561a2dbc4d425729ae98de5051437db8e323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e9561a2dbc4d425729ae98d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:20 2013 +0900 kernel32/tests: Fix path tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/path.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e83e0a9..82bf776 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1072,7 +1072,7 @@ static void test_GetLongPathNameA(void) memset(temppath, 0, MAX_PATH); length = pGetLongPathNameA(tempfile, temppath, 4); /* We have a failure so length should be the minimum plus the terminating '0' */ - ok(length >= lstrlen(tempfile) + 1, "Wrong length\n"); + ok(length >= strlen(tempfile) + 1, "Wrong length\n"); ok(temppath[0] == 0, "Buffer should not have been touched\n"); /* Some UNC syntax tests */ @@ -1103,7 +1103,7 @@ static void test_GetLongPathNameA(void) /* Now an UNC path with the computername */ lstrcpyA(unc_prefix, "\\\\"); hostsize = sizeof(unc_prefix) - 2; - GetComputerName(unc_prefix + 2, &hostsize); + GetComputerNameA(unc_prefix + 2, &hostsize); lstrcatA(unc_prefix, "\\"); /* Create a short syntax for the whole unc path */ @@ -1316,7 +1316,7 @@ static void test_GetSystemDirectory(void) DWORD total; SetLastError(0xdeadbeef); - res = GetSystemDirectory(NULL, 0); + res = GetSystemDirectoryA(NULL, 0); /* res includes the terminating Zero */ ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); @@ -1324,10 +1324,10 @@ static void test_GetSystemDirectory(void) /* this crashes on XP */ if (0) - GetSystemDirectory(NULL, total); + GetSystemDirectoryA(NULL, total); SetLastError(0xdeadbeef); - res = GetSystemDirectory(NULL, total-1); + res = GetSystemDirectoryA(NULL, total-1); /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -1338,7 +1338,7 @@ static void test_GetSystemDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total); + res = GetSystemDirectoryA(buffer, total); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1346,7 +1346,7 @@ static void test_GetSystemDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total + 1); + res = GetSystemDirectoryA(buffer, total + 1); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1355,7 +1355,7 @@ static void test_GetSystemDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total-1); + res = GetSystemDirectoryA(buffer, total-1); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1363,7 +1363,7 @@ static void test_GetSystemDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total-2); + res = GetSystemDirectoryA(buffer, total-2); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1376,17 +1376,17 @@ static void test_GetWindowsDirectory(void) DWORD total; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(NULL, 0); + res = GetWindowsDirectoryA(NULL, 0); /* res includes the terminating Zero */ ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); total = res; /* this crashes on XP */ if (0) - GetWindowsDirectory(NULL, total); + GetWindowsDirectoryA(NULL, total); SetLastError(0xdeadbeef); - res = GetWindowsDirectory(NULL, total-1); + res = GetWindowsDirectoryA(NULL, total-1); /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -1397,7 +1397,7 @@ static void test_GetWindowsDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total); + res = GetWindowsDirectoryA(buffer, total); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1405,7 +1405,7 @@ static void test_GetWindowsDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total + 1); + res = GetWindowsDirectoryA(buffer, total + 1); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1414,7 +1414,7 @@ static void test_GetWindowsDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total-1); + res = GetWindowsDirectoryA(buffer, total-1); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1422,7 +1422,7 @@ static void test_GetWindowsDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total-2); + res = GetWindowsDirectoryA(buffer, total-2); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1491,7 +1491,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetWindowsDirectory(buf, sizeof(buf)); + ret = GetWindowsDirectoryA(buf, sizeof(buf)); ok(ret, "GetWindowsDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1500,7 +1500,7 @@ static void test_drive_letter_case(void) /* re-use the buffer returned by GetFullPathName */ buf[2] = '/'; SetLastError(0xdeadbeef); - ret = GetFullPathName(buf + 2, sizeof(buf), buf, NULL); + ret = GetFullPathNameA(buf + 2, sizeof(buf), buf, NULL); ok(ret, "GetFullPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1508,7 +1508,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetSystemDirectory(buf, sizeof(buf)); + ret = GetSystemDirectoryA(buf, sizeof(buf)); ok(ret, "GetSystemDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1516,7 +1516,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetCurrentDirectory(sizeof(buf), buf); + ret = GetCurrentDirectoryA(sizeof(buf), buf); ok(ret, "GetCurrentDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1525,7 +1525,7 @@ static void test_drive_letter_case(void) /* TEMP is an environment variable, so it can't be tested for case-sensitivity */ memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetTempPath(sizeof(buf), buf); + ret = GetTempPathA(sizeof(buf), buf); ok(ret, "GetTempPath error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); if (buf[0]) @@ -1536,7 +1536,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetFullPathName(".", sizeof(buf), buf, NULL); + ret = GetFullPathNameA(".", sizeof(buf), buf, NULL); ok(ret, "GetFullPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1544,7 +1544,7 @@ static void test_drive_letter_case(void) /* re-use the buffer returned by GetFullPathName */ SetLastError(0xdeadbeef); - ret = GetShortPathName(buf, buf, sizeof(buf)); + ret = GetShortPathNameA(buf, buf, sizeof(buf)); ok(ret, "GetShortPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]);

1 0

Alexandre Julliard : user32: Get rid of the CreateCursorIcon driver entry point.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: a897e13fba192ad2460b02975ac8419b588066db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a897e13fba192ad2460b02975… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:08:21 2013 +0200 user32: Get rid of the CreateCursorIcon driver entry point. --- dlls/user32/cursoricon.c | 3 --- dlls/user32/driver.c | 12 ------------ dlls/user32/user_private.h | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 93aa0c6..53089c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -972,7 +972,6 @@ done: list_add_head( &icon_cache, &info->entry ); } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1609,7 +1608,6 @@ HICON WINAPI CopyIcon( HICON hIcon ) release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); - if (hNew) USER_Driver->pCreateCursorIcon( hNew ); return hNew; } @@ -2212,7 +2210,6 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6a6241c..4cfc552 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -67,7 +67,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(UnloadKeyboardLayout); GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(VkKeyScanEx); - GET_USER_FUNC(CreateCursorIcon); GET_USER_FUNC(DestroyCursorIcon); GET_USER_FUNC(SetCursor); GET_USER_FUNC(GetCursorPos); @@ -205,10 +204,6 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor ) -{ -} - static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } @@ -439,7 +434,6 @@ static USER_DRIVER null_driver = nulldrv_UnregisterHotKey, nulldrv_VkKeyScanEx, /* cursor/icon functions */ - nulldrv_CreateCursorIcon, nulldrv_DestroyCursorIcon, nulldrv_SetCursor, nulldrv_GetCursorPos, @@ -559,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor ) -{ - load_driver()->pCreateCursorIcon( cursor ); -} - static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) { load_driver()->pDestroyCursorIcon( cursor ); @@ -787,7 +776,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_CreateCursorIcon, loaderdrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0f86bdf..9daa9f4 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -73,7 +73,6 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ - void (CDECL *pCreateCursorIcon)(HCURSOR); void (CDECL *pDestroyCursorIcon)(HCURSOR); void (CDECL *pSetCursor)(HCURSOR); BOOL (CDECL *pGetCursorPos)(LPPOINT);

1 0

Dmitry Timoshkov : kernel32/tests: Fix pipe tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 5628183bf4fc7a462ebb9fb0bbfb49b5efa47b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5628183bf4fc7a462ebb9fb0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:23 2013 +0900 kernel32/tests: Fix pipe tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/pipe.c | 77 +++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5628183bf4fc7a462ebb9…

1 0