August 2010 - Wine-commits - list.winehq.org

Jerome Leclanche : winepath: Add a -0 option to use null character as separator.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 8c50936d30d6e1a83619f8fb8a273e9ceb9ebe3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c50936d30d6e1a83619f8fb8… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Aug 23 15:32:29 2010 +0100 winepath: Add a -0 option to use null character as separator. --- programs/winepath/winepath.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 1645ee9..c4a50fb 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -34,7 +34,8 @@ enum { SHORTFORMAT = 1, LONGFORMAT = 2, UNIXFORMAT = 4, - WINDOWSFORMAT = 8 + WINDOWSFORMAT = 8, + PRINT0 = 16, }; static const char progname[] = "winepath"; @@ -53,6 +54,7 @@ static int option(int shortopt, const WCHAR *longopt) " directory to the long format\n" " -s, --short converts the long Windows path of an existing file or\n" " directory to the short format\n" + " -0 separate output with \\0 character, instead of a newline\n" " -h, --help output this help message and exit\n" " -v, --version output version information and exit\n" "\n" @@ -76,6 +78,8 @@ static int option(int shortopt, const WCHAR *longopt) return UNIXFORMAT; case 'w': return WINDOWSFORMAT; + case '0': + return PRINT0; } fprintf(stderr, "%s: invalid option ", progname); @@ -148,8 +152,18 @@ int wmain(int argc, WCHAR *argv[]) char path[MAX_PATH]; int outputformats; int i; + int separator; outputformats = parse_options(argv); + + if (outputformats & PRINT0) + { + separator = '\0'; + outputformats ^= PRINT0; + } + else + separator = '\n'; + if (outputformats == 0) outputformats = UNIXFORMAT; @@ -181,12 +195,12 @@ int wmain(int argc, WCHAR *argv[]) if (outputformats & LONGFORMAT) { if (GetLongPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & SHORTFORMAT) { if (GetShortPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & UNIXFORMAT) { WCHAR *ntpath, *tail; @@ -205,11 +219,11 @@ int wmain(int argc, WCHAR *argv[]) if (tail) { WideCharToMultiByte(CP_UNIXCP, 0, tail+1, -1, path, MAX_PATH, NULL, NULL); - printf("%s/%s\n", unix_name, path); + printf("%s/%s%c", unix_name, path, separator); } else { - printf("%s\n", unix_name); + printf("%s%c", unix_name, separator); } HeapFree( GetProcessHeap(), 0, unix_name ); break; @@ -257,7 +271,7 @@ int wmain(int argc, WCHAR *argv[]) if ((windows_name = wine_get_dos_file_name_ptr(unix_name))) { WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); HeapFree( GetProcessHeap(), 0, windows_name ); } else printf( "\n" );

1 0

Marcus Meissner : ntdll: Set correct protection flags on sections in builtin DLLs.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 2ca5513a6294a9e653c678bffee58a537d94d54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca5513a6294a9e653c678bff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Aug 23 17:12:53 2010 +0200 ntdll: Set correct protection flags on sections in builtin DLLs. --- dlls/ntdll/loader.c | 5 ++--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/tests/info.c | 14 +++++++------- dlls/ntdll/virtual.c | 31 ++++++++++++++++++++++++++----- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 79ae817..0724879 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1404,9 +1404,8 @@ static void load_builtin_callback( void *module, const char *filename ) builtin_load_info->status = STATUS_INVALID_IMAGE_FORMAT; return; } - virtual_create_system_view( module, nt->OptionalHeader.SizeOfImage, - VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED | - VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); + + virtual_create_builtin_view( module ); /* create the MODREF */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c7b721a..212edf5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -155,7 +155,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); -extern NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ); +extern NTSTATUS virtual_create_builtin_view( void *base ); extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a56bcd1..f30c6ab 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1077,15 +1077,15 @@ static void test_queryvirtualmemory(void) MEMORY_BASIC_INFORMATION mbi; char stackbuf[42]; - trace("Check flags of a function entry in NTDLL.DLL\n"); + trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); - todo_wine ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); + ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); - trace("Check flags of heap\n"); + trace("Check flags of heap at %p\n", GetProcessHeap()); status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1095,7 +1095,7 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE, "mbi.Protect is 0x%x\n", mbi.Protect); - trace("Check flags of stack\n"); + trace("Check flags of stack at %p\n", stackbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1103,7 +1103,7 @@ static void test_queryvirtualmemory(void) ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); - trace("Check flags of read-only data\n"); + trace("Check flags of read-only data at %p\n", teststring); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -1112,13 +1112,13 @@ static void test_queryvirtualmemory(void) if (mbi.Protect != PAGE_READONLY) todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY); - trace("Check flags of read-write global data (.bss)\n"); + trace("Check flags of read-write global data (.bss) at %p\n", rwtestbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - todo_wine ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fdfccb1..51c56fe 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1396,18 +1396,39 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_system_view */ -NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ) +NTSTATUS virtual_create_builtin_view( void *module ) { - FILE_VIEW *view; NTSTATUS status; sigset_t sigset; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + SIZE_T size = nt->OptionalHeader.SizeOfImage; + IMAGE_SECTION_HEADER *sec; + FILE_VIEW *view; + void *base; + int i; - size = ROUND_SIZE( base, size ); - base = ROUND_ADDR( base, page_mask ); + size = ROUND_SIZE( module, size ); + base = ROUND_ADDR( module, page_mask ); server_enter_uninterrupted_section( &csVirtual, &sigset ); - status = create_view( &view, base, size, vprot ); + status = create_view( &view, base, size, VPROT_SYSTEM | VPROT_IMAGE | + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); if (!status) TRACE( "created %p-%p\n", base, (char *)base + size ); server_leave_uninterrupted_section( &csVirtual, &sigset ); + + if (status) return status; + + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + DWORD flags = VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED; + + if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; + if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ; + if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; + memset (view->prot + (sec[i].VirtualAddress >> page_shift), flags, + ROUND_SIZE( sec[i].VirtualAddress, sec[i].Misc.VirtualSize ) >> page_shift ); + } + return status; }

