April 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Rename vulkan surface creation/destroy driver callbacks.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 334a100a8e0d5ea54e4290f64a2e8f55426678e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/334a100a8e0d5ea54e4290f64a2e8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 24 11:10:22 2024 +0200 win32u: Rename vulkan surface creation/destroy driver callbacks. --- dlls/win32u/vulkan.c | 13 ++++++------- dlls/winemac.drv/vulkan.c | 22 +++++++--------------- dlls/winewayland.drv/vulkan.c | 24 ++++++++---------------- dlls/winex11.drv/vulkan.c | 21 ++++++--------------- include/wine/vulkan_driver.h | 6 +++--- 5 files changed, 30 insertions(+), 56 deletions(-)

1 0

Rémi Bernon : win32u: Pass HWND directly to vulkan surface creation driver callback.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 34d288a9392ba8a050ae049a0b5ebfd789189e2b URL: https://gitlab.winehq.org/wine/wine/-/commit/34d288a9392ba8a050ae049a0b5ebf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 24 11:10:56 2024 +0200 win32u: Pass HWND directly to vulkan surface creation driver callback. And to destroy, it'll be useful later. --- dlls/win32u/vulkan.c | 8 ++++---- dlls/winemac.drv/vulkan.c | 17 ++++++++--------- dlls/winewayland.drv/vulkan.c | 16 +++++++--------- dlls/winex11.drv/vulkan.c | 16 ++++++++-------- include/wine/vulkan_driver.h | 6 +++--- 5 files changed, 30 insertions(+), 33 deletions(-)

1 0

