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

David Hedberg : shell32: Implement IExplorerBrowser:: BrowseToIDList and IShellBrowser::BrowseToObject.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 73100ce6797c97a15919add9f464a6618b641a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73100ce6797c97a15919add9f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:21 2010 +0200 shell32: Implement IExplorerBrowser::BrowseToIDList and IShellBrowser::BrowseToObject. --- dlls/shell32/ebrowser.c | 220 +++++++++++++++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 266 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 482 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73100ce6797c97a15919a…

1 0

David Hedberg : shell32/tests: Some additional tests for IShellBrowser.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 008099f618de6157f2686adb7adfed981a90109d URL: http://source.winehq.org/git/wine.git/?a=commit;h=008099f618de6157f2686adb7… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:22 2010 +0200 shell32/tests: Some additional tests for IShellBrowser. --- dlls/shell32/tests/ebrowser.c | 94 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 788d644..d8f1677 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -184,9 +184,11 @@ static void test_SB_misc(void) { IExplorerBrowser *peb; IShellBrowser *psb; + IUnknown *punk; HRESULT hr; HWND retHwnd; - LONG lres; + LRESULT lres; + LONG ref; ebrowser_instantiate(&peb); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -227,9 +229,95 @@ static void test_SB_misc(void) hr = IShellBrowser_SetMenuSB(psb, NULL, NULL, NULL); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + /***** Before EB::Initialize *****/ + + /* ::GetWindow */ + retHwnd = (HWND)0xDEADBEEF; + hr = IShellBrowser_GetWindow(psb, &retHwnd); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + + todo_wine + { + + /* ::SendControlMsg */ + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_TOOLBAR, TB_CHECKBUTTON, + FCIDM_TB_SMALLICON, TRUE, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SendControlMsg(psb, FCW_TREE, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SendControlMsg(psb, FCW_PROGRESS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + /* ::QueryActiveShellView */ + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + + /* Initialize ExplorerBrowser */ + ebrowser_initialize(peb); + + /***** After EB::Initialize *****/ + + /* ::GetWindow */ + hr = IShellBrowser_GetWindow(psb, &retHwnd); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(GetParent(retHwnd) == hwnd, "The HWND returned is not our child.\n"); + + todo_wine + { + /* ::SendControlMsg */ + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_TOOLBAR, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, FCW_STATUS, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + lres = 0xDEADBEEF; + hr = IShellBrowser_SendControlMsg(psb, 1234, 0, 0, 0, &lres); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(lres == 0, "lres was %ld\n", lres); + + /* Returns S_OK */ + hr = IShellBrowser_SetStatusTextSB(psb, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_ContextSensitiveHelp(psb, FALSE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_EnableModelessSB(psb, TRUE); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellBrowser_SetToolbarItems(psb, NULL, 1, 1); + ok(hr == S_OK, "got (0x%08x)\n", hr); + } + + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == E_FAIL, "got (0x%08x)\n", hr); + IShellBrowser_Release(psb); - lres = IExplorerBrowser_Release(peb); - ok(lres == 0, "Got %d\n", lres); + IExplorerBrowser_Destroy(peb); + ref = IExplorerBrowser_Release(peb); + ok(ref == 0, "Got %d\n", ref); } static void test_initialization(void)

1 0

