December 2009 - Wine-commits

Alexandre Julliard : kernel32: Link directly to the thunk functions instead of looking up their entry point .
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 84e51e73b4c02a966ad268885c0f5abad3d3e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e51e73b4c02a966ad268885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:37:44 2009 +0100 kernel32: Link directly to the thunk functions instead of looking up their entry point. --- dlls/kernel32/thunk.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 78ba2f7..e03d858 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -151,6 +151,10 @@ SEGPTR CALL32_CBClientEx_RetAddr = 0; extern int call_entry_point( void *func, int nb_args, const DWORD *args ); extern void __wine_call_from_16_thunk(void); +extern void FT_Prolog(void); +extern void FT_PrologPrime(void); +extern void QT_Thunk(void); +extern void QT_ThunkPrime(void); /* Push a DWORD on the 32-bit stack */ static inline void stack32_push( CONTEXT86 *context, DWORD val ) @@ -229,7 +233,7 @@ static void _write_ftprolog(LPBYTE relayCode ,DWORD *targetTable) { *x++ = 0x0f;*x++=0xb6;*x++=0xd1; /* movzbl edx,cl */ *x++ = 0x8B;*x++=0x14;*x++=0x95;*(DWORD**)x= targetTable; x+=4; /* mov edx, [4*edx + targetTable] */ - *x++ = 0x68; *(DWORD*)x = (DWORD)GetProcAddress(kernel32_handle,"FT_Prolog"); + *x++ = 0x68; *(void **)x = FT_Prolog; x+=4; /* push FT_Prolog */ *x++ = 0xC3; /* lret */ /* fill rest with 0xCC / int 3 */ @@ -256,7 +260,7 @@ static void _write_qtthunk( *x++ = 0x8A;*x++=0x4D;*x++=0xFC; /* movb cl,[ebp-04] */ *x++ = 0x8B;*x++=0x14;*x++=0x8D;*(DWORD**)x= targetTable; x+=4; /* mov edx, [4*ecx + targetTable */ - *x++ = 0xB8; *(DWORD*)x = (DWORD)GetProcAddress(kernel32_handle,"QT_Thunk"); + *x++ = 0xB8; *(void **)x = QT_Thunk; x+=4; /* mov eax , QT_Thunk */ *x++ = 0xFF; *x++ = 0xE0; /* jmp eax */ /* should fill the rest of the 32 bytes with 0xCC */ @@ -867,9 +871,8 @@ LPVOID WINAPI ThunkInitLSF( /* FIXME: add checks for valid code ... */ /* write pointers to kernel32.89 and kernel32.90 (+ordinal base of 1) */ - *(DWORD*)(thunk+0x35) = (DWORD)GetProcAddress(kernel32_handle,(LPSTR)90); - *(DWORD*)(thunk+0x6D) = (DWORD)GetProcAddress(kernel32_handle,(LPSTR)89); - + *(void **)(thunk+0x35) = QT_ThunkPrime; + *(void **)(thunk+0x6D) = FT_PrologPrime; if (!(addr = _loadthunk( dll16, thkbuf, dll32, NULL, len ))) return 0; @@ -1645,7 +1648,7 @@ static BOOL THUNK_Init(void) { LPBYTE thunk; - ThunkletHeap = HeapCreate( 0, 0x10000, 0x10000 ); + ThunkletHeap = HeapCreate( HEAP_CREATE_ENABLE_EXECUTE, 0x10000, 0x10000 ); if (!ThunkletHeap) return FALSE; ThunkletCodeSel = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE ); @@ -2095,7 +2098,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE16 handle, LPSTR func_name) /* jmpl QT_Thunk */ *thunk++ = 0xea; - *(FARPROC *)thunk = GetProcAddress(kernel32_handle,"QT_Thunk"); + *(void **)thunk = QT_Thunk; thunk += sizeof(FARPROC16); *(WORD *)thunk = wine_get_cs();

1 0

Alexandre Julliard : kernel32: Move the kernel thread data definitions to kernel16_private.h.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: fc5c459d63f09457f18b852c816ce9cf5d00e312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5c459d63f09457f18b852c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 17:26:55 2009 +0100 kernel32: Move the kernel thread data definitions to kernel16_private.h. --- dlls/kernel32/kernel16_private.h | 19 +++++++++++++++++++ dlls/kernel32/kernel_private.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 7a0e2f5..0509471 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -239,6 +239,9 @@ extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR); extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16); extern int SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname); +/* syslevel.c */ +extern VOID SYSLEVEL_CheckNotLevel( INT level ); + /* task.c */ extern void TASK_CreateMainTask(void); extern HTASK16 TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, @@ -271,6 +274,22 @@ extern DWORD CallTo16_TebSelector; extern SEGPTR CALL32_CBClient_RetAddr; extern SEGPTR CALL32_CBClientEx_RetAddr; +struct tagSYSLEVEL; + +struct kernel_thread_data +{ + WORD stack_sel; /* 16-bit stack selector */ + WORD htask16; /* Win16 task handle */ + DWORD sys_count[4]; /* syslevel mutex entry counters */ + struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ + void *pad[45]; /* change this if you add fields! */ +}; + +static inline struct kernel_thread_data *kernel_get_thread_data(void) +{ + return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; +} + #ifdef __i386__ #define DEFINE_REGS_ENTRYPOINT( name, args ) \ __ASM_GLOBAL_FUNC( name, \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 9ec20d6..df753d7 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -23,22 +23,6 @@ #include "wine/server.h" -struct tagSYSLEVEL; - -struct kernel_thread_data -{ - WORD stack_sel; /* 16-bit stack selector */ - WORD htask16; /* Win16 task handle */ - DWORD sys_count[4]; /* syslevel mutex entry counters */ - struct tagSYSLEVEL *sys_mutex[4]; /* syslevel mutex pointers */ - void *pad[45]; /* change this if you add fields! */ -}; - -static inline struct kernel_thread_data *kernel_get_thread_data(void) -{ - return (struct kernel_thread_data *)NtCurrentTeb()->SystemReserved1; -} - HANDLE WINAPI OpenConsoleW(LPCWSTR, DWORD, BOOL, DWORD); BOOL WINAPI VerifyConsoleIoHandle(HANDLE); HANDLE WINAPI DuplicateConsoleHandle(HANDLE, DWORD, BOOL, DWORD); @@ -68,8 +52,6 @@ extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; extern const WCHAR *DIR_SysWow64; -extern VOID SYSLEVEL_CheckNotLevel( INT level ); - extern void FILE_SetDosError(void); extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen );

