November 2009 - Wine-commits

Nikolay Sivov : comctl32/tab: Fix reading out of array bounds on TCM_SETCURSEL.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 3371ba9f73367572693589905ed57af87b747b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3371ba9f73367572693589905… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 19 21:05:14 2009 +0300 comctl32/tab: Fix reading out of array bounds on TCM_SETCURSEL. --- dlls/comctl32/tab.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 15534af..f8f9f5c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -247,16 +247,17 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) TRACE("(%p %d)\n", infoPtr, iItem); if (iItem < 0) - infoPtr->iSelected=-1; + infoPtr->iSelected = -1; else if (iItem >= infoPtr->uNumItem) return -1; else { - if (infoPtr->iSelected != iItem) { - TAB_GetItem(infoPtr, prevItem)->dwState &= ~TCIS_BUTTONPRESSED; + if (prevItem != iItem) { + if (prevItem != -1) + TAB_GetItem(infoPtr, prevItem)->dwState &= ~TCIS_BUTTONPRESSED; TAB_GetItem(infoPtr, iItem)->dwState |= TCIS_BUTTONPRESSED; - infoPtr->iSelected=iItem; - infoPtr->uFocus=iItem; + infoPtr->iSelected = iItem; + infoPtr->uFocus = iItem; TAB_EnsureSelectionVisible(infoPtr); TAB_InvalidateTabArea(infoPtr); }

1 0

Nikolay Sivov : comctl32/tab: Split tests to several functions not to depend from each other.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 336a68be544825c50199db0825b441bfc0ac5e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=336a68be544825c50199db082… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 20 08:37:23 2009 +0300 comctl32/tab: Split tests to several functions not to depend from each other. --- dlls/comctl32/tests/tab.c | 547 ++++++++++++++++++++++++--------------------- 1 files changed, 294 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=336a68be544825c50199d…

1 0

Nikolay Sivov : comctl32/tab: Fix selection change when selected item is deleted.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 33a1e827a7b47657e66f9b2a84ad82126bbe2939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a1e827a7b47657e66f9b2a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 20 08:50:24 2009 +0300 comctl32/tab: Fix selection change when selected item is deleted. --- dlls/comctl32/tab.c | 7 +++---- dlls/comctl32/tests/tab.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f8f9f5c..a9e29e2 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2916,10 +2916,9 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) Free(oldItems); /* Readjust the selected index */ - if ((iItem == infoPtr->iSelected) && (iItem > 0)) - infoPtr->iSelected--; - - if (iItem < infoPtr->iSelected) + if (iItem == infoPtr->iSelected) + infoPtr->iSelected = -1; + else if (iItem < infoPtr->iSelected) infoPtr->iSelected--; if (infoPtr->uNumItem == 0) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 6061507..144f834 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1176,6 +1176,28 @@ static void test_removeimage(HWND parent_wnd) DestroyIcon(hicon); } +static void test_delete_selection(HWND parent_wnd) +{ + HWND hTab; + DWORD ret; + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); + ok(hTab != NULL, "Failed to create tab control\n"); + + ret = SendMessage(hTab, TCM_SETCURSEL, 3, 0); + expect(0, ret); + ret = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(3, ret); + /* delete selected item - selection goes to -1 */ + ret = SendMessage(hTab, TCM_DELETEITEM, 3, 0); + expect(TRUE, ret); + + ret = SendMessage(hTab, TCM_GETCURSEL, 0, 0); + expect(-1, ret); + + DestroyWindow(hTab); +} + START_TEST(tab) { HWND parent_wnd; @@ -1218,6 +1240,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); + test_delete_selection(parent_wnd); test_removeimage(parent_wnd); DestroyWindow(parent_wnd);

1 0

