January 2009 - Wine-commits

Jacek Caban : urlmon: Skip more tests on old IE and ignore BINDSTATUS_PROXYDETECTING notification .
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 4ac8322db468cc9c94efd7fafb964e10c385b9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac8322db468cc9c94efd7faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 7 00:42:03 2009 +0100 urlmon: Skip more tests on old IE and ignore BINDSTATUS_PROXYDETECTING notification. --- dlls/urlmon/tests/url.c | 157 +++++++++++++++++++++++++---------------------- 1 files changed, 84 insertions(+), 73 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 830ef1a..2428dc0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1248,6 +1248,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP ok(0, "unexpected call\n"); ok(szStatusText == NULL, "Expected szStatusText to be NULL\n"); break; + case BINDSTATUS_PROXYDETECTING: + trace("BINDSTATUS_PROXYDETECTING\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); }; @@ -1768,7 +1771,7 @@ static void test_CreateAsyncBindCtxEx(void) IBindCtx_Release(bctx2); } -static void test_bscholder(IBindStatusCallback *holder) +static BOOL test_bscholder(IBindStatusCallback *holder) { IServiceProvider *serv_prov; IHttpNegotiate *http_negotiate, *http_negotiate_serv; @@ -1776,6 +1779,7 @@ static void test_bscholder(IBindStatusCallback *holder) IAuthenticate *authenticate, *authenticate_serv; IInternetProtocol *protocol; BINDINFO bindinfo = {sizeof(bindinfo)}; + BOOL ret = TRUE; LPWSTR wstr; DWORD dw; HRESULT hres; @@ -1847,6 +1851,7 @@ static void test_bscholder(IBindStatusCallback *holder) IHttpNegotiate_Release(http_negotiate2); }else { skip("Could not get IHttpNegotiate2\n"); + ret = FALSE; } SET_EXPECT(OnProgress_FINDINGRESOURCE); @@ -1897,12 +1902,14 @@ static void test_bscholder(IBindStatusCallback *holder) CHECK_CALLED(QueryService_IInternetProtocol); IServiceProvider_Release(serv_prov); + return ret; } -static void test_RegisterBindStatusCallback(void) +static BOOL test_RegisterBindStatusCallback(void) { IBindStatusCallback *prevbsc, *clb; IBindCtx *bindctx; + BOOL ret = TRUE; IUnknown *unk; HRESULT hres; @@ -1933,7 +1940,8 @@ static void test_RegisterBindStatusCallback(void) ok(hres == S_OK, "QueryInterface(IID_IBindStatusCallback) failed: %08x\n", hres); ok(clb != &bsc, "bsc == clb\n"); - test_bscholder(clb); + if(!test_bscholder(clb)) + ret = FALSE; IBindStatusCallback_Release(clb); @@ -1958,6 +1966,7 @@ static void test_RegisterBindStatusCallback(void) ok(hres == E_INVALIDARG, "RevokeBindStatusCallback failed: %08x\n", hres); IBindCtx_Release(bindctx); + return ret; } #define BINDTEST_EMULATE 1 @@ -2570,110 +2579,112 @@ START_TEST(url) test_create(); test_CreateAsyncBindCtx(); test_CreateAsyncBindCtxEx(); - test_RegisterBindStatusCallback(); - test_BindToStorage_fail(); - trace("synchronous http test (COM not initialised)...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + if(!test_RegisterBindStatusCallback()) { + test_BindToStorage_fail(); + + trace("synchronous http test (COM not initialised)...\n"); + test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); - CoInitialize(NULL); + CoInitialize(NULL); - trace("synchronous http test...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + trace("synchronous http test...\n"); + test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); - trace("synchronous http test (to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + trace("synchronous http test (to object)...\n"); + test_BindToObject(HTTP_TEST, FALSE); - trace("synchronous file test...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); + trace("synchronous file test...\n"); + test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); - trace("synchronous file test (to object)...\n"); - test_BindToObject(FILE_TEST, FALSE); + trace("synchronous file test (to object)...\n"); + test_BindToObject(FILE_TEST, FALSE); - bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; - trace("http test...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + trace("http test...\n"); + test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); - trace("http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, FALSE, TYMED_FILE); + trace("http test (to file)...\n"); + test_BindToStorage(HTTP_TEST, FALSE, TYMED_FILE); - trace("http test (to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + trace("http test (to object)...\n"); + test_BindToObject(HTTP_TEST, FALSE); - trace("http test (short response)...\n"); - http_is_first = TRUE; - urls[HTTP_TEST] = SHORT_RESPONSE_URL; - test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); + trace("http test (short response)...\n"); + http_is_first = TRUE; + urls[HTTP_TEST] = SHORT_RESPONSE_URL; + test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); - trace("http test (short response, to object)...\n"); - test_BindToObject(HTTP_TEST, FALSE); + trace("http test (short response, to object)...\n"); + test_BindToObject(HTTP_TEST, FALSE); - trace("emulated http test...\n"); - test_BindToStorage(HTTP_TEST, TRUE, TYMED_ISTREAM); + trace("emulated http test...\n"); + test_BindToStorage(HTTP_TEST, TRUE, TYMED_ISTREAM); - trace("emulated http test (to object)...\n"); - test_BindToObject(HTTP_TEST, TRUE); + trace("emulated http test (to object)...\n"); + test_BindToObject(HTTP_TEST, TRUE); - trace("emulated http test (to file)...\n"); - test_BindToStorage(HTTP_TEST, TRUE, TYMED_FILE); + trace("emulated http test (to file)...\n"); + test_BindToStorage(HTTP_TEST, TRUE, TYMED_FILE); - trace("about test...\n"); - test_BindToStorage(ABOUT_TEST, FALSE, TYMED_ISTREAM); + trace("about test...\n"); + test_BindToStorage(ABOUT_TEST, FALSE, TYMED_ISTREAM); - trace("about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, FALSE, TYMED_FILE); + trace("about test (to file)...\n"); + test_BindToStorage(ABOUT_TEST, FALSE, TYMED_FILE); - trace("about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, FALSE); + trace("about test (to object)...\n"); + test_BindToObject(ABOUT_TEST, FALSE); - trace("emulated about test...\n"); - test_BindToStorage(ABOUT_TEST, TRUE, TYMED_ISTREAM); + trace("emulated about test...\n"); + test_BindToStorage(ABOUT_TEST, TRUE, TYMED_ISTREAM); - trace("emulated about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, TRUE, TYMED_FILE); + trace("emulated about test (to file)...\n"); + test_BindToStorage(ABOUT_TEST, TRUE, TYMED_FILE); - trace("emulated about test (to object)...\n"); - test_BindToObject(ABOUT_TEST, TRUE); + trace("emulated about test (to object)...\n"); + test_BindToObject(ABOUT_TEST, TRUE); - trace("file test...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); + trace("file test...\n"); + test_BindToStorage(FILE_TEST, FALSE, TYMED_ISTREAM); - trace("file test (to file)...\n"); - test_BindToStorage(FILE_TEST, FALSE, TYMED_FILE); + trace("file test (to file)...\n"); + test_BindToStorage(FILE_TEST, FALSE, TYMED_FILE); - trace("file test (to object)...\n"); - test_BindToObject(FILE_TEST, FALSE); + trace("file test (to object)...\n"); + test_BindToObject(FILE_TEST, FALSE); - trace("emulated file test...\n"); - test_BindToStorage(FILE_TEST, TRUE, TYMED_ISTREAM); + trace("emulated file test...\n"); + test_BindToStorage(FILE_TEST, TRUE, TYMED_ISTREAM); - trace("emulated file test (to file)...\n"); - test_BindToStorage(FILE_TEST, TRUE, TYMED_FILE); + trace("emulated file test (to file)...\n"); + test_BindToStorage(FILE_TEST, TRUE, TYMED_FILE); - trace("emulated file test (to object)...\n"); - test_BindToObject(FILE_TEST, TRUE); + trace("emulated file test (to object)...\n"); + test_BindToObject(FILE_TEST, TRUE); - trace("emulated its test...\n"); - test_BindToStorage(ITS_TEST, TRUE, TYMED_ISTREAM); + trace("emulated its test...\n"); + test_BindToStorage(ITS_TEST, TRUE, TYMED_ISTREAM); - trace("emulated its test (to file)...\n"); - test_BindToStorage(ITS_TEST, TRUE, TYMED_FILE); + trace("emulated its test (to file)...\n"); + test_BindToStorage(ITS_TEST, TRUE, TYMED_FILE); - trace("emulated mk test...\n"); - test_BindToStorage(MK_TEST, TRUE, TYMED_ISTREAM); + trace("emulated mk test...\n"); + test_BindToStorage(MK_TEST, TRUE, TYMED_ISTREAM); - trace("test URLDownloadToFile for file protocol...\n"); - test_URLDownloadToFile(FILE_TEST, FALSE); + trace("test URLDownloadToFile for file protocol...\n"); + test_URLDownloadToFile(FILE_TEST, FALSE); - trace("test URLDownloadToFile for emulated file protocol...\n"); - test_URLDownloadToFile(FILE_TEST, TRUE); + trace("test URLDownloadToFile for emulated file protocol...\n"); + test_URLDownloadToFile(FILE_TEST, TRUE); - trace("test URLDownloadToFile for http protocol...\n"); - test_URLDownloadToFile(HTTP_TEST, FALSE); + trace("test URLDownloadToFile for http protocol...\n"); + test_URLDownloadToFile(HTTP_TEST, FALSE); - trace("test failures...\n"); - test_BindToStorage_fail(); + trace("test failures...\n"); + test_BindToStorage_fail(); + } DeleteFileA(wszIndexHtmlA); CloseHandle(complete_event);

1 0

Andrew Talbot : jscript: Declare a function static.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 3fd7a474d8704905d21b5abd1aab5959907a72b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd7a474d8704905d21b5abd1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 6 22:26:58 2009 +0000 jscript: Declare a function static. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 31f4796..86410af 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -828,7 +828,7 @@ HRESULT jsdisp_call_value(DispatchEx *disp, LCID lcid, WORD flags, DISPPARAMS *d return disp->builtin_info->value_prop.invoke(disp, lcid, flags, dp, retv, ei, caller); } -HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, +static HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { dispex_prop_t *prop;

1 0

Paul Vriens : shell32/tests: Use a different name for the return value.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: ee889ba44cd3edaf224a32a928364b77bc0a2123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee889ba44cd3edaf224a32a92… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 17:20:12 2009 +0100 shell32/tests: Use a different name for the return value. --- dlls/shell32/tests/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 7705292..d051bc9 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1107,8 +1107,8 @@ static void test_copy(void) shfo.fAnyOperationsAborted = FALSE; shfo.fFlags = FOF_NOERRORUI | FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); - ok(retval == ERROR_NO_MORE_SEARCH_HANDLES, - "Expected ERROR_NO_MORE_SEARCH_HANDLES, got %d\n", retval); + ok(retval == DE_SAMEFILE, + "Expected DE_SAMEFILE, got %d\n", retval); ok(!shfo.fAnyOperationsAborted, "Expected no operations to be aborted\n"); ok(DeleteFile("b.txt"), "Expected b.txt to exist\n"); ok(!file_exists("c.txt"), "Expected c.txt to not exist\n");

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4 (FO_MOVE).
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 53acd137320c23eba536127f5b9b1189814bb2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=53acd137320c23eba536127f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 18:04:56 2009 +0100 shell32/tests: Fix some test failures on NT4 (FO_MOVE). --- dlls/shell32/tests/shlfileop.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d051bc9..3169def 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1549,11 +1549,10 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); ok(!SHFileOperationA(&shfo2), "Move many files\n"); - ok(file_exists("test6.txt"), "The file is moved - many files are " + ok(DeleteFileA("test6.txt"), "The file is not moved - many files are " "specified as a target\n"); - DeleteFileA("test6.txt"); - DeleteFileA("test7.txt"); - RemoveDirectoryA("test8.txt"); + ok(DeleteFileA("test7.txt"), "The file is not moved\n"); + ok(RemoveDirectoryA("test8.txt"), "The directory is not moved\n"); init_shfo_tests(); @@ -1628,9 +1627,18 @@ static void test_move(void) shfo.pFrom = "test1.txt\0"; shfo.pTo = "a.txt\0b.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); - ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); + if (retval == DE_OPCANCELLED) + { + /* NT4 fails and doesn't move any files */ + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); + DeleteFileA("test1.txt"); + } + else + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); + } ok(!file_exists("b.txt"), "Expected b.txt to not exist\n"); /* move two files to one other */ @@ -1727,9 +1735,17 @@ static void test_move(void) /* try to overwrite an existing file */ shfo.pTo = "test3.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); - ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + if (retval == DE_OPCANCELLED) + { + /* NT4 fails and doesn't move any files */ + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + } + else + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + } } static void test_sh_create_dir(void)

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4 (FO_COPY).
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 9ae3137edde350564a5c61ee9264f48c52bdef68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae3137edde350564a5c61ee9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 21:16:20 2009 +0100 shell32/tests: Fix some test failures on NT4 (FO_COPY). --- dlls/shell32/tests/shlfileop.c | 171 ++++++++++++++++++++++++++++----------- 1 files changed, 123 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ae3137edde350564a5c6…