1 0

Matteo Bruni : d3d9: Add D3DSHADER_COMPARISON definition.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: e0d02dfcc8ccd52ba5096088231caa2a1c9aa580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d02dfcc8ccd52ba50960882… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Dec 26 16:18:18 2009 +0100 d3d9: Add D3DSHADER_COMPARISON definition. --- include/d3d9types.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index b453525..ab9d4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1557,4 +1557,16 @@ typedef enum _D3DCOMPOSERECTSOP{ } D3DCOMPOSERECTSOP; #endif /* D3D_DISABLE_9EX */ +typedef enum _D3DSHADER_COMPARISON +{ + D3DSPC_RESERVED0 = 0, + D3DSPC_GT, + D3DSPC_EQ, + D3DSPC_GE, + D3DSPC_LT, + D3DSPC_NE, + D3DSPC_LE, + D3DSPC_RESERVED1, +} D3DSHADER_COMPARISON; + #endif /* __WINE_D3D9TYPES_H */

1 0

Matteo Bruni : wpp: Clean state on error path.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: e1328203300cd8f19524b55a9ae8d047ce4fba9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1328203300cd8f19524b55a9… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Dec 26 16:19:06 2009 +0100 wpp: Clean state on error path. --- libs/wpp/wpp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 935bd49..bce968a 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -180,6 +180,7 @@ int wpp_parse( const char *input, FILE *output ) else if (!(pp_status.file = wpp_callbacks->open(input, 1))) { ppy_error("Could not open %s\n", input); + pp_pop_define_state(); return 2; }

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for KeReleaseSemaphore.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: d8a12d837463d5de6534ba1591be0351ccdc6a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a12d837463d5de6534ba159… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 29 10:13:16 2009 +0100 ntoskrnl.exe: Add stub for KeReleaseSemaphore. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 03abe10..e25fae3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1090,6 +1090,17 @@ void WINAPI KeQueryTickCount( LARGE_INTEGER *count ) /*********************************************************************** + * KeReleaseSemaphore (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReleaseSemaphore( PRKSEMAPHORE Semaphore, KPRIORITY Increment, + LONG Adjustment, BOOLEAN Wait ) +{ + FIXME("(%p %d %d %d) stub\n", Semaphore, Increment, Adjustment, Wait ); + return 0; +} + + +/*********************************************************************** * KeQueryTimeIncrement (NTOSKRNL.EXE.@) */ ULONG WINAPI KeQueryTimeIncrement(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f6d213f..546b150 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -588,7 +588,7 @@ @ stub KeReleaseInterruptSpinLock @ stub KeReleaseMutant @ stub KeReleaseMutex -@ stub KeReleaseSemaphore +@ stdcall KeReleaseSemaphore(ptr long long long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b8f5149..8f8a6e1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1064,6 +1064,7 @@ PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);

1 0

Marcus Meissner : dbghelp: Initialize ret (Coverity).
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: c39cd4c0ce4266a09bb71fcc59d3583f1a55f919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39cd4c0ce4266a09bb71fcc5… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Dec 28 21:13:10 2009 +0100 dbghelp: Initialize ret (Coverity). --- dlls/dbghelp/pe_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 5cce6a3..2937013 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -122,7 +122,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, IMAGE_SECTION_HEADER* sect_stabs = NULL; IMAGE_SECTION_HEADER* sect_stabstr = NULL; int i; - BOOL ret; + BOOL ret = FALSE; section = (IMAGE_SECTION_HEADER*) ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); @@ -163,7 +163,7 @@ static BOOL pe_load_dwarf(const struct process* pcs, struct module* module, int i; const char* strtable; const char* sectname; - BOOL ret; + BOOL ret = FALSE; if (nth->FileHeader.PointerToSymbolTable && nth->FileHeader.NumberOfSymbols) /* FIXME: no way to get strtable size */

1 0

Jacek Caban : mshtml: Use FindMimeFromData to find MIME if moniker doesn' t report it.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: c9e3c27f0d25fdd16b9c740dfd76785ad36a2938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e3c27f0d25fdd16b9c740df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 28 21:19:29 2009 +0100 mshtml: Use FindMimeFromData to find MIME if moniker doesn't report it. --- dlls/mshtml/navigate.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e17d48d..7cfc10e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -952,6 +952,21 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) && (BYTE)This->nsstream->buf[1] == 0xfe) This->nschannel->charset = heap_strdupA(UTF16_STR); + if(!This->nschannel->content_type) { + WCHAR *mime; + + hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, NULL, 0, &mime, 0); + if(FAILED(hres)) + return hres; + + TRACE("Found MIME %s\n", debugstr_w(mime)); + + This->nschannel->content_type = heap_strdupWtoA(mime); + CoTaskMemFree(mime); + if(!This->nschannel->content_type) + return E_OUTOFMEMORY; + } + on_start_nsrequest(This); if(This->window)