Nikolay Sivov : comctl32/tab: Reset current selection on negative focus value.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 9cec74f300560d7301c994b18fae3b65949df7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cec74f300560d7301c994b18… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 20 15:32:44 2009 +0300 comctl32/tab: Reset current selection on negative focus value. --- dlls/comctl32/tab.c | 8 +++++++- dlls/comctl32/tests/tab.c | 8 +++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a9e29e2..35985f8 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -269,8 +269,14 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) { TRACE("(%p %d)\n", infoPtr, iItem); - if (iItem < 0) + if (iItem < 0) { infoPtr->uFocus = -1; + if (infoPtr->iSelected != -1) { + infoPtr->iSelected = -1; + TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); + TAB_InvalidateTabArea(infoPtr); + } + } else if (iItem < infoPtr->uNumItem) { if (infoPtr->dwStyle & TCS_BUTTONS) { /* set focus to new item, leave selection as is */ diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 144f834..6774d51 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -660,9 +660,7 @@ static void test_curfocus(HWND parent_wnd, INT nTabs) /* Testing CurFocus with value larger than number of tabs */ focusIndex = SendMessage(hTab, TCM_SETCURSEL, 1, 0); - todo_wine{ - expect(-1, focusIndex); - } + expect(-1, focusIndex); SendMessage(hTab, TCM_SETCURFOCUS, nTabs+1, 0); focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); @@ -1059,7 +1057,7 @@ static void test_insert_focus(HWND parent_wnd) expect(2, r); ok_sequence(sequences, TAB_SEQ_INDEX, insert_focus_seq, "insert_focus test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "insert_focus parent test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "insert_focus parent test sequence", TRUE); DestroyWindow(hTab); } @@ -1108,7 +1106,7 @@ static void test_delete_focus(HWND parent_wnd) expect(-1, r); ok_sequence(sequences, TAB_SEQ_INDEX, delete_focus_seq, "delete_focus test sequence", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "delete_focus parent test sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "delete_focus parent test sequence", TRUE); DestroyWindow(hTab); }

1 0

Paul Vriens : netapi32/tests: Fix a test failure on Win7.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 0b8ae4683602dead8b560f90cf82b7360fb85b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8ae4683602dead8b560f90c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 20 10:12:17 2009 +0100 netapi32/tests: Fix a test failure on Win7. --- dlls/netapi32/tests/access.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 7886b36..2f29684 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -155,7 +155,10 @@ static void run_usergetinfo_tests(void) todo_wine { /* FIXME - Currently Wine can't verify whether the network path is good or bad */ rc=pNetUserGetInfo(sBadNetPath, sTestUserName, 0, (LPBYTE *)&ui0); - ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE || rc == RPC_S_SERVER_UNAVAILABLE, + ok(rc == ERROR_BAD_NETPATH || + rc == ERROR_NETWORK_UNREACHABLE || + rc == RPC_S_SERVER_UNAVAILABLE || + rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ "Bad Network Path: rc=%d\n",rc); } rc=pNetUserGetInfo(sEmptyStr, sTestUserName, 0, (LPBYTE *)&ui0);

1 0

Maarten Lankhorst : dsound: Restore old speaker config after tests.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: b0cfbe81fa4611c2fce3b347db199348ef3ff009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cfbe81fa4611c2fce3b347d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 20 10:11:42 2009 +0100 dsound: Restore old speaker config after tests. According to the documentation, only audio device vendors are allowed to call this function, so make sure we properly restore the old speaker config. --- dlls/dsound/tests/dsound.c | 13 ++++++++++--- dlls/dsound/tests/dsound8.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 114dbb6..f059c20 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -55,7 +55,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, IUnknown * unknown; IDirectSound * ds; IDirectSound8 * ds8; - DWORD speaker_config, new_speaker_config; + DWORD speaker_config, new_speaker_config, ref_speaker_config; /* Try to Query for objects */ rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); @@ -144,11 +144,17 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, rc=IDirectSound_GetSpeakerConfig(dso,&speaker_config); ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); + ref_speaker_config = speaker_config; speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - rc=IDirectSound_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08x\n", rc); + if (speaker_config == ref_speaker_config) + speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, + DSSPEAKER_GEOMETRY_NARROW); + if(rc==DS_OK) { + rc=IDirectSound_SetSpeakerConfig(dso,speaker_config); + ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08x\n", rc); + } if (rc==DS_OK) { rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); @@ -156,6 +162,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, trace("IDirectSound_GetSpeakerConfig() failed to set speaker " "config: expected 0x%08x, got 0x%08x\n", speaker_config,new_speaker_config); + IDirectSound_SetSpeakerConfig(dso,ref_speaker_config); } EXIT: diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a2b16d8..5eb7c05 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -54,7 +54,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, IUnknown * unknown; IDirectSound * ds; IDirectSound8 * ds8; - DWORD speaker_config, new_speaker_config; + DWORD speaker_config, new_speaker_config, ref_speaker_config; DWORD certified; /* Try to Query for objects */ @@ -148,11 +148,17 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, rc=IDirectSound8_GetSpeakerConfig(dso,&speaker_config); ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); + ref_speaker_config = speaker_config; speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - rc=IDirectSound8_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08x\n", rc); + if (speaker_config == ref_speaker_config) + speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, + DSSPEAKER_GEOMETRY_NARROW); + if(rc==DS_OK) { + rc=IDirectSound8_SetSpeakerConfig(dso,speaker_config); + ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08x\n", rc); + } if (rc==DS_OK) { rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); @@ -160,6 +166,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, trace("IDirectSound8_GetSpeakerConfig() failed to set speaker " "config: expected 0x%08x, got 0x%08x\n", speaker_config,new_speaker_config); + IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config); } rc=IDirectSound8_VerifyCertification(dso, &certified);