1 0

David Hedberg : shell32: Implement IExplorerBrowser:: Advise and IExplorerBrowser::Unadvise.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b88c3e2ecbf72a3a785b8846ebd630dd6bfcca3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88c3e2ecbf72a3a785b8846e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:19 2010 +0200 shell32: Implement IExplorerBrowser::Advise and IExplorerBrowser::Unadvise. --- dlls/shell32/ebrowser.c | 61 +++++++++++++++- dlls/shell32/tests/ebrowser.c | 155 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index e4e132b..3e56ce0 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "wine/list.h" #include "wine/debug.h" #include "debughlp.h" @@ -35,6 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +typedef struct _event_client { + struct list entry; + IExplorerBrowserEvents *pebe; + DWORD cookie; +} event_client; + typedef struct _ExplorerBrowserImpl { const IExplorerBrowserVtbl *lpVtbl; const IShellBrowserVtbl *lpsbVtbl; @@ -47,11 +54,31 @@ typedef struct _ExplorerBrowserImpl { EXPLORER_BROWSER_OPTIONS eb_options; FOLDERSETTINGS fs; + struct list event_clients; + DWORD events_next_cookie; + IShellView *psv; RECT sv_rc; } ExplorerBrowserImpl; /************************************************************************** + * Event functions. + */ +static void events_unadvise_all(ExplorerBrowserImpl *This) +{ + event_client *client, *curs; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY_SAFE(client, curs, &This->event_clients, event_client, entry) + { + TRACE("Removing %p\n", client); + list_remove(&client->entry); + IExplorerBrowserEvents_Release(client->pebe); + HeapFree(GetProcessHeap(), 0, client); + } +} + +/************************************************************************** * Helper functions */ static void update_layout(ExplorerBrowserImpl *This) @@ -248,6 +275,8 @@ static HRESULT WINAPI IExplorerBrowser_fnDestroy(IExplorerBrowser *iface) This->hwnd_sv = NULL; } + events_unadvise_all(This); + DestroyWindow(This->hwnd_main); This->destroyed = TRUE; @@ -314,18 +343,40 @@ static HRESULT WINAPI IExplorerBrowser_fnAdvise(IExplorerBrowser *iface, DWORD *pdwCookie) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p, %p)\n", This, psbe, pdwCookie); + event_client *client; + TRACE("%p (%p, %p)\n", This, psbe, pdwCookie); - return E_NOTIMPL; + client = HeapAlloc(GetProcessHeap(), 0, sizeof(event_client)); + client->pebe = psbe; + client->cookie = ++This->events_next_cookie; + + IExplorerBrowserEvents_AddRef(psbe); + *pdwCookie = client->cookie; + + list_add_tail(&This->event_clients, &client->entry); + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnUnadvise(IExplorerBrowser *iface, DWORD dwCookie) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (0x%x)\n", This, dwCookie); + event_client *client; + TRACE("%p (0x%x)\n", This, dwCookie); - return E_NOTIMPL; + LIST_FOR_EACH_ENTRY(client, &This->event_clients, event_client, entry) + { + if(client->cookie == dwCookie) + { + list_remove(&client->entry); + IExplorerBrowserEvents_Release(client->pebe); + HeapFree(GetProcessHeap(), 0, client); + return S_OK; + } + } + + return E_INVALIDARG; } static HRESULT WINAPI IExplorerBrowser_fnSetOptions(IExplorerBrowser *iface, @@ -652,6 +703,8 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->lpVtbl = &vt_IExplorerBrowser; eb->lpsbVtbl = &vt_IShellBrowser; + list_init(&eb->event_clients); + ret = IExplorerBrowser_QueryInterface((IExplorerBrowser*)eb, riid, ppv); IExplorerBrowser_Release((IExplorerBrowser*)eb); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 3397eb7..2d90d06 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -44,6 +44,77 @@ static HRESULT ebrowser_initialize(IExplorerBrowser *peb) return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); } +/********************************************************************* + * IExplorerBrowserEvents implementation + */ +typedef struct { + const IExplorerBrowserEventsVtbl *lpVtbl; + LONG ref; + UINT pending, created, completed, failed; +} IExplorerBrowserEventsImpl; + +static IExplorerBrowserEventsImpl ebev; + +static HRESULT WINAPI IExplorerBrowserEvents_fnQueryInterface(IExplorerBrowserEvents *iface, + REFIID riid, void **ppvObj) +{ + ok(0, "Never called.\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI IExplorerBrowserEvents_fnAddRef(IExplorerBrowserEvents *iface) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI IExplorerBrowserEvents_fnRelease(IExplorerBrowserEvents *iface) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + return InterlockedDecrement(&This->ref); +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationPending(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + This->pending++; + return S_OK; +} + +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + This->completed++; + return S_OK; +} +static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationFailed(IExplorerBrowserEvents *iface, + PCIDLIST_ABSOLUTE pidlFolder) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + This->failed++; + return S_OK; +} +static HRESULT WINAPI IExplorerBrowserEvents_fnOnViewCreated(IExplorerBrowserEvents *iface, + IShellView *psv) +{ + IExplorerBrowserEventsImpl *This = (IExplorerBrowserEventsImpl*)iface; + This->created++; + return S_OK; +} + +static const IExplorerBrowserEventsVtbl ebevents = +{ + IExplorerBrowserEvents_fnQueryInterface, + IExplorerBrowserEvents_fnAddRef, + IExplorerBrowserEvents_fnRelease, + IExplorerBrowserEvents_fnOnNavigationPending, + IExplorerBrowserEvents_fnOnViewCreated, + IExplorerBrowserEvents_fnOnNavigationComplete, + IExplorerBrowserEvents_fnOnNavigationFailed +}; + static void test_QueryInterface(void) { IExplorerBrowser *peb; @@ -378,6 +449,89 @@ static void test_basics(void) ok(lres == 0, "Got %d\n", lres); } +static void test_Advise(void) +{ + IExplorerBrowser *peb; + IExplorerBrowserEvents *pebe; + DWORD cookies[10]; + HRESULT hr; + UINT i, ref; + + /* Set up our IExplorerBrowserEvents implementation */ + ebev.lpVtbl = &ebevents; + pebe = (IExplorerBrowserEvents*) &ebev; + + ebrowser_instantiate(&peb); + + if(0) + { + /* Crashes on Windows 7 */ + IExplorerBrowser_Advise(peb, pebe, NULL); + IExplorerBrowser_Advise(peb, NULL, &cookies[0]); + } + + /* Using Unadvise with a cookie that has yet to be given out + * results in E_INVALIDARG */ + hr = IExplorerBrowser_Unadvise(peb, 11); + ok(hr == E_INVALIDARG, "got (0x%08x)\n", hr); + + /* Add some before initialization */ + for(i = 0; i < 5; i++) + { + hr = IExplorerBrowser_Advise(peb, pebe, &cookies[i]); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + ebrowser_initialize(peb); + + /* Add some after initialization */ + for(i = 5; i < 10; i++) + { + hr = IExplorerBrowser_Advise(peb, pebe, &cookies[i]); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + ok(ebev.ref == 10, "Got %d\n", ebev.ref); + + /* Remove a bunch somewhere in the middle */ + for(i = 4; i < 8; i++) + { + hr = IExplorerBrowser_Unadvise(peb, cookies[i]); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + if(0) + { + /* Using unadvise with a previously unadvised cookie results + * in a crash. */ + hr = IExplorerBrowser_Unadvise(peb, cookies[5]); + } + + /* Remove the rest. */ + for(i = 0; i < 10; i++) + { + if(i<4||i>7) + { + hr = IExplorerBrowser_Unadvise(peb, cookies[i]); + ok(hr == S_OK, "%d: got (0x%08x)\n", i, hr); + } + } + + ok(ebev.ref == 0, "Got %d\n", ebev.ref); + + /* ::Destroy implies ::Unadvise. */ + hr = IExplorerBrowser_Advise(peb, pebe, &cookies[0]); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(ebev.ref == 1, "Got %d\n", ebev.ref); + + hr = IExplorerBrowser_Destroy(peb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(ebev.ref == 0, "Got %d\n", ebev.ref); + + ref = IExplorerBrowser_Release(peb); + ok(!ref, "Got %d", ref); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -424,6 +578,7 @@ START_TEST(ebrowser) test_SB_misc(); test_initialization(); test_basics(); + test_Advise(); DestroyWindow(hwnd); OleUninitialize();