1 0

Jacek Caban : wininet: Fixed tests on older IEs.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: e5574369ddebd8788c8710331581a02347a3261d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5574369ddebd8788c8710331… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 28 21:21:53 2009 +0100 wininet: Fixed tests on older IEs. --- dlls/wininet/tests/url.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index f811882..1f012f0 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -218,35 +218,40 @@ static void test_crack_url(const crack_url_test_t *test) ok(urlw.nScheme == test->scheme, "[%s] urlw.nScheme = %d, expected %d\n", test->url, urlw.nScheme, test->scheme); - if(test->host_off == -1) + if(test->host_off == -1) { ok(!urlw.lpszHostName, "[%s] urlw.lpszHostName = %p, expected NULL\n", test->url, urlw.lpszHostName); - else + ok(urlw.dwHostNameLength == 0 || broken(urlw.dwHostNameLength == 1), "[%s] urlw.lpszHostNameLength = %d, expected %d\n", + test->url, urlw.dwHostNameLength, test->host_len); + }else { ok(urlw.lpszHostName == buf+test->host_off, "[%s] urlw.lpszHostName = %p, expected %p\n", test->url, urlw.lpszHostName, test->url+test->host_off); - if(test->host_skip_broken != -1 && urlw.dwHostNameLength == test->host_skip_broken) { - win_skip("skipping broken dwHostNameLength result\n"); - return; + ok(urlw.dwHostNameLength == test->host_len, "[%s] urlw.lpszHostNameLength = %d, expected %d\n", + test->url, urlw.dwHostNameLength, test->host_len); } - ok(urlw.dwHostNameLength == test->host_len, "[%s] urlw.lpszHostNameLength = %d, expected %d\n", - test->url, urlw.dwHostNameLength, test->host_len); ok(urlw.nPort == test->port, "[%s] nPort = %d, expected %d\n", test->url, urlw.nPort, test->port); - if(test->user_off == -1) + if(test->user_off == -1) { ok(!urlw.lpszUserName, "[%s] urlw.lpszUserName = %p\n", test->url, urlw.lpszUserName); - else + ok(urlw.dwUserNameLength == 0 || broken(urlw.dwUserNameLength == 1), "[%s] urlw.lpszUserNameLength = %d, expected %d\n", + test->url, urlw.dwUserNameLength, test->user_len); + }else { ok(urlw.lpszUserName == buf+test->user_off, "[%s] urlw.lpszUserName = %p, expected %p\n", test->url, urlw.lpszUserName, buf+test->user_off); - ok(urlw.dwUserNameLength == test->user_len, "[%s] urlw.lpszUserNameLength = %d, expected %d\n", - test->url, urlw.dwUserNameLength, test->user_len); + ok(urlw.dwUserNameLength == test->user_len, "[%s] urlw.lpszUserNameLength = %d, expected %d\n", + test->url, urlw.dwUserNameLength, test->user_len); + } - if(test->pass_off == -1) + if(test->pass_off == -1) { ok(!urlw.lpszPassword, "[%s] urlw.lpszPassword = %p\n", test->url, urlw.lpszPassword); - else + ok(urlw.dwPasswordLength == 0 || broken(urlw.dwPasswordLength), "[%s] urlw.lpszPasswordLength = %d, expected %d\n", + test->url, urlw.dwPasswordLength, test->pass_len); + }else { ok(urlw.lpszPassword == buf+test->pass_off, "[%s] urlw.lpszPassword = %p, expected %p\n", test->url, urlw.lpszPassword, buf+test->pass_off); - ok(urlw.dwPasswordLength == test->pass_len, "[%s] urlw.lpszPasswordLength = %d, expected %d\n", - test->url, urlw.dwPasswordLength, test->pass_len); + ok(urlw.dwPasswordLength == test->pass_len, "[%s] urlw.lpszPasswordLength = %d, expected %d\n", + test->url, urlw.dwPasswordLength, test->pass_len); + } if(test->path_off == -1) ok(!urlw.lpszUrlPath, "[%s] urlw.lpszPath = %p, expected NULL\n", test->url, urlw.lpszUrlPath); @@ -256,13 +261,16 @@ static void test_crack_url(const crack_url_test_t *test) ok(urlw.dwUrlPathLength == test->path_len, "[%s] urlw.lpszUrlPathLength = %d, expected %d\n", test->url, urlw.dwUrlPathLength, test->path_len); - if(test->extra_off == -1) + if(test->extra_off == -1) { ok(!urlw.lpszExtraInfo, "[%s] url.lpszExtraInfo = %p, expected NULL\n", test->url, urlw.lpszExtraInfo); - else + ok(urlw.dwExtraInfoLength == 0 || broken(urlw.dwExtraInfoLength == 1), "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", + test->url, urlw.dwExtraInfoLength, test->extra_len); + }else { ok(urlw.lpszExtraInfo == buf+test->extra_off, "[%s] urlw.lpszExtraInfo = %p, expected %p\n", test->url, urlw.lpszExtraInfo, buf+test->extra_off); - ok(urlw.dwExtraInfoLength == test->extra_len, "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", - test->url, urlw.dwExtraInfoLength, test->extra_len); + ok(urlw.dwExtraInfoLength == test->extra_len, "[%s] urlw.lpszExtraInfoLength = %d, expected %d\n", + test->url, urlw.dwExtraInfoLength, test->extra_len); + } } static void InternetCrackUrl_test(void)

