July 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : kernel32: Support FileBasicInfo case in SetFileInformationByHandle().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: fdf8d7176f59043999b34ff4facdcbee14a7d6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf8d7176f59043999b34ff4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 31 12:19:28 2019 +0300 kernel32: Support FileBasicInfo case in SetFileInformationByHandle(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 4 +++- dlls/kernel32/tests/file.c | 23 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 30c8dbd..bd10260 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1095,7 +1095,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c switch (class) { - case FileBasicInfo: case FileNameInfo: case FileRenameInfo: case FileAllocationInfo: @@ -1114,6 +1113,9 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileBasicInfo: + status = NtSetInformationFile( file, &io, info, size, FileBasicInformation ); + break; case FileDispositionInfo: status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b22ae19..63a67ca 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4973,8 +4973,10 @@ static void test_SetFileInformationByHandle(void) FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; DECLSPEC_ALIGN(8) FILE_IO_PRIORITY_HINT_INFO hintinfo; + FILE_BASIC_INFO basicinfo = { {{0}} }; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; + LARGE_INTEGER atime; HANDLE file; BOOL ret; @@ -4991,7 +4993,7 @@ static void test_SetFileInformationByHandle(void) ret = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret, "GetTempFileNameA failed, got error %u.\n", GetLastError()); - file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + file = CreateFileA(tempFileName, GENERIC_READ | FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); ok(file != INVALID_HANDLE_VALUE, "failed to open the temp file, error %u.\n", GetLastError()); @@ -5044,6 +5046,25 @@ static void test_SetFileInformationByHandle(void) todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, 0); +todo_wine + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + atime = basicinfo.LastAccessTime; + + basicinfo.LastAccessTime.QuadPart++; + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + dispinfo.DeleteFile = TRUE; ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError());

1 0

Conor McCarthy : wined3d: Track windows styles per-swapchain.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 3fc96a5d3586c756bda50fe6caa023cb44e0300c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc96a5d3586c756bda50fe6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 29 16:18:54 2019 +0430 wined3d: Track windows styles per-swapchain. Instead of per-device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 134 ++++------------------------------------- dlls/wined3d/swapchain.c | 122 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 21 ++++--- 3 files changed, 141 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fc96a5d3586c756bda5…

1 0

Henri Verbeet : wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: bed677e34316595c6ade72c6871c396a455c26a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed677e34316595c6ade72c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 16:18:55 2019 +0430 wined3d: Move the "desc" field from struct wined3d_swapchain to struct wined3d_swapchain_state. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +- dlls/wined3d/device.c | 67 ++++++++++--------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/swapchain.c | 147 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 10 +-- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 123 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bed677e34316595c6ade…

1 0

Zebediah Figura : d3dcompiler: Parse type name strings.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 72b74d7cdc31b8ac0e29faba82f1e18ab07db3f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b74d7cdc31b8ac0e29faba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 29 12:44:17 2019 -0500 d3dcompiler: Parse type name strings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 15 +++++++++++++++ dlls/d3dcompiler_43/tests/reflection.c | 12 +++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e492011..b163fca 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -51,6 +51,7 @@ struct d3dcompiler_shader_reflection_type D3D11_SHADER_TYPE_DESC desc; struct d3dcompiler_shader_reflection_type_member *members; + char *name; }; struct d3dcompiler_shader_reflection_type_member @@ -222,6 +223,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent HeapFree(GetProcessHeap(), 0, t->members); } + heap_free(t->name); HeapFree(GetProcessHeap(), 0, t); } @@ -1244,6 +1246,19 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type } } + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) + { + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &type->name)) + { + ERR("Failed to copy name.\n"); + heap_free(members); + return E_OUTOFMEMORY; + } + desc->Name = type->name; + TRACE("Type name: %s.\n", debugstr_a(type->name)); + } + type->members = members; return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 2c1c902..1b9d2d4 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1207,11 +1207,11 @@ static const struct { static const D3D11_SHADER_TYPE_DESC test_reflection_constant_buffer_type_result[] = { - {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0}, - {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0}, + {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0, "iTest"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0, "int"}, + {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0, "s"}, }; static void test_reflection_constant_buffer(void) @@ -1459,6 +1459,8 @@ static void test_reflection_constant_buffer(void) i, tdesc.Elements, ptdesc->Elements); ok(tdesc.Offset == ptdesc->Offset, "GetDesc(%u) Offset failed, got %u, expected %u\n", i, tdesc.Offset, ptdesc->Offset); + ok(!strcmp(tdesc.Name, ptdesc->Name), "GetDesc(%u) Name failed, got %s, expected %s\n", + i, tdesc.Name, ptdesc->Name); } /* types */