David Hedberg : shell32/tests: Add some event tests to ExplorerBrowser tests.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: b2a8de3de65a0a716414b84e9e6538fb1f55c08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8de3de65a0a716414b84e9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:24 2010 +0200 shell32/tests: Add some event tests to ExplorerBrowser tests. --- dlls/shell32/tests/ebrowser.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 8fa8b9a..60472a4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -631,6 +631,11 @@ static void test_Advise(void) ok(ebev.ref == 10, "Got %d\n", ebev.ref); + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 10, "Got %d\n", ebev.completed); + /* Remove a bunch somewhere in the middle */ for(i = 4; i < 8; i++) { @@ -638,6 +643,11 @@ static void test_Advise(void) ok(hr == S_OK, "got (0x%08x)\n", hr); } + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 6, "Got %d\n", ebev.completed); + if(0) { /* Using unadvise with a previously unadvised cookie results @@ -657,6 +667,11 @@ static void test_Advise(void) ok(ebev.ref == 0, "Got %d\n", ebev.ref); + ebev.completed = 0; + ebrowser_browse_to_desktop(peb); + process_msgs(); + ok(ebev.completed == 0, "Got %d\n", ebev.completed); + /* ::Destroy implies ::Unadvise. */ hr = IExplorerBrowser_Advise(peb, pebe, &cookies[0]); ok(hr == S_OK, "Got 0x%08x\n", hr);

1 0

Jeff Cook : winealsa.drv: Only filllines_no_master with micelem when micelem is found.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: e699184e480cc2044a66b264f576e4c3c87bf9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e699184e480cc2044a66b264f… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Mon Aug 23 18:53:50 2010 -0600 winealsa.drv: Only filllines_no_master with micelem when micelem is found. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 9a2cf85..ffa0292 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -575,7 +575,7 @@ static void ALSA_MixerInit(void) if (mastelem) filllines(&mixdev[mixnum], mastelem, captelem, capcontrols); - else + else if (micelem) filllines_no_master(&mixdev[mixnum], micelem, 1); fillcontrols(&mixdev[mixnum]);

1 0

David Hedberg : shell32/tests: Add some tests related to the shellview created by ExplorerBrowser.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: ab63bc0515d5cc4a9ee65df045c4cb64c9caafac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab63bc0515d5cc4a9ee65df04… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 24 10:56:23 2010 +0200 shell32/tests: Add some tests related to the shellview created by ExplorerBrowser. --- dlls/shell32/tests/ebrowser.c | 84 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index d8f1677..8fa8b9a 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -56,6 +56,13 @@ static HRESULT ebrowser_initialize(IExplorerBrowser *peb) return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); } +static HRESULT ebrowser_browse_to_desktop(IExplorerBrowser *peb) +{ + LPITEMIDLIST pidl_desktop; + SHGetSpecialFolderLocation (hwnd, CSIDL_DESKTOP, &pidl_desktop); + return IExplorerBrowser_BrowseToIDList(peb, pidl_desktop, 0); +} + /* Process some messages */ static void process_msgs(void) { @@ -316,6 +323,26 @@ static void test_SB_misc(void) IShellBrowser_Release(psb); IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); + + /* Browse to the desktop. */ + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); + + process_msgs(); + hr = ebrowser_browse_to_desktop(peb); + ok(hr == S_OK, "got (0x%08x)\n", hr); + process_msgs(); + + /****** After Browsing *****/ + + hr = IShellBrowser_QueryActiveShellView(psb, (IShellView**)&punk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + IShellBrowser_Release(psb); + IExplorerBrowser_Destroy(peb); ref = IExplorerBrowser_Release(peb); ok(ref == 0, "Got %d\n", ref); } @@ -884,6 +911,62 @@ static void test_navigation(void) ILFree(pidl_child); } +static void test_GetCurrentView(void) +{ + IExplorerBrowser *peb; + IUnknown *punk; + HRESULT hr; + + /* GetCurrentView */ + ebrowser_instantiate(&peb); + + if(0) + { + /* Crashes under Windows 7 */ + hr = IExplorerBrowser_GetCurrentView(peb, NULL, NULL); + } + hr = IExplorerBrowser_GetCurrentView(peb, NULL, (void**)&punk); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + +#define test_gcv(iid, exp) \ + do { \ + hr = IExplorerBrowser_GetCurrentView(peb, &iid, (void**)&punk); \ + ok(hr == exp, "(%s:)Expected (0x%08x), got: (0x%08x)\n", \ + #iid ,exp, hr); \ + if(SUCCEEDED(hr)) IUnknown_Release(punk); \ + } while(0) + + test_gcv(IID_IUnknown, E_FAIL); + test_gcv(IID_IUnknown, E_FAIL); + test_gcv(IID_IShellView, E_FAIL); + test_gcv(IID_IShellView2, E_FAIL); + test_gcv(IID_IFolderView, E_FAIL); + test_gcv(IID_IPersistFolder, E_FAIL); + test_gcv(IID_IPersistFolder2, E_FAIL); + test_gcv(IID_ICommDlgBrowser, E_FAIL); + test_gcv(IID_ICommDlgBrowser2, E_FAIL); + test_gcv(IID_ICommDlgBrowser3, E_FAIL); + + ebrowser_initialize(peb); + ebrowser_browse_to_desktop(peb); + + test_gcv(IID_IUnknown, S_OK); + test_gcv(IID_IUnknown, S_OK); + test_gcv(IID_IShellView, S_OK); + test_gcv(IID_IShellView2, S_OK); + test_gcv(IID_IFolderView, S_OK); + todo_wine test_gcv(IID_IPersistFolder, S_OK); + test_gcv(IID_IPersistFolder2, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser2, E_NOINTERFACE); + test_gcv(IID_ICommDlgBrowser3, E_NOINTERFACE); + +#undef test_gcv + + IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -933,6 +1016,7 @@ START_TEST(ebrowser) test_basics(); test_Advise(); test_navigation(); + test_GetCurrentView(); DestroyWindow(hwnd); OleUninitialize();

1 0

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

Aug. 24, 2010

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 Aug. 24, 2010

Aug. 24, 2010

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

Alexandre Julliard : msvcp90: Use the thiscall type on appropriate entry points.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: c6423058db9b4b1c44d7a7d48a5356365d6ed673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6423058db9b4b1c44d7a7d48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:24:18 2010 +0200 msvcp90: Use the thiscall type on appropriate entry points. --- dlls/msvcp80/msvcp80.spec | 92 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.spec | 92 ++++++++++++++++++++++---------------------- 2 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6423058db9b4b1c44d7a…

1 0

Alexandre Julliard : msvcrt: Use a __thiscall macro where appropriate to make the calling convention clearer .
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 14072676a60488413ccea6fe801bf9c97f20e9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14072676a60488413ccea6fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:31:25 2010 +0200 msvcrt: Use a __thiscall macro where appropriate to make the calling convention clearer. --- dlls/msvcirt/msvcirt.c | 16 +++++---- dlls/msvcp90/exception.c | 44 +++++++++++++------------- dlls/msvcp90/memory.c | 72 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/string.c | 20 ++++++------ dlls/msvcrt/cpp.c | 76 +++++++++++++++++++++++---------------------- 6 files changed, 118 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14072676a60488413ccea…

1 0

Alexandre Julliard : msvcrt: Use the thiscall type on appropriate entry points.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: b21e28ca116d43757c923bebc46674ed7679455d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21e28ca116d43757c923bebc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:24:01 2010 +0200 msvcrt: Use the thiscall type on appropriate entry points. --- dlls/msvcirt/msvcirt.spec | 34 +++++++++--------- dlls/msvcr100/msvcr100.spec | 64 +++++++++++++++++----------------- dlls/msvcr70/msvcr70.spec | 80 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 64 +++++++++++++++++----------------- dlls/msvcr80/msvcr80.spec | 60 ++++++++++++++++---------------- dlls/msvcr90/msvcr90.spec | 60 ++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 82 +++++++++++++++++++++--------------------- dlls/msvcrt40/msvcrt40.spec | 72 +++++++++++++++++++------------------- dlls/msvcrtd/msvcrtd.spec | 72 +++++++++++++++++++------------------- 9 files changed, 294 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b21e28ca116d43757c923…

1 0