June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : rpcrt4/tests: Fix the marshalling test for Win64.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: c3c8aa3b2387427e06f0b2bff6db578b6b62faf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c8aa3b2387427e06f0b2bff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:38:46 2009 +0200 rpcrt4/tests: Fix the marshalling test for Win64. --- dlls/rpcrt4/tests/ndr_marshall.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c48f7de..d8ba912 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -221,7 +221,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4, "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); @@ -231,7 +231,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + 16, "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *) + 16, "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); @@ -241,9 +241,9 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *) + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); else - ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); size = srcsize; if(formattypes[1] & 0x10) size += 4; @@ -901,6 +901,25 @@ static void test_simple_struct(void) { 0x12, 0x0, /* FC_UP */ NdrFcShort( 0x2 ), /* Offset=2 */ +#ifdef _WIN64 + 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ + NdrFcShort(0x18), /* [size 24] */ + NdrFcShort(0x0), + NdrFcShort(0x8), /* Offset= 8 (266) */ + 0x08, /* FC_LONG */ + 0x39, /* FC_ALIGNM8 */ + 0x36, /* FC_POINTER */ + 0x36, /* FC_POINTER */ + 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x08, /* FC_LONG */ + 0x5c, /* FC_PAD */ + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x02, /* FC_CHAR */ + 0x5c, /* FC_PAD */ +#else 0x16, 0x3, /* FC_PSTRUCT [align 4] */ NdrFcShort( 0xc ), /* [size 12] */ 0x4b, /* FC_PP */ @@ -925,7 +944,7 @@ static void test_simple_struct(void) 0x8, /* FC_LONG */ 0x5c, /* FC_PAD */ 0x5b, /* FC_END */ - +#endif }; /* zero the entire structure, including the holes */ @@ -949,6 +968,8 @@ static void test_simple_struct(void) memcpy(wiredata + 4, &s1, wiredatalen); test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); + if (sizeof(void *) == 8) return; /* it cannot be represented as a simple struct on Win64 */ + /* zero the entire structure, including the hole */ memset(&ps1, 0, sizeof(ps1)); @@ -1570,7 +1591,7 @@ todo_wine { } my_alloc_called = 0; - mem = mem_orig; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */

1 0

Alexandre Julliard : rpcrt4/tests: Fix the marshalling test for Win9x.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 39d75dfba422d1a1a1e4f3dd0290b22b360af7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d75dfba422d1a1a1e4f3dd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:49:20 2009 +0200 rpcrt4/tests: Fix the marshalling test for Win9x. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d8ba912..2aa8146 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -211,8 +211,16 @@ static void test_pointer_marshal(const unsigned char *formattypes, ptr = NdrPointerMarshall( &StubMsg, memsrc, formattypes ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + if (srcsize == 8 && wiredatalen == 16 && StubMsg.Buffer - StubMsg.BufferStart == 12) + { + /* win9x doesn't align 8-byte types properly */ + wiredatalen = 12; + } + else + { + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + } StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0;

1 0

Alexandre Julliard : ntdll: Simplify the thread startup routine and make it CPU-specific.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: f124c7cc38e7edf0823347afa5f8e7126143080d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f124c7cc38e7edf0823347afa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 16:38:30 2009 +0200 ntdll: Simplify the thread startup routine and make it CPU-specific. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 31 ++++++++++++++++ dlls/ntdll/signal_powerpc.c | 17 +++++++++ dlls/ntdll/signal_sparc.c | 17 +++++++++ dlls/ntdll/signal_x86_64.c | 18 +++++++++ dlls/ntdll/thread.c | 82 +++--------------------------------------- 6 files changed, 90 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3e54250..6129962 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -48,6 +48,7 @@ extern void set_cpu_context( const CONTEXT *context ); extern void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ); extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ); extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ); +extern void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) DECLSPEC_NORETURN; /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dc1f12c..0efce89 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2264,6 +2264,37 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/* wrapper for apps that don't declare the thread function correctly */ +extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_func, + "pushl %ebp\n\t" + "movl %esp,%ebp\n\t" + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leal -4(%ebp),%esp\n\t" + "pushl %eax\n\t" + "call " __ASM_NAME("RtlExitUserThread") "\n\t" + "int $3" ) + +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + call_thread_func( entry, arg ); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 40b8061..4401006 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1086,6 +1086,23 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index a024d2e..17bfc54 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -828,6 +828,23 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 83b84dc..7ff38af 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2551,6 +2551,24 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + + /********************************************************************** * __wine_enter_vm86 (NTDLL.@) */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1a5017e..cd54b31 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -388,66 +388,6 @@ static void DECLSPEC_NORETURN exit_thread( int status ) } -#ifdef __i386__ -/* wrapper for apps that don't declare the thread function correctly */ -extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC(call_thread_entry_point, - "pushl %ebp\n\t" - "movl %esp,%ebp\n\t" - "subl $4,%esp\n\t" - "pushl 12(%ebp)\n\t" - "movl 8(%ebp),%eax\n\t" - "call *%eax\n\t" - "leave\n\t" - "ret" ) -#else -static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) -{ - LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)entry; - return func( arg ); -} -#endif - -/*********************************************************************** - * call_thread_func - * - * Hack to make things compatible with the thread procedures used by kernel32.CreateThread. - */ -static void DECLSPEC_NORETURN call_thread_func( PRTL_THREAD_START_ROUTINE rtl_func, void *arg ) -{ - DWORD exit_code; - BOOL last; - - MODULE_DllThreadAttach( NULL ); - - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), rtl_func, arg ); - - exit_code = call_thread_entry_point( rtl_func, arg ); - - /* send the exit code to the server */ - SERVER_START_REQ( terminate_thread ) - { - req->handle = wine_server_obj_handle( GetCurrentThread() ); - req->exit_code = exit_code; - wine_server_call( req ); - last = reply->last; - } - SERVER_END_REQ; - - if (last) - { - LdrShutdownProcess(); - exit( exit_code ); - } - else - { - LdrShutdownThread(); - exit_thread( exit_code ); - } -} - - /*********************************************************************** * start_thread * @@ -474,22 +414,12 @@ static void start_thread( struct startup_info *info ) InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); - /* NOTE: Windows does not have an exception handler around the call to - * the thread attach. We do for ease of debugging */ - if (unhandled_exception_filter) - { - __TRY - { - call_thread_func( func, arg ); - } - __EXCEPT(unhandled_exception_filter) - { - NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); - } - __ENDTRY - } - else - call_thread_func( func, arg ); + MODULE_DllThreadAttach( NULL ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); }

