September 2009 - Wine-Commits

Alexandre Julliard : ws2_32: Move the 16-bit async functions to socket16.c.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 252925fe536f7688bfa0fa0b586e5ff07cc41b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252925fe536f7688bfa0fa0b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:00:53 2009 +0200 ws2_32: Move the 16-bit async functions to socket16.c. --- dlls/ws2_32/async.c | 145 +------------------ dlls/ws2_32/socket16.c | 389 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 372 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=252925fe536f7688bfa0f…

1 0

Alexandre Julliard : ws2_32: Make winsock. dll into a stand-alone 16-bit module.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 7dc9ea8950174c2aec67452b8a99531a66ef5db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc9ea8950174c2aec67452b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:05:26 2009 +0200 ws2_32: Make winsock.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 4 - dlls/winsock.dll16/Makefile.in | 14 ++ dlls/{ws2_32/socket16.c => winsock.dll16/socket.c} | 194 +++++++++++++------- .../winsock.dll16.spec} | 16 +- {include/wine => dlls/winsock.dll16}/winsock16.h | 5 +- dlls/ws2_32/Makefile.in | 4 - dlls/ws2_32/socket.c | 8 - 10 files changed, 164 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dc9ea8950174c2aec674…

1 0

Alexandre Julliard : ws2_32: Move the getXXXbyYYY critical section to socket.c.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 4ad0c4d86cd2efe53b9f592b6c0b7812db8e05ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad0c4d86cd2efe53b9f592b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 19:32:43 2009 +0200 ws2_32: Move the getXXXbyYYY critical section to socket.c. --- dlls/ws2_32/async.c | 10 ---------- dlls/ws2_32/socket.c | 9 ++++++++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index fccca26..93615f8 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -53,16 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); -/* critical section to protect some non-reentrant net function */ -CRITICAL_SECTION csWSgetXXXbyYYY; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &csWSgetXXXbyYYY, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": csWSgetXXXbyYYY") } -}; -CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; - #define AQ_WIN16 0x00 #define AQ_WIN32 0x04 #define HB_WIN32(hb) (hb->query.flags & AQ_WIN32) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4462a9a..6c78210 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -168,7 +168,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); /* critical section to protect some non-reentrant net function */ -extern CRITICAL_SECTION csWSgetXXXbyYYY; +static CRITICAL_SECTION csWSgetXXXbyYYY; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csWSgetXXXbyYYY, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csWSgetXXXbyYYY") } +}; +static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; union generic_unix_sockaddr {

1 0

Michael Stefaniuc : msi/tests: Remove trailing '\'.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: f8ec47d5c63b6f0301a874ed2132fdad3e64be11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ec47d5c63b6f0301a874ed2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:27 2009 +0200 msi/tests: Remove trailing '\'. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index df768ec..4af37aa 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -369,8 +369,8 @@ static int strcmp_ww(const WCHAR* str1, const WCHAR* str2) { CHAR str1A[MAX_PATH], str2A[MAX_PATH]; - WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); return lstrcmpA(str1A, str2A); }

1 0

Ge van Geldorp : comctl32/tests: Fix toolbar test on comctl32 version 4.72.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 6eb6e31e0558ab43062be13158e38db877f216bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb6e31e0558ab43062be1315… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 28 12:40:46 2009 +0200 comctl32/tests: Fix toolbar test on comctl32 version 4.72. --- dlls/comctl32/tests/toolbar.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 86e9027..d0a444e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -740,6 +740,22 @@ static tbsize_result_t tbsize_results[] = static int tbsize_numtests = 0; +typedef struct +{ + int test_num; + int rect_index; + RECT rcButton; +} tbsize_alt_result_t; + +static tbsize_alt_result_t tbsize_alt_results[] = +{ + { 5, 2, { 0, 24, 8, 29 } }, + { 20, 1, { 100, 2, 107, 102 } }, + { 20, 2, { 107, 2, 207, 102 } } +}; + +static int tbsize_alt_numtests = 0; + #define check_sizes_todo(todomask) { \ RECT rc; \ int buttonCount, i, mask=(todomask); \ @@ -751,7 +767,11 @@ static int tbsize_numtests = 0; compare(buttonCount, res->nButtons, "%d"); \ for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ - if (!(mask&1)) { \ + if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ + memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + win_skip("Alternate rect found\n"); \ + tbsize_alt_numtests++; \ + } else if (!(mask&1)) { \ check_rect("button", rc, res->rcButtons[i]); \ } else {\ todo_wine { check_rect("button", rc, res->rcButtons[i]); } \

1 0

Michael Stefaniuc : windowscodecs: Remove trailing '\'.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 22e2c111c1236def0bca3f572d26e07eda36f8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e2c111c1236def0bca3f572… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:42 2009 +0200 windowscodecs: Remove trailing '\'. --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 11c39e8..abe9977 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -342,7 +342,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; pos.QuadPart = 0; - hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL);\ + hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) return hr; hr = IStream_Write(This->stream, &bfh, sizeof(BITMAPFILEHEADER), &byteswritten);

1 0

