July 2006 - Wine-Commits - list.winehq.org

Robert Shearman : oleaut32: Typelib interfaces with the FDUAL flag should also be registered,
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 797bdbc2d9f20b3730b2290cfc423e56a6be072d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=797bdbc2d9f20b3730b2290… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:07:01 2006 +0100 oleaut32: Typelib interfaces with the FDUAL flag should also be registered, since dispinterfaces don't have the FDISPATCHABLE flag. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ce3a1dc..ccb5829 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -597,7 +597,7 @@ #undef XX MESSAGE("\n"); } - if (tattr->wTypeFlags & (TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDISPATCHABLE)) + if (tattr->wTypeFlags & (TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL|TYPEFLAG_FDISPATCHABLE)) { /* register interface<->typelib coupling */ get_interface_key( &tattr->guid, keyName );

1 0

Robert Shearman : rpcrt4: Add a stub for I_RpcMapWin32Status.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 2538490d0bb68c2e0c0b2c67d7336b679edb53b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2538490d0bb68c2e0c0b2c6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:06:44 2006 +0100 rpcrt4: Add a stub for I_RpcMapWin32Status. --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5141165..ca5f45f 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -59,7 +59,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub I_RpcIfInqTransferSyntaxes @ stub I_RpcLaunchDatagramReceiveThread # win9x @ stub I_RpcLogEvent -@ stub I_RpcMapWin32Status +@ stdcall I_RpcMapWin32Status(long) @ stub I_RpcMonitorAssociation @ stub I_RpcNegotiateTransferSyntax # wxp @ stub I_RpcNsBindingSetEntryName diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 092354a..65b86f4 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -816,3 +816,12 @@ void WINAPI I_RpcFree(void *Object) { HeapFree(GetProcessHeap(), 0, Object); } + +/****************************************************************************** + * I_RpcMapWin32Status (rpcrt4.@) + */ +DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status) +{ + FIXME("(%ld): stub\n", status); + return 0; +}

1 0

Robert Shearman : dbghelp: Fix the finding of PDB DS-type files.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 7084f14073467f2a5b51a66dec9677b2744dd07e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7084f14073467f2a5b51a66… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jul 13 13:06:15 2006 +0100 dbghelp: Fix the finding of PDB DS-type files. --- dlls/dbghelp/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index bedc0f0..f297011 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -309,7 +309,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf WARN("Found %s, but wrong PDB version\n", buffer); return FALSE; } - if (!(memcmp(&pdb_lookup.u.ds.guid, (GUID*)s->id, sizeof(GUID)))) + if (memcmp(&pdb_lookup.u.ds.guid, (GUID*)s->id, sizeof(GUID))) { WARN("Found %s, but wrong GUID: %s %s\n", buffer, debugstr_guid(&pdb_lookup.u.ds.guid),

1 0

Alexandre Julliard : kernel32: Moved initialisation of the console handles to DllMain.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 38440f561d4dc8a80855460bacea313a895da19b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38440f561d4dc8a80855460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 14:04:40 2006 +0200 kernel32: Moved initialisation of the console handles to DllMain. --- dlls/kernel/kernel_main.c | 22 +++++++++++++++++++++- dlls/kernel/process.c | 19 ------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index dea83b2..f6eeba9 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -97,6 +97,7 @@ static void thread_detach(void) static BOOL process_attach(void) { SYSTEM_INFO si; + RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; /* FIXME: should probably be done in ntdll */ GetSystemInfo( &si ); @@ -108,6 +109,25 @@ static BOOL process_attach(void) /* Setup computer name */ COMPUTERNAME_Init(); + /* convert value from server: + * + 0 => INVALID_HANDLE_VALUE + * + console handle needs to be mapped + */ + if (!params->hStdInput) + params->hStdInput = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) + params->hStdInput = console_handle_map(params->hStdInput); + + if (!params->hStdOutput) + params->hStdOutput = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) + params->hStdOutput = console_handle_map(params->hStdOutput); + + if (!params->hStdError) + params->hStdError = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) + params->hStdError = console_handle_map(params->hStdError); + /* copy process information from ntdll */ ENV_CopyStartupInformation(); @@ -127,7 +147,7 @@ #endif /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); - if (NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle == (HANDLE)1) /* FIXME */ + if (params->ConsoleHandle == (HANDLE)1) /* FIXME */ { HMODULE mod = GetModuleHandleA(0); if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 4a9d01e..389899c 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -743,25 +743,6 @@ static BOOL process_init(void) init_windows_dirs(); init_current_directory( &params->CurrentDirectory ); - /* convert value from server: - * + 0 => INVALID_HANDLE_VALUE - * + console handle needs to be mapped - */ - if (!params->hStdInput) - params->hStdInput = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) - params->hStdInput = console_handle_map(params->hStdInput); - - if (!params->hStdOutput) - params->hStdOutput = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) - params->hStdOutput = console_handle_map(params->hStdOutput); - - if (!params->hStdError) - params->hStdError = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) - params->hStdError = console_handle_map(params->hStdError); - return TRUE; }