1 0

Gabriel Ivăncescu : ntdll: Define AT_NO_AUTOMOUNT if needed.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: ec4752cef24d3574ef275e992bace488fb1b0e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4752cef24d3574ef275e99… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jul 9 14:19:01 2019 +0300 ntdll: Define AT_NO_AUTOMOUNT if needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47445 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b50d41b..e3f805a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -142,6 +142,10 @@ typedef struct # define O_DIRECTORY 0200000 /* must be directory */ #endif +#ifndef AT_NO_AUTOMOUNT +#define AT_NO_AUTOMOUNT 0x800 +#endif + #endif /* linux */ #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')

1 0

Serge Gautherie : kernel32/tests: Test QueryFullProcessImageNameW() flags.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 7e0acf14ccf0a430cefaaa9533098b4507ba6872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0acf14ccf0a430cefaaa95… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Jul 9 14:01:18 2019 +0200 kernel32/tests: Test QueryFullProcessImageNameW() flags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c593ebe..cba0a3f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1978,6 +1978,7 @@ static void test_QueryFullProcessImageNameW(void) WCHAR deviceW[] = {'\\','D', 'e','v','i','c','e',0}; WCHAR buf[1024]; DWORD size, len; + DWORD flags; if (!pQueryFullProcessImageNameW) { @@ -2031,6 +2032,33 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); expect_eq_ws_i(module_name, buf); /* buffer not changed */ + /* Invalid flags - a few arbitrary values only */ + for (flags = 2; flags <= 15; ++flags) + { + size = ARRAY_SIZE(buf); + SetLastError(0xdeadbeef); + *(DWORD*)buf = 0x13579acf; + todo_wine + { + expect_eq_d(FALSE, pQueryFullProcessImageNameW(hSelf, flags, buf, &size)); + expect_eq_d(ARRAY_SIZE(buf), size); /* size not changed */ + expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); + expect_eq_d(0x13579acf, *(DWORD*)buf); /* buffer not changed */ + } + } + for (flags = 16; flags != 0; flags <<= 1) + { + size = ARRAY_SIZE(buf); + SetLastError(0xdeadbeef); + *(DWORD*)buf = 0x13579acf; + todo_wine + { + expect_eq_d(FALSE, pQueryFullProcessImageNameW(hSelf, flags, buf, &size)); + expect_eq_d(ARRAY_SIZE(buf), size); /* size not changed */ + expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); + expect_eq_d(0x13579acf, *(DWORD*)buf); /* buffer not changed */ + } + } /* native path */ size = ARRAY_SIZE(buf);

1 0