Rémi Bernon : win32u: Move host surface destruction out of the drivers.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 8653ed03de3e468f7349723a697da543fd645dc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8653ed03de3e468f7349723a697da5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 12 09:19:53 2024 +0200 win32u: Move host surface destruction out of the drivers. --- dlls/win32u/vulkan.c | 9 ++++++--- dlls/winemac.drv/vulkan.c | 14 +++++--------- dlls/winewayland.drv/vulkan.c | 7 ++----- dlls/winex11.drv/vulkan.c | 7 ++----- include/wine/vulkan_driver.h | 4 ++-- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index d2323265db9..bd039b934ce 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -44,6 +44,7 @@ static void *vulkan_handle; static const struct vulkan_driver_funcs *driver_funcs; static struct vulkan_funcs vulkan_funcs; +static void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*p_vkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static void *(*p_vkGetDeviceProcAddr)(VkDevice, const char *); static void *(*p_vkGetInstanceProcAddr)(VkInstance, const char *); @@ -94,7 +95,8 @@ static void win32u_vkDestroySurfaceKHR( VkInstance instance, VkSurfaceKHR handle TRACE( "instance %p, handle 0x%s, allocator %p\n", instance, wine_dbgstr_longlong(handle), allocator ); if (allocator) FIXME( "Support for allocation callbacks not implemented yet\n" ); - driver_funcs->p_vulkan_surface_destroy( surface->hwnd, instance, surface->driver_surface ); + p_vkDestroySurfaceKHR( instance, surface->host_surface, NULL /* allocator */ ); + driver_funcs->p_vulkan_surface_destroy( surface->hwnd, surface->driver_surface ); free( surface ); } @@ -168,7 +170,7 @@ static VkResult nulldrv_vulkan_surface_create( HWND hwnd, VkInstance instance, V return VK_ERROR_INCOMPATIBLE_DRIVER; } -static void nulldrv_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) +static void nulldrv_vulkan_surface_destroy( HWND hwnd, VkSurfaceKHR surface ) { } @@ -237,9 +239,10 @@ static void vulkan_init(void) return; \ } + LOAD_FUNCPTR( vkDestroySurfaceKHR ); + LOAD_FUNCPTR( vkQueuePresentKHR ); LOAD_FUNCPTR( vkGetDeviceProcAddr ); LOAD_FUNCPTR( vkGetInstanceProcAddr ); - LOAD_FUNCPTR( vkQueuePresentKHR ); #undef LOAD_FUNCPTR } diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 465389fff46..42e95d91cce 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -77,7 +77,6 @@ typedef struct VkMetalSurfaceCreateInfoEXT static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); static VkResult (*pvkCreateMetalSurfaceEXT)(VkInstance, const VkMetalSurfaceCreateInfoEXT*, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs; @@ -87,10 +86,8 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface *surface) +static void wine_vk_surface_destroy(struct wine_vk_surface *surface) { - pvkDestroySurfaceKHR(instance, surface->host_surface, NULL /* allocator */); - if (surface->view) macdrv_view_release_metal_view(surface->view); @@ -173,18 +170,18 @@ static VkResult macdrv_vulkan_surface_create(HWND hwnd, VkInstance instance, VkS return VK_SUCCESS; err: - wine_vk_surface_destroy(instance, mac_surface); + wine_vk_surface_destroy(mac_surface); release_win_data(data); return res; } -static void macdrv_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) +static void macdrv_vulkan_surface_destroy(HWND hwnd, VkSurfaceKHR surface) { struct wine_vk_surface *mac_surface = surface_from_handle(surface); - TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); + TRACE("%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface)); - wine_vk_surface_destroy(instance, mac_surface); + wine_vk_surface_destroy(mac_surface); } static void macdrv_vulkan_surface_presented(HWND hwnd, VkResult result) @@ -235,7 +232,6 @@ UINT macdrv_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_dr #define LOAD_FUNCPTR(f) if ((p##f = dlsym(vulkan_handle, #f)) == NULL) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) LOAD_FUNCPTR(vkCreateMetalSurfaceEXT) - LOAD_FUNCPTR(vkDestroySurfaceKHR) #undef LOAD_FUNCPTR *driver_funcs = &macdrv_vulkan_driver_funcs; diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 87d2be0042c..403da808fb5 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -54,7 +54,6 @@ typedef struct VkWaylandSurfaceCreateInfoKHR } VkWaylandSurfaceCreateInfoKHR; static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); static const struct vulkan_driver_funcs wayland_vulkan_driver_funcs; @@ -156,13 +155,12 @@ err: return res; } -static void wayland_vulkan_surface_destroy(HWND hwnd, VkInstance instance, VkSurfaceKHR surface) +static void wayland_vulkan_surface_destroy(HWND hwnd, VkSurfaceKHR surface) { struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); - TRACE("%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface)); + TRACE("%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface)); - pvkDestroySurfaceKHR(instance, wine_vk_surface->host_surface, NULL /* allocator */); wine_vk_surface_destroy(wine_vk_surface); } @@ -230,7 +228,6 @@ UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_d #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); - LOAD_FUNCPTR(vkDestroySurfaceKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); #undef LOAD_FUNCPTR diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 2c457f1282f..a49afd32a2c 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -74,7 +74,6 @@ typedef struct VkXlibSurfaceCreateInfoKHR } VkXlibSurfaceCreateInfoKHR; static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); -static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID); static const struct vulkan_driver_funcs x11drv_vulkan_driver_funcs; @@ -190,13 +189,12 @@ static VkResult X11DRV_vulkan_surface_create( HWND hwnd, VkInstance instance, Vk return VK_SUCCESS; } -static void X11DRV_vulkan_surface_destroy( HWND hwnd, VkInstance instance, VkSurfaceKHR surface ) +static void X11DRV_vulkan_surface_destroy( HWND hwnd, VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); - TRACE( "%p %p 0x%s\n", hwnd, instance, wine_dbgstr_longlong(surface) ); + TRACE( "%p 0x%s\n", hwnd, wine_dbgstr_longlong(surface) ); - pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); } @@ -250,7 +248,6 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, const struct vulkan_d #define LOAD_FUNCPTR( f ) if (!(p##f = dlsym( vulkan_handle, #f ))) return STATUS_PROCEDURE_NOT_FOUND; LOAD_FUNCPTR( vkCreateXlibSurfaceKHR ); - LOAD_FUNCPTR( vkDestroySurfaceKHR ); LOAD_FUNCPTR( vkGetPhysicalDeviceXlibPresentationSupportKHR ); #undef LOAD_FUNCPTR diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 32cd2a771d5..20931374ce2 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -21,7 +21,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 31 +#define WINE_VULKAN_DRIVER_VERSION 32 struct vulkan_funcs { @@ -45,7 +45,7 @@ struct vulkan_funcs struct vulkan_driver_funcs { VkResult (*p_vulkan_surface_create)(HWND, VkInstance, VkSurfaceKHR *); - void (*p_vulkan_surface_destroy)(HWND, VkInstance, VkSurfaceKHR); + void (*p_vulkan_surface_destroy)(HWND, VkSurfaceKHR); void (*p_vulkan_surface_presented)(HWND, VkResult); VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t);