1 0

Andrew Fenn : xinput1_3: Added tests for XInputGetKeystroke.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 1b3feb2a5c2bc8f1ca3b533885f8afb102b6bbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3feb2a5c2bc8f1ca3b53388… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Tue Jan 6 20:48:19 2009 +0700 xinput1_3: Added tests for XInputGetKeystroke. --- dlls/xinput1_3/tests/xinput.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 4b7f130..c137b0c 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -27,6 +27,7 @@ static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); static void (WINAPI *pXInputEnable)(BOOL); +static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE); static void test_set_state(void) { @@ -96,6 +97,30 @@ static void test_get_state(void) ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } +static void test_get_keystroke(void) +{ + XINPUT_KEYSTROKE keystroke; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); + + result = pXInputGetKeystroke(controllerNum, XINPUT_FLAG_GAMEPAD, &keystroke); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetKeystroke failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + } + + ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); + result = pXInputGetKeystroke(XUSER_MAX_COUNT+1, XINPUT_FLAG_GAMEPAD, &keystroke); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetKeystroke returned (%d)\n", result); +} + static void test_get_capabilities(void) { XINPUT_CAPABILITIES capabilities; @@ -134,9 +159,11 @@ START_TEST(xinput) pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); test_set_state(); test_get_state(); + test_get_keystroke(); test_get_capabilities(); FreeLibrary(hXinput); }