1 0

Michael Stefaniuc : winapi: Remove the special handling of GDI_AllocObject( ).
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 906c963947b7fdb9ba2519fd814710aa49f4e283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906c963947b7fdb9ba2519fd8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 01:16:26 2009 +0100 winapi: Remove the special handling of GDI_AllocObject(). That function doesn't exist anymore in Wine. --- tools/winapi/make_parser.pm | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 885f77a..773c5f3 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -347,13 +347,7 @@ sub gcc_output($$) { } elsif(/^ordered comparison of pointer with integer zero$/) { $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') from incompatible pointer type$/) { - my $arg = $1; - my $name = $2; - if(defined($name) && $name =~ /^GDI_AllocObject$/) { - $suppress = 1; - } else { - $suppress = 0; - } + $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes integer from pointer without a cast$/) { $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes pointer from integer without a cast$/) {

1 0

Andrew Eikum : hlink/tests: Repair test to work as intended.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: ff13146e92e2baa3b6f949143a9bc6ab625f9352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff13146e92e2baa3b6f949143… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 28 17:40:52 2009 -0600 hlink/tests: Repair test to work as intended. --- dlls/hlink/tests/browse_ctx.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index e9806b8..483f604 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -41,17 +41,23 @@ static void test_SetInitialHlink(void) IMoniker *dummy, *found_moniker; IBindCtx *bindctx; WCHAR one[] = {'1',0}; - WCHAR friend[] = {'f','r','i','e','n','d',0}; - WCHAR *found_name; + WCHAR five[] = {'5',0}; + WCHAR *found_name, *exp_name; HRESULT hres; - hres = CreateItemMoniker(one, one, &dummy); + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + hres = IMoniker_GetDisplayName(dummy, bindctx, NULL, &exp_name); + ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void**)&bc); ok(hres == S_OK, "HlinkCreateBrowseContext failed: 0x%08x\n", hres); - hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, friend); + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); @@ -60,12 +66,9 @@ static void test_SetInitialHlink(void) hres = IHlink_GetMonikerReference(found_hlink, HLINKGETREF_DEFAULT, &found_moniker, NULL); ok(hres == S_OK, "GetMonikerReference failed: 0x%08x\n", hres); - hres = CreateBindCtx(0, &bindctx); - ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); - hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(strcmp_ww(found_name, friend), "Found display name should not have been %s\n", wine_dbgstr_w(friend)); + ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); IBindCtx_Release(bindctx); IMoniker_Release(found_moniker);

1 0