1 0

Zebediah Figura : kernelbase: Do not start the debugger if SEM_NOGPFAULTERRORBOX is set.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 61b88ebd500ffcf10a1993c13e5d9de33b094cd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/61b88ebd500ffcf10a1993c13e5d9d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 30 21:30:53 2023 +0200 kernelbase: Do not start the debugger if SEM_NOGPFAULTERRORBOX is set. Motor City Online apparently checks for a debugger by setting this flag and then intentionally causing a page fault. If no debugger is present on Windows, the subprocess simply dies without spawning any crash dialog. This patch emulates that behaviour, suppressing a (harmless) crash dialog from winedbg. This may result in legitimate failures no longer triggering a winedbg crash dialog, if other programs happen to use SEM_NOGPFAULTERRORBOX, but the winedbg crash dialog cannot be relied upon anyway. --- dlls/kernelbase/debug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index b7df4a7c766..72cb2feef8d 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -761,9 +761,8 @@ LONG WINAPI UnhandledExceptionFilter( EXCEPTION_POINTERS *epointers ) if (ret != EXCEPTION_CONTINUE_SEARCH) return ret; } - /* FIXME: Should check the current error mode */ - - if (!start_debugger_atomic( epointers ) || !NtCurrentTeb()->Peb->BeingDebugged) + if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) || + !start_debugger_atomic( epointers ) || !NtCurrentTeb()->Peb->BeingDebugged) return EXCEPTION_EXECUTE_HANDLER; } return EXCEPTION_CONTINUE_SEARCH;

1 0

