January 2010 - Wine-Commits

Andrew Nguyen : ntdll/tests: Re-enable a commented virtual memory test.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: ab23f87bcca07cf2673a1448249e2efb301d637c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab23f87bcca07cf2673a14482… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:50 2010 -0600 ntdll/tests: Re-enable a commented virtual memory test. --- dlls/ntdll/tests/info.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index dc5de94..1914564 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -878,14 +878,10 @@ static void test_readvirtualmemory(void) ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); - /* this test currently crashes wine with "wine client error:<process id>: read: Bad address" - * because the reply from wine server is directly read into the buffer and that fails with EFAULT - */ /* illegal local address */ - /*status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status); + status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); - */ CloseHandle(process); }

1 0

Mike Kaplinskiy : msxml: getElementsByTagName does not respect namespaces.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 90cf2f1ac3a46a3321ee1ad9b00b5efdf2248e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cf2f1ac3a46a3321ee1ad9b… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jan 16 16:17:36 2010 -0500 msxml: getElementsByTagName does not respect namespaces. We can't just use //tagname; we have to do //*[local-name()='tagname']. --- dlls/msxml3/domdoc.c | 17 ++++++++++++++--- dlls/msxml3/element.c | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index be19e56..e75537f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1279,14 +1279,25 @@ static HRESULT WINAPI domdoc_getElementsByTagName( BSTR tagName, IXMLDOMNodeList** resultList ) { + static const WCHAR xpathformat[] = + { '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 }; domdoc *This = impl_from_IXMLDOMDocument2( iface ); LPWSTR szPattern; HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(tagName), resultList); - szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(2+lstrlenW(tagName)+1)); - szPattern[0] = szPattern[1] = '/'; - lstrcpyW(szPattern + 2, tagName); + if (tagName[0] == '*' && tagName[1] == 0) + { + szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*4); + szPattern[0] = szPattern[1] = '/'; + szPattern[2] = '*'; + szPattern[3] = 0; + } + else + { + szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(20+lstrlenW(tagName)+1)); + wsprintfW(szPattern, xpathformat, tagName); + } hr = queryresult_create((xmlNodePtr)get_doc(This), szPattern, resultList); HeapFree(GetProcessHeap(), 0, szPattern); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 63bf7af..b698042 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -666,6 +666,8 @@ static HRESULT WINAPI domelem_getElementsByTagName( IXMLDOMElement *iface, BSTR bstrName, IXMLDOMNodeList** resultList) { + static const WCHAR xpathformat[] = + { '.','/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 }; domelem *This = impl_from_IXMLDOMElement( iface ); LPWSTR szPattern; xmlNodePtr element; @@ -673,10 +675,19 @@ static HRESULT WINAPI domelem_getElementsByTagName( TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList); - szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(3+lstrlenW(bstrName)+1)); - szPattern[0] = '.'; - szPattern[1] = szPattern[2] = '/'; - lstrcpyW(szPattern+3, bstrName); + if (bstrName[0] == '*' && bstrName[1] == 0) + { + szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*5); + szPattern[0] = '.'; + szPattern[1] = szPattern[2] = '/'; + szPattern[3] = '*'; + szPattern[4] = 0; + } + else + { + szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(21+lstrlenW(bstrName)+1)); + wsprintfW(szPattern, xpathformat, bstrName); + } TRACE("%s\n", debugstr_w(szPattern)); element = get_element(This);

1 0

Uwe Bonnes : msvcrt: xxopen() accepts spaces in the mode string.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: d95c857a4f83668f3b12db2b4362834f18469f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95c857a4f83668f3b12db2b4… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Sat Jan 16 17:21:48 2010 +0100 msvcrt: xxopen() accepts spaces in the mode string. --- dlls/msvcrt/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index df42d47..a9678ed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1044,6 +1044,7 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *open_flags &= ~MSVCRT__O_BINARY; break; case '+': + case ' ': break; default: FIXME(":unknown flag %c not supported\n",mode[-1]);

1 0

André Hentschel : msvcrt/tests: Add some demangle tests.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 152c0d4b9307e8ce52df1bbf95a85031f864d9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=152c0d4b9307e8ce52df1bbf9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 16 14:45:12 2010 +0100 msvcrt/tests: Add some demangle tests. --- dlls/msvcrt/tests/cpp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 106ef73..40e11e1 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1034,6 +1034,10 @@ static void test_demangle(void) /* 113 */ {"?f(a)T@@QAEHQAY1BE(a)BO@$$CBD(a)Z", "public: int __thiscall T::f(char const (* const)[20][30])"}, /* 114 */ {"??0?$Foo(a)U?$vector_c(a)H$00$01$0?1$0A@$0A@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@@mpl(a)boost@@@@QAE(a)XZ", "public: __thiscall Foo<struct boost::mpl::vector_c<int,1,2,-2,0,0,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647> >::Foo<struct boost::mpl::vector_c<int,1,2,-2,0,0,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647> >(void)"}, +/* 115 */ {"?swprintf@@YAHPAGIPBGZZ", "int __cdecl swprintf(unsigned short *,unsigned int,unsigned short const *,...)"}, +/* 116 */ {"?vswprintf@@YAHPAGIPBGPAD(a)Z", "int __cdecl vswprintf(unsigned short *,unsigned int,unsigned short const *,char *)"}, +/* 117 */ {"?vswprintf@@YAHPA_WIPB_WPAD(a)Z", "int __cdecl vswprintf(wchar_t *,unsigned int,wchar_t const *,char *)"}, +/* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0]));

1 0

Andrew Nguyen : ntdll/tests: Report skip when time conversion functions are not available.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: bffdda5ab20ce96e59ec5fae54592f097eca4bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffdda5ab20ce96e59ec5fae5… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:44 2010 -0600 ntdll/tests: Report skip when time conversion functions are not available. --- dlls/ntdll/tests/time.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index cecf4a2..16530c4 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -101,4 +101,6 @@ START_TEST(time) pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); + else + win_skip("Required time conversion functions are not available\n"); }

1 0

Andrew Nguyen : advapi32/tests: Test SystemFunction036.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 3822f9d2e1cdfe1c77c5f026ba6eb686974a3702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3822f9d2e1cdfe1c77c5f026b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:02:47 2010 -0600 advapi32/tests: Test SystemFunction036. --- dlls/advapi32/tests/crypt.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index f317237..2a5993c 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,6 +64,7 @@ static BOOL (WINAPI *pCryptSetHashParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetKeyParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetProvParam)(HCRYPTPROV, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptVerifySignatureW)(HCRYPTHASH, BYTE*, DWORD, HCRYPTKEY, LPCWSTR, DWORD); +static BOOL (WINAPI *pSystemFunction036)(PVOID, ULONG); static void init_function_pointers(void) { @@ -99,6 +100,7 @@ static void init_function_pointers(void) pCryptSetKeyParam = (void*)GetProcAddress(hadvapi32, "CryptSetKeyParam"); pCryptSetProvParam = (void*)GetProcAddress(hadvapi32, "CryptSetProvParam"); pCryptVerifySignatureW = (void*)GetProcAddress(hadvapi32, "CryptVerifySignatureW"); + pSystemFunction036 = (void*)GetProcAddress(hadvapi32, "SystemFunction036"); } static void init_environment(void) @@ -1073,6 +1075,35 @@ static void test_rc2_keylen(void) } } +static void test_SystemFunction036(void) +{ + BOOL ret; + int test; + + if (!pSystemFunction036) + { + win_skip("SystemFunction036 is not available\n"); + return; + } + + ret = pSystemFunction036(NULL, 0); + ok(ret == TRUE, "Expected SystemFunction036 to return TRUE, got %d\n", ret); + + /* Test crashes on Windows. */ + if (0) + { + SetLastError(0xdeadbeef); + ret = pSystemFunction036(NULL, 5); + trace("ret = %d, GetLastError() = %d\n", ret, GetLastError()); + } + + ret = pSystemFunction036(&test, 0); + ok(ret == TRUE, "Expected SystemFunction036 to return TRUE, got %d\n", ret); + + ret = pSystemFunction036(&test, sizeof(int)); + ok(ret == TRUE, "Expected SystemFunction036 to return TRUE, got %d\n", ret); +} + START_TEST(crypt) { init_function_pointers(); @@ -1091,4 +1122,5 @@ START_TEST(crypt) test_enum_provider_types(); test_get_default_provider(); test_set_provider_ex(); + test_SystemFunction036(); }

1 0

Jason Edmeades : kernel32: Return error on second attempt to free a module.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 99a0376a4fb259332def88438aa5c122da6efaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a0376a4fb259332def88438… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jan 15 08:50:42 2010 -0800 kernel32: Return error on second attempt to free a module. --- dlls/kernel32/module.c | 3 +-- dlls/kernel32/tests/module.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ff3c3a5..96a240e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1003,8 +1003,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) { /* this is a LOAD_LIBRARY_AS_DATAFILE module */ char *ptr = (char *)hLibModule - 1; - UnmapViewOfFile( ptr ); - return TRUE; + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 4cb30a8..906646e 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -359,6 +359,24 @@ static void testLoadLibraryEx(void) ok(GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == ERROR_INVALID_HANDLE), /* nt4 */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Free the loaded dll when its the first time this dll is loaded + in process - First time should pass, second fail */ + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA("comctl32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); + ok(hmodule != 0, "Expected valid module handle\n"); + + SetLastError(0xdeadbeef); + ok(FreeLibrary(hmodule), + "Expected to be able to free the module, failed with %d\n", + GetLastError()); + SetLastError(0xdeadbeef); + ok(!FreeLibrary(hmodule), + "Unexpected ability to free the module, failed with %d\n", + GetLastError()); + + CloseHandle(hmodule); + } START_TEST(module)

1 0

Andrew Nguyen : ntdll/tests: Remove useless ifdef statements.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 83dbc3d46a86b1f93db3d924ade72bb1c6537b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83dbc3d46a86b1f93db3d924a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:39 2010 -0600 ntdll/tests: Remove useless ifdef statements. --- dlls/ntdll/tests/time.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 2e9adbc..cecf4a2 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -20,8 +20,6 @@ #include "ntdll_test.h" -#ifdef __WINE_WINTERNL_H - #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 #define SECSPERDAY 86400 @@ -95,15 +93,12 @@ static void test_pRtlTimeToTimeFields(void) litime.QuadPart += (LONGLONG) tftest.Day * TICKSPERSEC * SECSPERDAY; } } -#endif START_TEST(time) { -#ifdef __WINE_WINTERNL_H HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); -#endif }

1 0

Andrew Nguyen : ntdll/tests: Remove obsolete commented code.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 063da0a1834ef29e1c03525029cd6c2e3f24d0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063da0a1834ef29e1c0352502… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:46:31 2010 -0600 ntdll/tests: Remove obsolete commented code. --- dlls/ntdll/tests/error.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index b65d7d0..ee8b9b2 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -892,12 +892,6 @@ static void run_error_tests(void) cmp2(STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE, ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE); cmp2(STATUS_CTX_SHADOW_NOT_RUNNING, ERROR_CTX_SHADOW_NOT_RUNNING); cmp2(STATUS_LICENSE_VIOLATION, ERROR_CTX_LICENSE_NOT_AVAILABLE); -#if 0 - /* FIXME - unknown STATUS values, see bug 1001 */ - cmp(STATUS_ENDPOINT_CLOSED, ERROR_DEV_NOT_EXIST); - cmp(STATUS_DISCONNECTED, ERROR_DEV_NOT_EXIST); - cmp(STATUS_NONEXISTENT_NET_NAME, ERROR_DEV_NOT_EXIST); -#endif cmp2(STATUS_NETWORK_SESSION_EXPIRED, ERROR_NO_USER_SESSION_KEY); cmp2(STATUS_FILES_OPEN, ERROR_OPEN_FILES); cmp2(STATUS_SXS_SECTION_NOT_FOUND, ERROR_SXS_SECTION_NOT_FOUND);

1 0

Kusanagi Kouichi : user32: Add definitions for EM_GETIMESTATUS and EM_SETIMESTATUS.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: cc669af6ba98bd20c42007a05159e8054c6bc558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc669af6ba98bd20c42007a05… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Jan 15 22:22:28 2010 +0900 user32: Add definitions for EM_GETIMESTATUS and EM_SETIMESTATUS. --- include/winuser.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 91fca34..1a0ea5a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -970,6 +970,14 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); /* a name change since win95 */ #define EM_SETLIMITTEXT EM_LIMITTEXT +/* IMESTATUS type */ +#define EMSIS_COMPOSITIONSTRING 1 + +/* IMESTATUS type specific data */ +#define EIMES_GETCOMPSTRATONCE 0x0001 +#define EIMES_CANCELCOMPSTRINFOCUS 0x0002 +#define EIMES_COMPLETECOMPSTRKILLFOCUS 0x0004 + /* EDITWORDBREAKPROC code values */ #define WB_LEFT 0 #define WB_RIGHT 1

1 0