1 0

Paul Vriens : wldap32/tests: Skip a test on older versions of wldap32 to prevent a crash.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: d17f3fe8a500c66273ee03a146bda8ca873c012d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17f3fe8a500c66273ee03a14… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 13:35:00 2009 +0200 wldap32/tests: Skip a test on older versions of wldap32 to prevent a crash. --- dlls/wldap32/tests/parse.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index d4b5de2..0f22d23 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -57,8 +57,13 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + if (GetProcAddress(GetModuleHandle("wldap32.dll"), "ber_init")) + { + ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + } + else + win_skip("Test would crash on older wldap32 versions\n"); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );

1 0

Paul Vriens : shell32/tests: Fix some test failures on Vista and higher.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 61b89b630838e27a4621703740ba57798a3893ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b89b630838e27a462170374… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 11:03:19 2009 +0200 shell32/tests: Fix some test failures on Vista and higher. --- dlls/shell32/tests/shlfolder.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 255d019..f09afbc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -81,6 +81,15 @@ static void init_function_pointers(void) ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); } +static const char *wine_dbgstr_w(LPCWSTR str) +{ + static char buf[512]; + if (!str) + return "(null)"; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_ParseDisplayName(void) { HRESULT hr; @@ -1120,6 +1129,10 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'A','t','t','r','i','b','u','t','e','s',0 }; static const WCHAR wszResolveLinkFlags[] = { 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; + static const WCHAR wszTargetKnownFolder[] = { + 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 }; + static const WCHAR wszCLSID[] = { + 'C','L','S','I','D',0 }; if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { ok(V_VT(pVar) == VT_I4 || @@ -1159,7 +1172,19 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC return S_OK; } - ok(FALSE, "PropertyBag was asked for unknown property (vt=%d)!\n", V_VT(pVar)); + if (!lstrcmpW(pszPropName, wszTargetKnownFolder)) { + ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'TargetKnownFolder' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + if (!lstrcmpW(pszPropName, wszCLSID)) { + ok(V_VT(pVar) == VT_EMPTY, "Wrong variant type for 'CLSID' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + ok(FALSE, "PropertyBag was asked for unknown property %s (vt=%d)!\n", wine_dbgstr_w(pszPropName), V_VT(pVar)); return E_INVALIDARG; } @@ -1626,15 +1651,6 @@ static void testSHGetFolderPathAndSubDirA(void) RemoveDirectoryA(testpath); } -static const char *wine_dbgstr_w(LPCWSTR str) -{ - static char buf[512]; - if (!str) - return "(null)"; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; -} - static void test_LocalizedNames(void) { static char cCurrDirA[MAX_PATH];

1 0

Francois Gouget : dmime: Remove patterntrack.c and tool. c as they are unused and don't correspond to objects.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: da1601e262ae778a8aa248ed86bb5b7a4c31074b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1601e262ae778a8aa248ed8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 18 11:11:37 2009 +0200 dmime: Remove patterntrack.c and tool.c as they are unused and don't correspond to objects. --- dlls/dmime/Makefile.in | 2 - dlls/dmime/dmime_private.h | 26 --------- dlls/dmime/patterntrack.c | 106 ---------------------------------- dlls/dmime/tool.c | 134 -------------------------------------------- 4 files changed, 0 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da1601e262ae778a8aa24…

1 0

Detlef Riekenberg : mlang/tests: Some old IE versions truncate one character too short.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 957f52b4f358f88337f7bc35db1f9e0f90756652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957f52b4f358f88337f7bc35d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 17 20:58:10 2009 +0200 mlang/tests: Some old IE versions truncate one character too short. --- dlls/mlang/tests/mlang.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 14568df..1f317f4 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,7 +121,7 @@ static const WCHAR de_engb[] = {'E','n','g','l','i','s','c','h',' ', '(','G','r','o',0xDF,'b','r','i','t','a','n','n','i','e','n',')',0}; static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', '(','V','e','r','e','i','n','i','g','t','e','s',' ', - 'K',0xF6,'n','i','g','r','e','i',0}; + 'K',0xF6,'n','i','g','r','e','i','c',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ', @@ -266,6 +266,17 @@ static int mylstrcmpW(const WCHAR* str1, const WCHAR* str2) return *str1-*str2; } +/* lstrcpyW is not supported on Win95 */ +static void mylstrcpyW(WCHAR* str1, const WCHAR* str2) +{ + while (str2 && *str2) { + *str1 = *str2; + str1++; + str2++; + } + *str1 = '\0'; +} + #define DEBUGSTR_W_MAXLEN 64 static CHAR * debugstr_w(const WCHAR * strW) @@ -1238,6 +1249,7 @@ static void test_LcidToRfc1766(void) static void test_GetRfc1766Info(IMultiLanguage2 *iML2) { + WCHAR short_broken_name[MAX_LOCALE_NAME]; CHAR rfc1766A[MAX_RFC1766_NAME + 1]; BYTE buffer[sizeof(RFC1766INFO) + 4]; PRFC1766INFO prfc = (RFC1766INFO *) buffer; @@ -1258,16 +1270,22 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); + /* Some IE versions truncate an oversized name one character to short */ + mylstrcpyW(short_broken_name, info_table[i].broken_name); + short_broken_name[MAX_LOCALE_NAME - 2] = '\0'; + if (info_table[i].todo & TODO_NAME) { todo_wine ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)), /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); } else ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)), /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename));

1 0

Ken Sharp : ntoskrnl: Add ObfReferenceObject stub.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 49d638c78e80a952d0d709ae4a60b0281475da60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d638c78e80a952d0d709ae4… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:23:58 2009 +0100 ntoskrnl: Add ObfReferenceObject stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 59268f3..462c4e1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1114,6 +1114,13 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) TRACE("%p\n", AddrInSection); } +/*********************************************************************** + * ObfReferenceObject (NTOSKRNL.EXE.@) + */ +VOID WINAPI ObfReferenceObject(PVOID Object) +{ + FIXME("(%p): stub\n", Object); +} /*********************************************************************** * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0d874bc..6ceb4c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -49,7 +49,7 @@ @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -norelay ObfDereferenceObject(ptr) -@ stub ObfReferenceObject +@ stdcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() ntdll.RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(double) ntdll.RtlUlonglongByteSwap

1 0

Ken Sharp : ntoskrnl: Add IoRegisterFileSystem stub.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: d5c3b44fc216c2ba607f6549af28d48665c8f01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c3b44fc216c2ba607f6549a… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:25:43 2009 +0100 ntoskrnl: Add IoRegisterFileSystem stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 462c4e1..ec98ea4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1058,6 +1058,13 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** + * IoRegisterFileSystem (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) +{ + FIXME("(%p): stub\n", DeviceObject); +} /*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ceb4c3..2cfd4fe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -427,7 +427,7 @@ @ stub IoRegisterBootDriverReinitialization @ stub IoRegisterDeviceInterface @ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) -@ stub IoRegisterFileSystem +@ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification

1 0

Ken Sharp : ntoskrnl: Add IoUnregisterFileSystem stub.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: b68737b6be646108d9ec96987ca86904dd395b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68737b6be646108d9ec96987… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:27:42 2009 +0100 ntoskrnl: Add IoUnregisterFileSystem stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec98ea4..306f065 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1067,6 +1067,14 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) } /*********************************************************************** +* IoUnregisterFileSystem (NTOSKRNL.EXE.@) +*/ +VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject) +{ + FIXME("(%p): stub\n", DeviceObject); +} + +/*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) */ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2cfd4fe..a857bc3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -467,7 +467,7 @@ @ stub IoSynchronousInvalidateDeviceRelations @ stub IoSynchronousPageWrite @ stub IoThreadToProcess -@ stub IoUnregisterFileSystem +@ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange @ stub IoUnregisterPlugPlayNotification @ stub IoUnregisterShutdownNotification

1 0