1 0

Alexandre Julliard : shell32: Avoid using macros that cause gcc warnings.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 669780c24f85a3ea135d9b159395516400d6f8ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=669780c24f85a3ea135d9b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 15:50:20 2006 +0200 shell32: Avoid using macros that cause gcc warnings. --- dlls/shell32/brsfolder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 2ef6b76..2d73d9b 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -588,7 +588,7 @@ static BOOL BrsFolder_OnSetExpanded(brow while (item.hItem && !_ILIsEmpty(pidlCurrent)) { LPTV_ITEMDATA pItemData; - TreeView_GetItemW(info->hwndTreeView, &item); + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); pItemData = (LPTV_ITEMDATA)item.lParam; if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) { @@ -596,7 +596,7 @@ static BOOL BrsFolder_OnSetExpanded(brow if (!_ILIsEmpty(pidlCurrent)) { /* Only expand current node and move on to it's first child, * if we didn't already reach the last SHITEMID */ - TreeView_Expand(info->hwndTreeView, item.hItem, TVE_EXPAND); + SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); } } else { @@ -623,7 +623,7 @@ static BOOL BrsFolder_OnSetSelectionW(br bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); if (bResult) - TreeView_Select(info->hwndTreeView, hItem, TVGN_CARET); + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hItem ); return bResult; }

1 0

Alexandre Julliard : ntdll: Moved the calling of the process entry point to LdrInitializeThunk.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 50fca716fddf5af03b4c91ae5e950daff5fbdf2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50fca716fddf5af03b4c91a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 14:58:04 2006 +0200 ntdll: Moved the calling of the process entry point to LdrInitializeThunk. --- dlls/kernel/process.c | 17 ----------------- dlls/ntdll/loader.c | 19 +++++++++++++++---- include/winternl.h | 2 +- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 389899c..911cf51 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -54,7 +54,6 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); -WINE_DECLARE_DEBUG_CHANNEL(relay); typedef struct { @@ -794,23 +793,7 @@ static void start_process( void *arg ) { __TRY { - PEB *peb = NtCurrentTeb()->Peb; - IMAGE_NT_HEADERS *nt; - LPTHREAD_START_ROUTINE entry; - LdrInitializeThunk( 0, 0, 0, 0 ); - - nt = RtlImageNtHeader( peb->ImageBaseAddress ); - entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + - nt->OptionalHeader.AddressOfEntryPoint); - - if (TRACE_ON(relay)) - DPRINTF( "%04lx:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); - - SetLastError( 0 ); /* clear error code */ - if (peb->BeingDebugged) DbgBreakPoint(); - ExitProcess( entry( peb ) ); } __EXCEPT(UnhandledExceptionFilter) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f5022e1..0ca8f2a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2094,6 +2094,8 @@ void WINAPI LdrInitializeThunk( ULONG un LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); + LPTHREAD_START_ROUTINE entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + + nt->OptionalHeader.AddressOfEntryPoint); if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -2125,9 +2127,9 @@ void WINAPI LdrInitializeThunk( ULONG un /* Signal the parent process to continue */ SERVER_START_REQ( init_process_done ) { - req->module = peb->ImageBaseAddress; - req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; - req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); + req->module = peb->ImageBaseAddress; + req->entry = entry; + req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); } SERVER_END_REQ; @@ -2151,7 +2153,16 @@ void WINAPI LdrInitializeThunk( ULONG un RtlLeaveCriticalSection( &loader_section ); if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); - return; + + if (TRACE_ON(relay)) + DPRINTF( "%04lx:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_SUCCESS ); /* clear error code */ + if (peb->BeingDebugged) DbgBreakPoint(); + status = entry( peb ); + LdrShutdownProcess(); + NtTerminateProcess( GetCurrentProcess(), status ); error: ERR( "Main exe initialization for %s failed, status %lx\n", diff --git a/include/winternl.h b/include/winternl.h index 5177348..c8aa3ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1726,7 +1726,7 @@ NTSTATUS WINAPI LdrFindResourceDirector NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSTATUS WINAPI LdrGetDllHandle(ULONG, ULONG, const UNICODE_STRING*, HMODULE*); NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); +void DECLSPEC_NORETURN WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); void WINAPI LdrShutdownProcess(void); void WINAPI LdrShutdownThread(void);

1 0

James Hawkins : shlwapi: Add tests for PathCommonPrefixA.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: c70bf5aaab747ca8966536d64c0047f1959001d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c70bf5aaab747ca8966536d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 12 17:19:55 2006 -0700 shlwapi: Add tests for PathCommonPrefixA. --- dlls/shlwapi/tests/path.c | 212 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 212 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c70bf5aaab747ca8966…

1 0

James Hawkins : shlwapi: Add tests for PathBuildRootA.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: a6f4ede2557d83c2f659b8f320e2b53658ac8448 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6f4ede2557d83c2f659b8f… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 12 17:18:37 2006 -0700 shlwapi: Add tests for PathBuildRootA. --- dlls/shlwapi/tests/path.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 183c936..0f9a2cf 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1485,6 +1485,60 @@ static void test_PathFindExtensionA(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); } +static void test_PathBuildRootA(void) +{ + LPSTR root; + char path[10]; + char root_expected[26][4]; + char drive; + int j; + + /* set up the expected paths */ + for (drive = 'A'; drive <= 'Z'; drive++) + sprintf(root_expected[drive - 'A'], "%c:\\", drive); + + /* test the expected values */ + for (j = 0; j < 26; j++) + { + SetLastError(0xdeadbeef); + lstrcpy(path, "aaaaaaaaa"); + root = PathBuildRootA(path, j); + ok(root == path, "Expected root == path, got %p\n", root); + ok(!lstrcmp(root, root_expected[j]), "Expected %s, got %s\n", root_expected[j], root); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + } + + /* test a negative drive number */ + SetLastError(0xdeadbeef); + lstrcpy(path, "aaaaaaaaa"); + root = PathBuildRootA(path, -1); + ok(root == path, "Expected root == path, got %p\n", root); + ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* test a drive number greater than 25 */ + SetLastError(0xdeadbeef); + lstrcpy(path, "aaaaaaaaa"); + root = PathBuildRootA(path, 26); + ok(root == path, "Expected root == path, got %p\n", root); + ok(!lstrcmp(path, "aaaaaaaaa"), "Expected aaaaaaaaa, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* length of path is less than 4 */ + SetLastError(0xdeadbeef); + lstrcpy(path, "aa"); + root = PathBuildRootA(path, 0); + ok(root == path, "Expected root == path, got %p\n", root); + ok(!lstrcmp(path, "A:\\"), "Expected A:\\, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* path is NULL */ + SetLastError(0xdeadbeef); + root = PathBuildRootA(NULL, 0); + ok(root == NULL, "Expected root == NULL, got %p\n", root); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); +} + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -1527,4 +1581,5 @@ START_TEST(path) test_PathAppendA(); test_PathCanonicalizeA(); test_PathFindExtensionA(); + test_PathBuildRootA(); }