1 0

Francois Gouget : shell32/tests: Remove unneeded NULL pointer casts.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: a879046f637a69e62f18ff7b1b48643e052ceb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a879046f637a69e62f18ff7b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:01 2010 +0200 shell32/tests: Remove unneeded NULL pointer casts. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3fae215..dd58b09 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2901,8 +2901,8 @@ static void test_SHGetItemFromObject(void) if(0) { /* Crashes with Windows 7 */ - hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, (void**)NULL); - hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)NULL); + hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, NULL); + hres = pSHGetItemFromObject(NULL, &IID_IUnknown, NULL); hres = pSHGetItemFromObject((IUnknown*)psfdesktop, NULL, (void**)&punk); }

1 0

Francois Gouget : shell32/tests: Remove spaces before '\n's in traces.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: c15308f8690a7eb47ada0f1f7f9df4c8a321229c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15308f8690a7eb47ada0f1f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:07 2010 +0200 shell32/tests: Remove spaces before '\n's in traces. --- dlls/shell32/tests/shlfolder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index dd58b09..e21b44d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2502,7 +2502,7 @@ static void test_ShellItemCompare(void) } if(failed) { - skip("Failed to create all shellitems. \n"); + skip("Failed to create all shellitems.\n"); goto cleanup; } @@ -2520,7 +2520,7 @@ static void test_ShellItemCompare(void) if(failed) { - skip("Failed to create shellitems. \n"); + skip("Failed to create shellitems.\n"); goto cleanup; } @@ -3550,7 +3550,7 @@ static void test_GetUIObject(void) ok(res, "Failed (last error: %d).\n", GetLastError()); ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x) \n", mii.wID, mii.fType); + "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if(!(mii.fType & MFT_SEPARATOR)) max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; }

