May 2018 - Wine-commits - list.winehq.org

Michael Müller : combase: Add stub for RoGetApartmentIdentifier.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: a422f0ef55f0dc2e4f23a68d6966586e06d7303d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a422f0ef55f0dc2e4f23a68d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:12 2018 +0000 combase: Add stub for RoGetApartmentIdentifier. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 978c3dc..88139fb 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f42bdae..ff89232 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -250,7 +250,7 @@ @ stub RoGetActivatableClassRegistration @ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index bfd07fb..9cceb82 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -218,3 +218,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) return hr; } + +/*********************************************************************** + * RoGetApartmentIdentifier (combase.@) + */ +HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) +{ + FIXME("(%p): stub\n", identifier); + + if (!identifier) + return E_INVALIDARG; + + *identifier = 0xdeadbeef; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoRegisterForApartmentShutdown.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: ddbe3a70255185a628823d9d5dbd01b2f00cb529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddbe3a70255185a628823d9d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:14 2018 +0000 combase: Add stub for RoRegisterForApartmentShutdown. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 88139fb..d27130c 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ff89232..ec4a6cd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -263,7 +263,7 @@ @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate @ stub RoReportUnhandledError diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 9cceb82..ffcb0e9 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -232,3 +232,22 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) *identifier = 0xdeadbeef; return S_OK; } + +/*********************************************************************** + * RoRegisterForApartmentShutdown (combase.@) + */ +HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, + UINT64 *identifier, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE *cookie) +{ + HRESULT hr; + + FIXME("(%p, %p, %p): stub\n", callback, identifier, cookie); + + hr = RoGetApartmentIdentifier(identifier); + if (FAILED(hr)) + return hr; + + if (cookie) + *cookie = (void *)0xcafecafe; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoGetServerActivatableClasses.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 699003a459dce053fae0f2b62844c1b93e41728a URL: https://source.winehq.org/git/wine.git/?a=commit;h=699003a459dce053fae0f2b6… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:15 2018 +0000 combase: Add stub for RoGetServerActivatableClasses. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec index 350ac04..20c8d9c 100644 --- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec @@ -1,2 +1,2 @@ @ stub RoGetActivatableClassRegistration -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ec4a6cd..c721f43 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -254,7 +254,7 @@ @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ffcb0e9..96165e4 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -251,3 +251,15 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, *cookie = (void *)0xcafecafe; return S_OK; } + +/*********************************************************************** + * RoGetServerActivatableClasses (combase.@) + */ +HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count) +{ + FIXME("(%p, %p, %p): stub\n", name, classes, count); + + if (count) + *count = 0; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoRegisterActivationFactories.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: e5608bd2aed190699181128991246802526c3ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5608bd2aed1906991811289… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:16 2018 +0000 combase: Add stub for RoRegisterActivationFactories. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index d27130c..32b9474 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) combase.RoRegisterActivationFactories @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c721f43..72a7eb5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -262,7 +262,7 @@ @ stub RoOriginateErrorW @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 96165e4..ee03bd3 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -263,3 +263,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW *count = 0; return S_OK; } + +/*********************************************************************** + * RoRegisterActivationFactories (combase.@) + */ +HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks, + UINT32 count, RO_REGISTRATION_COOKIE *cookie) +{ + FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie); + + return S_OK; +}

1 0

Michael Müller : combase: Add stub for CleanupTlsOleState.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 7bb7bc86d63cbc2ade8e627515422ae19ece6d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb7bc86d63cbc2ade8e6275… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:18 2018 +0000 combase: Add stub for CleanupTlsOleState. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 72a7eb5..c8a8dee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -66,7 +66,7 @@ @ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID @ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString @ stub CleanupOleStateInAllTls -@ stub CleanupTlsOleState +@ stdcall CleanupTlsOleState(ptr) @ stub ClearCleanupFlag @ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess @ stub CoAllowUnmarshalerCLSID diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ee03bd3..63e218d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -274,3 +274,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } + +/*********************************************************************** + * CleanupTlsOleState (combase.@) + */ +void WINAPI CleanupTlsOleState(void *unknown) +{ + FIXME("(%p): stub\n", unknown); +}

1 0