1 0

Aleksey Bragin : ntdll: Fix buffer overread in RtlNumberOfSetBits.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 4f74de5b366275ea522e269d29d2011a7b153e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f74de5b366275ea522e269d2… Author: Aleksey Bragin <aleksey(a)reactos.org> Date: Wed Dec 24 06:04:25 2008 +0400 ntdll: Fix buffer overread in RtlNumberOfSetBits. --- dlls/ntdll/rtlbitmap.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index ef033b2..806e0e8 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -555,9 +555,12 @@ ULONG WINAPI RtlNumberOfSetBits(PCRTL_BITMAP lpBits) lpOut++; } - bMasked = *lpOut & NTDLL_maskBits[ulRemainder]; - ulSet += NTDLL_nibbleBitCount[bMasked >> 4]; - ulSet += NTDLL_nibbleBitCount[bMasked & 0xf]; + if (ulRemainder) + { + bMasked = *lpOut & NTDLL_maskBits[ulRemainder]; + ulSet += NTDLL_nibbleBitCount[bMasked >> 4]; + ulSet += NTDLL_nibbleBitCount[bMasked & 0xf]; + } } return ulSet; }

1 0

Alexandre Julliard : regedit: Convert error box display to Unicode.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 4be4b19ee77385f8ccf117b6025dfa89f3082d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be4b19ee77385f8ccf117b60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 21:09:43 2009 +0100 regedit: Convert error box display to Unicode. --- programs/regedit/edit.c | 22 ++++++++++------------ programs/regedit/framewnd.c | 4 +--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 5856b64..2c5b23d 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -49,19 +49,19 @@ struct edit_params static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) { - TCHAR title[256]; - TCHAR errfmt[1024]; - TCHAR errstr[1024]; + static const WCHAR errorW[] = {'E','r','r','o','r',0}; + static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',' ','e','r','r','o','r',' ','s','t','r','i','n','g','!',0}; - if (!LoadString(hInst, titleId, title, COUNT_OF(title))) - lstrcpy(title, "Error"); + WCHAR title[256]; + WCHAR errfmt[1024]; + WCHAR errstr[1024]; - if (!LoadString(hInst, resId, errfmt, COUNT_OF(errfmt))) - lstrcpy(errfmt, "Unknown error string!"); + if (!LoadStringW(hInst, titleId, title, COUNT_OF(title))) lstrcpyW(title, errorW); + if (!LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt))) lstrcpyW(errfmt, unknownW); - _vsntprintf(errstr, COUNT_OF(errstr), errfmt, ap); + vsnprintfW(errstr, COUNT_OF(errstr), errfmt, ap); - return MessageBox(hwnd, errstr, title, buttons); + return MessageBoxW(hwnd, errstr, title, buttons); } static INT messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, ...) @@ -401,7 +401,6 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) BOOL result = FALSE; LONG lRet; HKEY hKey; - CHAR* keyPathA = GetMultiByteString(keyPath); lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { @@ -409,7 +408,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) return FALSE; } - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, keyPathA) != IDYES) + if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, keyPath) != IDYES) goto done; lRet = SHDeleteKeyW(hKeyRoot, keyPath); @@ -421,7 +420,6 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) done: RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, keyPathA); return result; } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 5b19899..79dcf24 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -757,9 +757,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) SetFocus(g_pChildWnd->hTreeWnd); } } else { - CHAR* searchStringA = GetMultiByteString(searchString); - error(hWnd, IDS_NOTFOUND, searchStringA); - HeapFree(GetProcessHeap(), 0, searchStringA); + error(hWnd, IDS_NOTFOUND, searchString); } } break;

1 0

Alexandre Julliard : include/msvcrt: Replace va_list by __ms_va_list for x86_64.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 3ad7f772985ac103e4a3226a161d188ce6e89c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad7f772985ac103e4a3226a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 21:09:58 2009 +0100 include/msvcrt: Replace va_list by __ms_va_list for x86_64. --- include/msvcrt/crtdefs.h | 12 ++++++++++++ include/msvcrt/stdio.h | 18 +++++++++--------- include/msvcrt/wchar.h | 8 ++++---- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index fce448e..9eac870 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -68,6 +68,18 @@ # endif #endif /* __cdecl */ +#ifndef __ms_va_list +# if defined(__x86_64__) && defined (__GNUC__) +# define __ms_va_list __builtin_ms_va_list +# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __ms_va_end(list) __builtin_ms_va_end(list) +# else +# define __ms_va_list va_list +# define __ms_va_start(list,arg) va_start(list,arg) +# define __ms_va_end(list) va_end(list) +# endif +#endif + #ifndef _INTPTR_T_DEFINED #ifdef _WIN64 typedef __int64 intptr_t; diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 98cc950..b65a2b1 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -115,7 +115,7 @@ int __cdecl _setmaxstdio(int); int __cdecl _snprintf(char*,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); -int __cdecl _vsnprintf(char*,size_t,const char*,va_list); +int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*); @@ -155,9 +155,9 @@ int __cdecl sscanf(const char*,const char*,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -int __cdecl vfprintf(FILE*,const char*,va_list); -int __cdecl vprintf(const char*,va_list); -int __cdecl vsprintf(char*,const char*,va_list); +int __cdecl vfprintf(FILE*,const char*,__ms_va_list); +int __cdecl vprintf(const char*,__ms_va_list); +int __cdecl vsprintf(char*,const char*,__ms_va_list); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED @@ -166,7 +166,7 @@ wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); -int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list); +int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*); @@ -193,9 +193,9 @@ int __cdecl putws(const wchar_t*); int __cdecl swprintf(wchar_t*,const wchar_t*,...); int __cdecl swscanf(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vfwprintf(FILE*,const wchar_t*,va_list); -int __cdecl vswprintf(wchar_t*,const wchar_t*,va_list); -int __cdecl vwprintf(const wchar_t*,va_list); +int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); +int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); +int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); #endif /* _WSTDIO_DEFINED */ @@ -218,7 +218,7 @@ static inline char* tempnam(const char *dir, const char *prefix) { return _tempn static inline int unlink(const char* path) { return _unlink(path); } #define _UNLINK_DEFINED #endif -static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args) { return _vsnprintf(buffer,size,format,args); } +static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } static inline wint_t fgetwchar(void) { return _fgetwchar(); } static inline wint_t fputwchar(wint_t wc) { return _fputwchar(wc); } diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d966caa..77bcc10 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -275,7 +275,7 @@ wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); -int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list); +int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*); @@ -302,9 +302,9 @@ int __cdecl putws(const wchar_t*); int __cdecl swprintf(wchar_t*,const wchar_t*,...); int __cdecl swscanf(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vfwprintf(FILE*,const wchar_t*,va_list); -int __cdecl vswprintf(wchar_t*,const wchar_t*,va_list); -int __cdecl vwprintf(const wchar_t*,va_list); +int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); +int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); +int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl wprintf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...); #endif /* _WSTDIO_DEFINED */

1 0

Andrew Fenn : xinput1_3: Added stub code for XInputGetKeystroke.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: ac3e24c5c934020a970f2f17138d25ec2de4c35e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3e24c5c934020a970f2f171… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Tue Jan 6 20:47:23 2009 +0700 xinput1_3: Added stub code for XInputGetKeystroke. --- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_3/xinput1_3_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 7c71bd5..f2d961c 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,7 +1,7 @@ @ stdcall XInputEnable(long) @ stdcall XInputSetState(long ptr) @ stdcall XInputGetState(long ptr) -@ stub XInputGetKeystroke #(long long ptr) +@ stdcall XInputGetKeystroke(long long ptr) @ stdcall XInputGetCapabilities(long long ptr) @ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr) @ stub XInputGetBatteryInformation diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 7f28f37..636dcd1 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -79,6 +79,18 @@ DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) return ERROR_BAD_ARGUMENTS; } +DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYSTROKE pKeystroke) +{ + FIXME("(%d %d %p) Stub!\n", dwUserIndex, dwReserve, pKeystroke); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) { FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities);

1 0