1 0

Francois Gouget : ipconfig: Remove the ipconfig debug channel where unused.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 0e51433d79c07533e31a47ce065078412d0ce979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e51433d79c07533e31a47ce0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:30 2010 +0200 ipconfig: Remove the ipconfig debug channel where unused. --- programs/ipconfig/ipconfig.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index ccaa78c..da63acd 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -21,13 +21,10 @@ #include <windows.h> #include <iphlpapi.h> -#include <wine/debug.h> #include <wine/unicode.h> #include "ipconfig.h" -WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); - static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen;

1 0

Francois Gouget : msvcp90: Remove the msvcp90 debug channel where unused.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 57877b2487932ec3cc780829a50ce2a6f612c6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=57877b2487932ec3cc780829a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:51 2010 +0200 msvcp90: Remove the msvcp90 debug channel where unused. --- dlls/msvcp90/memory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index acbdda7..7dac503 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -25,8 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + /* ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z */ /* ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z */

1 0

Francois Gouget : ws2_32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: d8cb2a0c381bc3a5e0c2f4d4e08e6a74552766ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cb2a0c381bc3a5e0c2f4d4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:01:36 2010 +0200 ws2_32/tests: Add a trailing '\n' to an ok() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dba26e9..e61d550 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3665,7 +3665,7 @@ static void test_ConnectEx(void) buffer[4] = 0; ok(bytesReturned == 3, "Didn't get all sent data, got only %d\n", bytesReturned); ok(buffer[0] == '1' && buffer[1] == '2' && buffer[2] == '3', - "Failed to get the right data, expected '123', got '%s'", buffer); + "Failed to get the right data, expected '123', got '%s'\n", buffer); closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0);