1 0

Paul Vriens : winetest: Add product information to the output for Vista and higher.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: c34ca48b3e0b3837473c5cf9306fcf823095748a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34ca48b3e0b3837473c5cf93… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 20 10:48:17 2009 +0100 winetest: Add product information to the output for Vista and higher. --- programs/winetest/main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ee092e5..21dbaef 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -209,6 +209,7 @@ static void print_version (void) const char *(CDECL *wine_get_build_id)(void); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); + BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); if (!(ext = GetVersionEx ((OSVERSIONINFO *) &ver))) @@ -247,6 +248,15 @@ static void print_version (void) " wSuiteMask=%d\n wProductType=%d\n wReserved=%d\n", ver.wServicePackMajor, ver.wServicePackMinor, ver.wSuiteMask, ver.wProductType, ver.wReserved); + + pGetProductInfo = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"GetProductInfo"); + if (pGetProductInfo && !running_under_wine()) + { + DWORD prodtype = 0; + + pGetProductInfo(ver.dwMajorVersion, ver.dwMinorVersion, ver.wServicePackMajor, ver.wServicePackMinor, &prodtype); + xprintf(" dwProductInfo=%u\n", prodtype); + } } static inline int is_dot_dir(const char* x)

1 0

Alexandre Julliard : server: Use the correct thread id to set affinity.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: a764fe89212500b0ffa23fa9a9f699db89fd7d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a764fe89212500b0ffa23fa9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 11:44:54 2009 +0100 server: Use the correct thread id to set affinity. --- server/thread.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index f45be24..b50193a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -415,7 +415,7 @@ void set_thread_affinity( struct thread *thread, affinity_t affinity ) return; } #ifdef HAVE_SCHED_SETAFFINITY - if (thread->unix_pid != -1) + if (thread->unix_tid != -1) { cpu_set_t set; int i; @@ -425,7 +425,7 @@ void set_thread_affinity( struct thread *thread, affinity_t affinity ) for (i = 0, mask = 1; mask; i++, mask <<= 1) if (affinity & mask) CPU_SET( i, &set ); - if (!sched_setaffinity( thread->unix_pid, sizeof(set), &set )) + if (!sched_setaffinity( thread->unix_tid, sizeof(set), &set )) thread->affinity = affinity; else file_set_error();

1 0