Alex Henrie : include: Add lldiv and lldiv_t.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: b8c27cca3719cff353acc4a52b9e4a9d3d8a4a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c27cca3719cff353acc4a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 3 21:44:24 2018 -0600 include: Add lldiv and lldiv_t. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3c9c4a7..2db48c5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -60,6 +60,11 @@ typedef struct _ldiv_t { __msvcrt_long rem; } ldiv_t; +typedef struct _lldiv_t { + __int64 quot; + __int64 rem; +} lldiv_t; + #define _countof(x) (sizeof(x)/sizeof((x)[0])) @@ -194,6 +199,7 @@ void* __cdecl calloc(size_t,size_t); div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif +lldiv_t __cdecl lldiv(__int64,__int64); void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*);

1 0

Zebediah Figura : msi: Check return value of GetBinaryType().
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: deb4f970009d6fd85a61d3183877e67e1ccf66fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb4f970009d6fd85a61d318… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:32:57 2018 -0500 msi: Check return value of GetBinaryType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ca0362b..956b3e9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -585,6 +585,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) void *cookie; BOOL wow64; DWORD arch; + BOOL ret; DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -607,9 +608,9 @@ static DWORD WINAPI DllThread( LPVOID arg ) } info = find_action_by_guid(guid); - GetBinaryTypeW(info->source, &arch); + ret = GetBinaryTypeW(info->source, &arch); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));

1 0