Zebediah Figura : mscorwks: New DLL.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 12d5b6899b4c03dfb597f0e1ddc6a14c07dca91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d5b6899b4c03dfb597f0e1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:43 2019 -0500 mscorwks: New DLL. Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/mscorwks/Makefile.in | 1 + dlls/mscorwks/mscorwks.spec | 110 ++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + tools/make_specfiles | 4 ++ 6 files changed, 120 insertions(+) diff --git a/configure b/configure index f1de2c4..177c834 100755 --- a/configure +++ b/configure @@ -1404,6 +1404,7 @@ enable_msasn1 enable_mscat32 enable_mscms enable_mscoree +enable_mscorwks enable_msctf enable_msctfp enable_msdaps @@ -20405,6 +20406,7 @@ wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests wine_fn_config_makefile dlls/mscoree enable_mscoree wine_fn_config_makefile dlls/mscoree/tests enable_tests +wine_fn_config_makefile dlls/mscorwks enable_mscorwks wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp diff --git a/configure.ac b/configure.ac index a7c45ac..a2cd2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -3391,6 +3391,7 @@ WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) WINE_CONFIG_MAKEFILE(dlls/mscoree) WINE_CONFIG_MAKEFILE(dlls/mscoree/tests) +WINE_CONFIG_MAKEFILE(dlls/mscorwks) WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in new file mode 100644 index 0000000..4527266 --- /dev/null +++ b/dlls/mscorwks/Makefile.in @@ -0,0 +1 @@ +MODULE = mscorwks.dll diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec new file mode 100644 index 0000000..617cde3 --- /dev/null +++ b/dlls/mscorwks/mscorwks.spec @@ -0,0 +1,110 @@ +@ stdcall LoadStringRC(long ptr long long) mscoree.LoadStringRC +@ stub ReOpenMetaDataWithMemory +@ stub CorDllMainForThunk +@ stub CreateActContextInternal +@ stub CreateCMSFromXmlInternal +@ stub GetAddrOfContractShutoffFlag +@ stub GetCLRFunction +@ stub GetUserStateManagerInternal +@ stub GetUserStoreInternal +@ stub ParseManifestInternal +@ stub _AxlGetIssuerPublicKeyHash +@ stub _AxlPublicKeyBlobToPublicKeyToken +@ stub _AxlRSAKeyValueToPublicKeyToken +@ stub CertCreateAuthenticodeLicense +@ stub CertFreeAuthenticodeSignerInfo +@ stub CertFreeAuthenticodeTimestamperInfo +@ stub CertTimestampAuthenticodeLicense +@ stub CertVerifyAuthenticodeLicense +@ stub ClearDownloadCache +@ stdcall ClrCreateManagedInstance(wstr ptr ptr) mscoree.ClrCreateManagedInstance +@ stdcall CoEEShutDownCOM() mscoree.CoEEShutDownCOM +@ stdcall CoInitializeCor(long) mscoree.CoInitializeCor +@ stub CoInitializeEE +@ stub CoUninitializeCor +@ stub CoUninitializeEE +@ stub CompareAssemblyIdentity +@ stub CopyPDBs +@ stdcall CorExitProcess(long) mscoree.CorExitProcess +@ stub CorLaunchApplication +@ stub CorMarkThreadInThreadPool +@ stub CreateActContext +@ stub CreateApplicationContext +@ stub CreateAssemblyCache +@ stub CreateAssemblyEnum +@ stub CreateAssemblyNameObject +@ stub CreateCMSFromXml +@ stub CreateHistoryReader +@ stub CreateInstallReferenceEnum +@ stub DeleteShadowCache +@ stub DllCanUnloadNowInternal +@ stub DllGetClassObjectInternal +@ stub DllRegisterServerInternal +@ stub DllUnregisterServerInternal +@ stub EEDllRegisterServer +@ stub EEDllUnregisterServer +@ stub GetAppIdAuthority +@ stub GetAssemblyIdentityFromFile +@ stdcall GetAssemblyMDImport(wstr ptr ptr) mscoree.GetAssemblyMDImport +@ stub GetCLRIdentityManager +@ stub GetCachePath +@ stub GetHashFromAssemblyFile +@ stub GetHashFromAssemblyFileW +@ stub GetHashFromBlob +@ stub GetHashFromFile +@ stub GetHashFromFileW +@ stub GetHashFromHandle +@ stub GetHistoryFileDirectory +@ stub GetIdentityAuthority +@ stub GetMetaDataInternalInterface +@ stub GetMetaDataInternalInterfaceFromPublic +@ stub GetMetaDataPublicInterfaceFromInternal +@ stub GetPermissionRequests +@ stub GetPrivateContextsPerfCounters +@ stub GetUserStateManager +@ stub GetUserStore +@ stub IEE +@ stub InitializeFusion +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LegacyNGenCompile +@ stub LegacyNGenCreateZapper +@ stub LegacyNGenFreeZapper +@ stub LegacyNGenTryEnumerateFusionCache +@ stdcall LoadStringRCEx(long long ptr long long ptr) mscoree.LoadStringRCEx +@ stub LogHelp_LogAssert +@ stub LogHelp_NoGuiOnAssert +@ stub LogHelp_TerminateOnAssert +@ stub LookupHistoryAssembly +@ stub MetaDataGetDispenser +@ stub NGenCreateNGenWorker +@ stub NukeDownloadedCache +@ stub ParseManifest +@ stub PostErrorVA +@ stub PreBindAssembly +@ stub PreBindAssemblyEx +@ stub ReOpenMetaDataWithMemoryEx +@ stub StrongNameCompareAssemblies +@ stub StrongNameErrorInfo +@ stub StrongNameFreeBuffer +@ stub StrongNameGetBlob +@ stub StrongNameGetBlobFromImage +@ stub StrongNameGetPublicKey +@ stub StrongNameHashSize +@ stub StrongNameKeyDelete +@ stub StrongNameKeyGen +@ stub StrongNameKeyGenEx +@ stub StrongNameKeyInstall +@ stub StrongNameSignatureGeneration +@ stub StrongNameSignatureGenerationEx +@ stub StrongNameSignatureSize +@ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification +@ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx +@ stub StrongNameSignatureVerificationFromImage +@ stub StrongNameTokenFromAssembly +@ stub StrongNameTokenFromAssemblyEx +@ stub StrongNameTokenFromPublicKey +@ stub TranslateSecurityAttributes +@ stdcall _CorDllMain(long long ptr) mscoree._CorDllMain +@ stdcall _CorExeMain2(ptr long ptr ptr ptr) mscoree._CorExeMain2 +@ stdcall _CorExeMain() mscoree._CorExeMain diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c3d3b77..2ac524a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- @@ -2603,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- diff --git a/tools/make_specfiles b/tools/make_specfiles index 64c25d1..5c30ce5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -483,6 +483,10 @@ my @dll_groups = "ntoskrnl.exe", "hal", ], + [ + "mscoree", + "mscorwks", + ], ); my $update_flags = 0;