Alexandre Julliard : kernel32/tests: Add more tests for file sharing with mappings, including SEC_IMAGE mappings.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 647491418b79bc9ac954a8e3ee73e61fa4bf5d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=647491418b79bc9ac954a8e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 13:42:12 2009 +0100 kernel32/tests: Add more tests for file sharing with mappings, including SEC_IMAGE mappings. --- dlls/kernel32/tests/file.c | 109 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 99ba379..63e6e78 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1616,6 +1616,71 @@ static void test_LockFile(void) DeleteFileA( filename ); } +static BOOL create_fake_dll( LPCSTR filename ) +{ + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + IMAGE_SECTION_HEADER *sec; + BYTE *buffer; + DWORD lfanew = sizeof(*dos); + DWORD size = lfanew + sizeof(*nt) + sizeof(*sec); + DWORD written; + BOOL ret; + + HANDLE file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + buffer = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + + dos = (IMAGE_DOS_HEADER *)buffer; + dos->e_magic = IMAGE_DOS_SIGNATURE; + dos->e_cblp = sizeof(*dos); + dos->e_cp = 1; + dos->e_cparhdr = lfanew / 16; + dos->e_minalloc = 0; + dos->e_maxalloc = 0xffff; + dos->e_ss = 0x0000; + dos->e_sp = 0x00b8; + dos->e_lfarlc = lfanew; + dos->e_lfanew = lfanew; + + nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); + nt->Signature = IMAGE_NT_SIGNATURE; + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; + nt->FileHeader.NumberOfSections = 1; + nt->FileHeader.SizeOfOptionalHeader = IMAGE_SIZEOF_NT_OPTIONAL_HEADER; + nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; + nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.ImageBase = 0x10000000; + nt->OptionalHeader.SectionAlignment = 0x1000; + nt->OptionalHeader.FileAlignment = 0x1000; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.SizeOfImage = 0x2000; + nt->OptionalHeader.SizeOfHeaders = size; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + + sec = (IMAGE_SECTION_HEADER *)(nt + 1); + memcpy( sec->Name, ".rodata", sizeof(".rodata") ); + sec->Misc.VirtualSize = 0x1000; + sec->VirtualAddress = 0x1000; + sec->SizeOfRawData = 0; + sec->PointerToRawData = 0; + sec->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + + ret = WriteFile( file, buffer, size, &written, NULL ) && written == size; + HeapFree( GetProcessHeap(), 0, buffer ); + CloseHandle( file ); + return ret; +} + static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2, BOOL is_win9x ) { if (!is_win9x) @@ -1645,6 +1710,7 @@ static int is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sha { if ((map_access == PAGE_READWRITE || map_access == PAGE_EXECUTE_READWRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; + if ((map_access & SEC_IMAGE) && (access2 & GENERIC_WRITE)) return 0; return 1; } @@ -1659,24 +1725,19 @@ static void test_file_sharing(void) FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE }; static const DWORD mapping_modes[] = - { PAGE_READONLY, PAGE_WRITECOPY, PAGE_READWRITE }; - static const char dummy[] = "dummy"; + { PAGE_READONLY, PAGE_WRITECOPY, PAGE_READWRITE, SEC_IMAGE | PAGE_WRITECOPY }; int a1, s1, a2, s2; int ret; HANDLE h, h2; BOOL is_win9x = FALSE; - DWORD written; /* make sure the file exists */ - h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - if (h == INVALID_HANDLE_VALUE) + if (!create_fake_dll( filename )) { ok(0, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError()); return; } is_win9x = GetFileAttributesW(filenameW) == INVALID_FILE_ATTRIBUTES; - WriteFile( h, dummy, strlen(dummy), &written, NULL ); - CloseHandle( h ); for (a1 = 0; a1 < sizeof(access_modes)/sizeof(access_modes[0]); a1++) { @@ -1737,6 +1798,7 @@ static void test_file_sharing(void) { HANDLE m; + create_fake_dll( filename ); SetLastError(0xdeadbeef); h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); if (h == INVALID_HANDLE_VALUE) @@ -1784,6 +1846,39 @@ static void test_file_sharing(void) } } } + + /* try CREATE_ALWAYS over an existing mapping */ + SetLastError(0xdeadbeef); + h2 = CreateFileA( filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, 0, 0 ); + ret = GetLastError(); + ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); + if ((mapping_modes[a1] & SEC_IMAGE) || is_win9x) + ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + else todo_wine + ok( ret == ERROR_USER_MAPPED_FILE, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + + /* try DELETE_ON_CLOSE over an existing mapping */ + SetLastError(0xdeadbeef); + h2 = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ret = GetLastError(); + if (is_win9x) + { + ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); + ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + } + else if (mapping_modes[a1] & SEC_IMAGE) + { + ok( h2 == INVALID_HANDLE_VALUE, "create succeeded for map %x\n", mapping_modes[a1] ); + todo_wine ok( ret == ERROR_ACCESS_DENIED, "wrong error code %d for %x\n", ret, mapping_modes[a1] ); + } + else todo_wine + { + ok( h2 != INVALID_HANDLE_VALUE, "open failed for map %x err %u\n", mapping_modes[a1], ret ); + } + if (h2 != INVALID_HANDLE_VALUE) CloseHandle( h2 ); + CloseHandle( m ); }

1 0

Michael Martin : msi: Shedule rename operation also for ERROR_USER_MAPPED_FILE.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: d28eabda5c92ed66c362709f9771970634363725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28eabda5c92ed66c362709f9… Author: Michael Martin <martinmnet(a)hotmail.com> Date: Fri Oct 30 13:10:27 2009 +0000 msi: Shedule rename operation also for ERROR_USER_MAPPED_FILE. --- dlls/msi/files.c | 2 +- dlls/msi/media.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d9470df..7e74dca 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -155,7 +155,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) gle = copy_file(file, source); TRACE("Overwriting existing file: %d\n", gle); } - if (gle == ERROR_SHARING_VIOLATION) + if (gle == ERROR_SHARING_VIOLATION || gle == ERROR_USER_MAPPED_FILE) { WCHAR tmpfileW[MAX_PATH], *pathW, *p; DWORD len; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index bc60b60..67d73cc 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -362,7 +362,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError(); } - if (err == ERROR_SHARING_VIOLATION) + if (err == ERROR_SHARING_VIOLATION || err == ERROR_USER_MAPPED_FILE) { WCHAR tmpfileW[MAX_PATH], *tmppathW, *p; DWORD len;

1 0