Hans Leidekker : wintrust: Add support for the PE image hash in CryptCATAdminCalcHashFromFileHandle().
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: ab071858a413516b7dbaebc23662b4024e6744c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab071858a413516b7dbaebc23662b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 13:44:51 2024 +0200 wintrust: Add support for the PE image hash in CryptCATAdminCalcHashFromFileHandle(). --- dlls/wintrust/crypt.c | 85 +++++++++++++++++++++++++++++++++++++++++-- dlls/wintrust/tests/softpub.c | 34 +++++++++++++++++ 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 7321b84eea4..b2c5e31e87f 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -214,11 +214,84 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, return ci; } +static BOOL pe_image_hash( HANDLE file, HCRYPTHASH hash ) +{ + UINT32 size, offset, file_size, sig_pos; + HANDLE mapping; + BYTE *view; + IMAGE_NT_HEADERS *nt; + BOOL ret = FALSE; + + if ((file_size = GetFileSize( file, NULL )) == INVALID_FILE_SIZE) return FALSE; + + if ((mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL )) == INVALID_HANDLE_VALUE) + return FALSE; + + if (!(view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 )) || !(nt = ImageNtHeader( view ))) goto done; + + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_NT_HEADERS64 *nt64 = (const IMAGE_NT_HEADERS64 *)nt; + + /* offset from start of file to checksum */ + offset = (BYTE *)&nt64->OptionalHeader.CheckSum - view; + + /* area between checksum and security directory entry */ + size = FIELD_OFFSET( IMAGE_OPTIONAL_HEADER64, DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] ) - + FIELD_OFFSET( IMAGE_OPTIONAL_HEADER64, Subsystem ); + + if (nt64->OptionalHeader.NumberOfRvaAndSizes < IMAGE_FILE_SECURITY_DIRECTORY + 1) goto done; + sig_pos = nt64->OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY].VirtualAddress; + } + else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + const IMAGE_NT_HEADERS32 *nt32 = (const IMAGE_NT_HEADERS32 *)nt; + + /* offset from start of file to checksum */ + offset = (BYTE *)&nt32->OptionalHeader.CheckSum - view; + + /* area between checksum and security directory entry */ + size = FIELD_OFFSET( IMAGE_OPTIONAL_HEADER32, DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] ) - + FIELD_OFFSET( IMAGE_OPTIONAL_HEADER32, Subsystem ); + + if (nt32->OptionalHeader.NumberOfRvaAndSizes < IMAGE_FILE_SECURITY_DIRECTORY + 1) goto done; + sig_pos = nt32->OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY].VirtualAddress; + } + else goto done; + + if (!CryptHashData( hash, view, offset, 0 )) goto done; + offset += sizeof(DWORD); /* skip checksum */ + if (!CryptHashData( hash, view + offset, size, 0 )) goto done; + + offset += size + sizeof(IMAGE_DATA_DIRECTORY); /* skip security entry */ + if (offset > file_size) goto done; + if (sig_pos) + { + if (sig_pos < offset) goto done; + if (sig_pos > file_size) goto done; + size = sig_pos - offset; /* exclude signature */ + } + else size = file_size - offset; + + if (!CryptHashData( hash, view + offset, size, 0 )) goto done; + ret = TRUE; + + if (!sig_pos && (size = file_size % 8)) + { + static const BYTE pad[7]; + ret = CryptHashData( hash, pad, 8 - size, 0 ); + } + +done: + UnmapViewOfFile( view ); + CloseHandle( mapping ); + return ret; +} + /*********************************************************************** * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) */ -BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, - BYTE* pbHash, DWORD dwFlags ) +BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD *pcbHash, BYTE *pbHash, DWORD dwFlags) { BOOL ret = FALSE; @@ -262,9 +335,13 @@ BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, CryptReleaseContext(prov, 0); return FALSE; } - while ((ret = ReadFile(hFile, buffer, 4096, &bytes_read, NULL)) && bytes_read) + + if (!(ret = pe_image_hash(hFile, hash))) { - CryptHashData(hash, buffer, bytes_read, 0); + while ((ret = ReadFile(hFile, buffer, 4096, &bytes_read, NULL)) && bytes_read) + { + CryptHashData(hash, buffer, bytes_read, 0); + } } if (ret) ret = CryptGetHashParam(hash, HP_HASHVAL, pbHash, pcbHash, 0); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 46861766621..9654c296a78 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1892,6 +1892,39 @@ static void test_multiple_signatures(void) DeleteFileW(pathW); } +static BOOL (WINAPI *pCryptCATAdminCalcHashFromFileHandle)(HANDLE,DWORD*,BYTE*,DWORD); + +static void test_pe_image_hash(void) +{ + static const char expected[] = + {0x8a,0xd5,0x45,0x53,0x3d,0x67,0xdf,0x2f,0x78,0xe0,0x55,0x0a,0xe0,0xd9,0x7a,0x28,0x3e,0xbf,0x45,0x2b}; + WCHAR path[MAX_PATH]; + HANDLE file; + BYTE sha1[20]; + DWORD size, count; + HMODULE wintrust = GetModuleHandleA("wintrust.dll"); + BOOL ret; + + pCryptCATAdminCalcHashFromFileHandle = (void *)GetProcAddress(wintrust, "CryptCATAdminCalcHashFromFileHandle"); + if (!pCryptCATAdminCalcHashFromFileHandle) + { + win_skip("hash function missing\n"); + return; + } + + file = create_temp_file(path); + WriteFile(file, &bin, sizeof(bin), &count, NULL); + + size = sizeof(sha1); + memset(sha1, 0, sizeof(sha1)); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &size, sha1, 0); + ok(ret, "got %lu\n", GetLastError()); + ok(!memcmp(sha1, expected, sizeof(sha1)), "wrong hash\n"); + + CloseHandle(file); + DeleteFileW(path); +} + START_TEST(softpub) { InitFunctionPtrs(); @@ -1901,4 +1934,5 @@ START_TEST(softpub) test_wintrust_digest(); test_get_known_usages(); test_multiple_signatures(); + test_pe_image_hash(); }