1 0

Francois Gouget : explorerframe/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: dc6428f350acb7a20eab22ad1524c27c3c091c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6428f350acb7a20eab22ad1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:01:27 2010 +0200 explorerframe/tests: Add a trailing '\n' to an ok() call. --- dlls/explorerframe/tests/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 83ec748..5142d84 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1324,7 +1324,7 @@ static void test_basics(void) psia = (void*)0xdeadbeef; hr = INameSpaceTreeControl_GetSelectedItems(pnstc, &psia); ok(hr == E_FAIL, "Got 0x%08x\n", hr); - ok(psia == (void*)0xdeadbeef, "Got %p", psia); + ok(psia == (void*)0xdeadbeef, "Got %p\n", psia); hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, SHCONTF_FOLDERS, 0, NULL); ok(hr == S_OK, "Got (0x%08x)\n", hr);

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 21541da0bba481da17c10dab93bf8c737380ff52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21541da0bba481da17c10dab9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:02:21 2010 +0200 ws2_32: Add a trailing '\n' to a TRACE() call. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index acd3f6e..82d157c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3589,7 +3589,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* After a ConnectEx call succeeds, the socket can't be used with half of the * normal winsock functions on windows. We don't have that problem. */ case WS_SO_UPDATE_CONNECT_CONTEXT: - TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal"); + TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal\n"); return 0; /* SO_OPENTYPE does not require a valid socket handle. */

1 0