1 0

Zebediah Figura : include: Add strongname.h.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 274829691818f44cf115b21200ddd0cc34445243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274829691818f44cf115b212… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:44 2019 -0500 include: Add strongname.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/strongname.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6913587..7ca25e2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -612,6 +612,7 @@ SOURCES = \ sti.h \ storage.h \ strmif.idl \ + strongname.h \ strsafe.h \ structuredquerycondition.idl \ svrapi.h \ diff --git a/include/strongname.h b/include/strongname.h new file mode 100644 index 0000000..f05861a --- /dev/null +++ b/include/strongname.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __STRONG_NAME_H +#define __STRONG_NAME_H + +#include <windows.h> +#include <wincrypt.h> +#include <ole2.h> +#include <corerror.h> + +#define SN_INFLAG_FORCE_VER 0x00000001 +#define SN_INFLAG_INSTALL 0x00000002 +#define SN_INFLAG_ADMIN_ACCESS 0x00000004 +#define SN_INFLAG_USER_ACCESS 0x00000008 +#define SN_INFLAG_ALL_ACCESS 0x00000010 +#define SN_INFLAG_RUNTIME 0x80000000 + +#define SN_OUTFLAG_WAS_VERIFIED 0x00000001 + +BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags); +BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified); + +#endif

1 0

Zebediah Figura : mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 0ddeba7002a21a351fe630be42e6632e0484bfa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ddeba7002a21a351fe630be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:45 2019 -0500 mscoree: Fix the signature for StrongNameSignatureVerification[Ex](). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 15bbc23..6afeafe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "ocidl.h" #include "shellapi.h" +#include "strongname.h" #include "initguid.h" #include "msxml2.h" @@ -548,13 +549,13 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) return ret; } -BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) +BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD *pOutFlags) { FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); return FALSE; } -BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerification, BOOL* pVerified) +BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); return FALSE;

1 0

Zebediah Figura : mscoree: Fake success from StrongNameSignatureVerificationEx().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 074dd6959f2cc1f00531132537fa3412388c27bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=074dd6959f2cc1f005311325… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 11 14:23:46 2019 -0500 mscoree: Fake success from StrongNameSignatureVerificationEx(). Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6afeafe..af0321a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -558,7 +558,8 @@ BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); - return FALSE; + *pVerified = TRUE; + return TRUE; } HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv)

1 0