Zebediah Figura : msi: Disable WoW redirection when installing a 64-bit package.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 540c48b91175b11c7b8646d0a036b20c46425080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=540c48b91175b11c7b8646d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:17:39 2018 -0500 msi: Disable WoW redirection when installing a 64-bit package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 8 ++++ dlls/msi/tests/install.c | 101 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 67dfbe4..7197bca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7855,8 +7855,12 @@ StandardActions[] = static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { UINT rc = ERROR_FUNCTION_NOT_CALLED; + void *cookie; UINT i; + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64DisableWow64FsRedirection(&cookie); + i = 0; while (StandardActions[i].action != NULL) { @@ -7891,6 +7895,10 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) } i++; } + + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64RevertWow64FsRedirection(cookie); + return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5c83d30..ac2c837 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -1334,6 +1336,18 @@ static const char da_install_exec_seq_dat[] = "immediate\t\t800\n" "InstallFinalize\t\t1100\n"; +static const CHAR x64_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "CABOUTDIR\tMSITESTDIR\tcabout\n" + "CHANGEDDIR\tMSITESTDIR\tchanged:second\n" + "FIRSTDIR\tMSITESTDIR\tfirst\n" + "MSITESTDIR\tProgramFiles64Folder\tmsitest\n" + "NEWDIR\tCABOUTDIR\tnew\n" + "ProgramFiles64Folder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + typedef struct _msi_table { const CHAR *filename; @@ -2015,6 +2029,18 @@ static const msi_table da_tables[] = ADD_TABLE(da_custom_action), }; +static const msi_table x64_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(x64_directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(install_exec_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2145,6 +2171,8 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); + GET_PROC(hkernel32, Wow64RevertWow64FsRedirection); hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -2330,7 +2358,8 @@ static BOOL get_system_dirs(void) HKEY hkey; DWORD type, size; - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &hkey)) return FALSE; size = MAX_PATH; @@ -5693,16 +5722,16 @@ static void test_package_validation(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %u\n", r); - ok(!delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(!delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(!delete_pf("msitest", FALSE), "directory exists\n"); DeleteFileA(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(delete_pf("msitest", FALSE), "directory exists\n"); } else { @@ -6124,6 +6153,67 @@ error: DeleteFileA(msifile); } +static void test_wow64(void) +{ + void *cookie; + UINT r; + + if (!is_wow64) + { + skip("test must be run on WoW64\n"); + return; + } + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database_template(msifile, x64_tables, sizeof(x64_tables)/sizeof(msi_table), 200, "x64;0"); + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + + pWow64DisableWow64FsRedirection(&cookie); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "Directory created\n"); + + ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest", FALSE), "Directory not created\n"); + + pWow64RevertWow64FsRedirection(cookie); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6217,6 +6307,7 @@ START_TEST(install) test_remove_upgrade_code(); test_feature_tree(); test_deferred_action(); + test_wow64(); DeleteFileA(customdll);

1 0

Zebediah Figura : ntoskrnl/tests: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 03 May '18

03 May '18

Module: wine Branch: master Commit: 09a39230c2b16dff4e38f8be2d21bb694918ca7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a39230c2b16dff4e38f8be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 2 21:26:17 2018 -0500 ntoskrnl/tests: Use WINAPIV calling convention for variadic functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 84cfff7..06b365f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -61,7 +61,7 @@ static void kvprintf(const char *format, __ms_va_list ap) ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), &offset, NULL); } -static void kprintf(const char *format, ...) +static void WINAPIV kprintf(const char *format, ...) { __ms_va_list valist; @@ -70,7 +70,7 @@ static void kprintf(const char *format, ...) __ms_va_end(valist); } -static void ok_(const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) { const char *current_file; __ms_va_list args;

1 0

Zebediah Figura : winedbg: Add support for starting on a user-supplied port.
by Alexandre Julliard 03 May '18

03 May '18

Module: wine Branch: master Commit: 3849270aa74f4fdb47f09eeb3442e40ea4f44520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3849270aa74f4fdb47f09eeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 2 19:32:50 2018 -0500 winedbg: Add support for starting on a user-supplied port. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 34 ++++++++++++++++++++++++++-------- programs/winedbg/winedbg.man.in | 4 ++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 376bf37..3909cb5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2468,10 +2468,10 @@ static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) return TRUE; } -static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned flags) +static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned flags, unsigned port) { int sock; - struct sockaddr_in s_addrs; + struct sockaddr_in s_addrs = {0}; socklen_t s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; @@ -2485,6 +2485,12 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl return FALSE; } + s_addrs.sin_family = AF_INET; + s_addrs.sin_addr.s_addr = INADDR_ANY; + s_addrs.sin_port = htons(port); + if (bind(sock, (struct sockaddr *)&s_addrs, sizeof(s_addrs)) == -1) + goto cleanup; + if (listen(sock, 1) == -1 || getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) goto cleanup; @@ -2553,7 +2559,7 @@ cleanup: return ret; } -static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) +static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigned port) { DEBUG_EVENT de; int i; @@ -2586,7 +2592,7 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) * and the only one of this type */ assert(gdbctx->process == NULL && de.dwProcessId == dbg_curr_pid); /* gdbctx->dwProcessId = pid; */ - if (!gdb_startup(gdbctx, &de, flags)) return FALSE; + if (!gdb_startup(gdbctx, &de, flags, port)) return FALSE; assert(!gdbctx->in_trap); } else @@ -2599,13 +2605,13 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) return TRUE; } -static int gdb_remote(unsigned flags) +static int gdb_remote(unsigned flags, unsigned port) { struct pollfd pollfd; struct gdb_context gdbctx; BOOL doLoop; - for (doLoop = gdb_init_context(&gdbctx, flags); doLoop;) + for (doLoop = gdb_init_context(&gdbctx, flags, port); doLoop;) { pollfd.fd = gdbctx.sock; pollfd.events = POLLIN; @@ -2647,7 +2653,8 @@ static int gdb_remote(unsigned flags) int gdb_main(int argc, char* argv[]) { #ifdef HAVE_POLL - unsigned gdb_flags = 0; + unsigned gdb_flags = 0, port = 0; + char *port_end; argc--; argv++; while (argc > 0 && argv[0][0] == '-') @@ -2664,11 +2671,22 @@ int gdb_main(int argc, char* argv[]) argc--; argv++; continue; } + if (strcmp(argv[0], "--port") == 0 && argc > 1) + { + port = strtoul(argv[1], &port_end, 10); + if (*port_end) + { + fprintf(stderr, "Invalid port: %s\n", argv[1]); + return -1; + } + argc -= 2; argv += 2; + continue; + } return -1; } if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) - return gdb_remote(gdb_flags); + return gdb_remote(gdb_flags, port); #else fprintf(stderr, "GdbProxy mode not supported on this platform\n"); #endif diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index ea4dc28..6f38bc0 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -73,6 +73,10 @@ When in \fBgdb\fR proxy mode, the following options are available: started. Relevant information for starting \fBgdb\fR is printed on screen. This is somehow useful when not directly using \fBgdb\fR but some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. +.IP \fB--port\fR\ \fIport\fR +Start the \fBgdb\fR server on the given port. If this option is not +specified, a randomly chosen port will be used. If \fB--no-start\fR is +specified, the port used will be printed on startup. .IP \fB--with-xterm\fR This will run \fBgdb\fR in its own xterm instead of using the current Unix console for textual display.

1 0