Hans Leidekker : msi: Test the Installed property.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 2beee126a7fe9dae1a4481a26b9478727440bbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2beee126a7fe9dae1a4481a26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:56:26 2009 +0200 msi: Test the Installed property. --- dlls/msi/custom.c | 2 +- dlls/msi/tests/install.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7fcb09a..5ac9c1b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1055,7 +1055,7 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, msi_free( deformated ); - return ERROR_FUNCTION_FAILED; + return ERROR_INSTALL_FAILURE; } static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9a33b79..627b81c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -886,6 +886,32 @@ static const CHAR ai_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; +static const CHAR ip_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterUser\t\t6000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n" + "TestInstalledProp\tInstalled AND NOT REMOVE\t950\n"; + +static const CHAR ip_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestInstalledProp\t19\t\tTest failed\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1500,6 +1526,19 @@ static const msi_table pc_tables[] = ADD_TABLE(property) }; +static const msi_table ip_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(ip_install_exec_seq), + ADD_TABLE(ip_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6600,6 +6639,44 @@ static void test_preselected(void) delete_test_files(); } +static void test_installed_prop(void) +{ + static char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; + UINT r; + + create_test_files(); + create_database(msifile, ip_tables, sizeof(ip_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + r = MsiConfigureProductExA(prodcode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6685,6 +6762,7 @@ START_TEST(install) test_envvar(); test_lastusedsource(); test_preselected(); + test_installed_prop(); DeleteFileA(log_file);

1 0

Markus Stockhausen : ddraw: Set dwBackBufferCount= 0 in CreateSurface for backbuffer.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: dbb29993db537a3d2de4f1de3c7c6cfbf65c50bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb29993db537a3d2de4f1de3… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Tue Sep 29 15:50:47 2009 +0200 ddraw: Set dwBackBufferCount=0 in CreateSurface for backbuffer. --- dlls/ddraw/ddraw.c | 1 + dlls/ddraw/tests/dsurface.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c21dec1..726ce7b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2492,6 +2492,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, extra_surfaces = DDSD->dwBackBufferCount; desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; + desc2.dwBackBufferCount = 0; } hr = DD_OK; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 8e0857e..c0e84be 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1154,9 +1154,9 @@ static void AttachmentTest7(void) HRESULT hr; IDirectDraw7 *dd7; IDirectDrawSurface7 *surface1, *surface2, *surface3, *surface4; - DDSURFACEDESC2 ddsd; + DDSURFACEDESC2 ddsd, ddsd2; UINT num; - DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}, caps2 = {DDSCAPS_BACKBUFFER,0,0,0}; HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); @@ -1253,6 +1253,14 @@ static void AttachmentTest7(void) hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + /* backbuffer surfaces must not have dwBackBufferCount set */ + ddsd2.dwSize = sizeof(ddsd2); + hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps2, &surface2); + ok(hr==DD_OK,"GetAttachedSurface returned: %x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd2); + ok(hr==DD_OK,"GetSurfaceDesc returned: %x\n", hr); + ok(ddsd2.dwBackBufferCount==0,"backbuffer surface has dwBackBufferCount==%u\n", ddsd2.dwBackBufferCount); + num = 0; IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num);

1 0

Michael Stefaniuc : dxdiagn: Remove duplicate include.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 46dcb777dbb255b573a31917f93e15045a002232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46dcb777dbb255b573a31917f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:21 2009 +0200 dxdiagn: Remove duplicate include. --- dlls/dxdiagn/provider.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index fb13033..cb91ed4 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -29,7 +29,6 @@ #include "winver.h" #include "objidl.h" #include "dshow.h" -#include "strmif.h" #include "vfw.h" #include "mmddk.h" #include "ddraw.h"

1 0

Hans Leidekker : msi: Test installing over in-use files.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: c0c6daeb5ab8e2e02c1f9a611f44e72fe9956581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c6daeb5ab8e2e02c1f9a611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:57:42 2009 +0200 msi: Test installing over in-use files. --- dlls/msi/tests/install.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 627b81c..6a037ef 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1539,6 +1539,18 @@ static const msi_table ip_tables[] = ADD_TABLE(property) }; +static const msi_table fiu_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6677,6 +6689,84 @@ static void test_installed_prop(void) delete_test_files(); } +static void test_file_in_use(void) +{ + UINT r; + DWORD size; + HANDLE file; + HKEY hkey; + LONG ret; + char path[MAX_PATH], *buf, *src, *dst; + + static char key[] = "System\\CurrentControlSet\\Control\\Session Manager"; + static char value[] = "PendingFileRenameOperations"; + + RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_ALL_ACCESS, &hkey); + if (!RegQueryValueExA(hkey, value, NULL, NULL, NULL, &size)) + { + skip("Pending file rename operations, skipping test\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, fiu_tables, sizeof(fiu_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectoryA(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + + r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1"); + todo_wine ok(r == ERROR_SUCCESS_REBOOT_REQUIRED, "Expected ERROR_SUCCESS_REBOOT_REQUIRED got %u\n", r); + ok(!file_matches(path), "Expected file not to match\n"); + CloseHandle(file); + + ret = RegQueryValueExA(hkey, value, NULL, NULL, NULL, &size); + buf = HeapAlloc(GetProcessHeap(), 0, size); + + buf[0] = 0; + ret = RegQueryValueExA(hkey, value, NULL, NULL, (LPBYTE)buf, &size); + todo_wine ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); + todo_wine ok(strstr(buf, "msitest\\maximus") != NULL, "Unexpected value \"%s\"\n", buf); + + for (src = buf; *src; src = dst + strlen(dst) + 1) + { + DWORD flags = MOVEFILE_COPY_ALLOWED; + + dst = src + strlen(src) + 1; + if (*dst == '!') + { + flags |= MOVEFILE_REPLACE_EXISTING; + dst++; + } + src += strlen("\\??\\"); + if (*dst) + { + dst += strlen("\\??\\"); + ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + } + else + ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + } + HeapFree(GetProcessHeap(), 0, buf); + RegDeleteValueA(hkey, value); + RegCloseKey(hkey); + + todo_wine ok(file_matches(path), "Expected file to match\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); + ok(delete_pf("msitest", FALSE), "Directory not present\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6763,6 +6853,7 @@ START_TEST(install) test_lastusedsource(); test_preselected(); test_installed_prop(); + test_file_in_use(); DeleteFileA(log_file);

1 0