1 0

Alexandre Julliard : rpcrt4: Use fully interpreted IDL stubs.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 8f7e877a5571213a7b08639b52d369417b4db815 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f7e877a5571213a7b08639b52d369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:09 2024 +0200 rpcrt4: Use fully interpreted IDL stubs. --- dlls/rpcrt4/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index f2f6d35b2a5..6ab5e231879 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32 -ndr_types_EXTRAIDLFLAGS = -Oicf +EXTRAIDLFLAGS = -Oicf SOURCES = \ cproxy.c \

1 0

Alexandre Julliard : rpcrt4/tests: Use fully interpreted IDL stubs.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 54cb9a2ab20d0190af4f69dd456d0bdceda6021b URL: https://gitlab.winehq.org/wine/wine/-/commit/54cb9a2ab20d0190af4f69dd456d0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:26 2024 +0200 rpcrt4/tests: Use fully interpreted IDL stubs. --- dlls/rpcrt4/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 0e888069783..a079ea0a19a 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,8 +1,8 @@ TESTDLL = rpcrt4.dll IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 -EXTRAIDLFLAGS = --prefix-server=s_ EXTRADEFS = -DPROXY_DELEGATION +EXTRAIDLFLAGS = -Oicf --prefix-server=s_ server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_ server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_

1 0

Alexandre Julliard : schedsvc: Use fully interpreted IDL stubs.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: f7f3f96a64efbe8e882323a7a979b81b913c483e URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f3f96a64efbe8e882323a7a979b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:18:29 2024 +0200 schedsvc: Use fully interpreted IDL stubs. --- dlls/schedsvc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 40dee0b48df..1aeb43574e9 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,6 +1,8 @@ MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 xmllite +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.c \ atsvc.idl \

1 0

Alexandre Julliard : schedsvc/tests: Use fully interpreted IDL stubs.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 5ac51de688f995a2b99dd41008d7045fd854b1df URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac51de688f995a2b99dd41008d704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:18:40 2024 +0200 schedsvc/tests: Use fully interpreted IDL stubs. --- dlls/schedsvc/tests/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index d78da177906..6ecfa8483ac 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,6 +1,8 @@ TESTDLL = schedsvc.dll IMPORTS = advapi32 rpcrt4 ole32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.idl \ atsvcapi.c \

1 0

Alexandre Julliard : sechost: Use fully interpreted IDL stubs.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 2c05f9d08537fa9c56bb58a48b2b66f4f67b5fb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c05f9d08537fa9c56bb58a48b2b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:43 2024 +0200 sechost: Use fully interpreted IDL stubs. --- dlls/sechost/Makefile.in | 2 ++ dlls/sechost/service.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index ec1eb100683..eeb20370e71 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = sechost IMPORTS = kernelbase DELAYIMPORTS = rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ plugplay.idl \ security.c \ diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 240e048a4a5..446031e4043 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -284,9 +284,8 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenSCManagerW( const WCHAR *machine, const W } __ENDTRY - if (!err) return handle; SetLastError( err ); - return NULL; + return handle; } /******************************************************************************

1 0