1 0

Thomas Kho : notepad: Change file not saved alert title to match Windows' notepad.exe.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 724dd10ee80fe8b909c914dca07be13dacf251e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=724dd10ee80fe8b909c914d… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Jul 12 14:15:42 2006 -0700 notepad: Change file not saved alert title to match Windows' notepad.exe. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 1488af0..4125326 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -104,7 +104,7 @@ static int AlertFileNotSaved(LPCWSTR szF wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled); /* Load Caption */ - LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); /* Display modal */ return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL);

1 0

James Hawkins : msi: Update the files target paths as well, because a parent directory might have been changed.
by Alexandre Julliard July 13, 2006

July 13, 2006

Module: wine Branch: refs/heads/master Commit: 094915ae2c12f1b3122462890bcda20b8cb70f7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=094915ae2c12f1b31224628… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 12 15:43:30 2006 -0700 msi: Update the files target paths as well, because a parent directory might have been changed. --- dlls/msi/install.c | 16 ++++++++++++++++ dlls/msi/tests/package.c | 7 ++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 5eaf10b..a09782d 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -331,6 +331,7 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack LPWSTR path = NULL; LPWSTR path2 = NULL; MSIFOLDER *folder; + MSIFILE *file; TRACE("(%p %s %s)\n",package, debugstr_w(szFolder),debugstr_w(szFolderPath)); @@ -374,6 +375,21 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack path2 = resolve_folder(package, f->Directory, FALSE, TRUE, NULL); msi_free(path2); } + + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) + { + MSICOMPONENT *comp = file->Component; + LPWSTR p; + + if (!comp) + continue; + + p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); + msi_free(file->TargetPath); + + file->TargetPath = build_directory_name(2, p, file->FileName); + msi_free(p); + } } msi_free(path); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 338b3fb..7db243a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -499,11 +499,8 @@ static void test_settargetpath(void) ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); query_file_path( hpkg, "[#TestFile]", buffer ); - todo_wine - { - ok( !lstrcmp(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), - "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); - } + ok( !lstrcmp(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), + "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); MsiCloseHandle( hpkg ); }

1 0