June 2021 - Wine-devel - list.winehq.org

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 2/3] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 89 ++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 9 deletions(-)

2 3

[PATCH 1/3] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/d3dx10_43/texture.c | 233 ++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 15 deletions(-)

2 3

[programs/robocopy.exe] How to do unit test correctly?
by Weiwen Chen 26 Jun '21

26 Jun '21

Hi everyone: I'm Weiwen Chen from Fudan University and I'm working on adding `robocopy.exe` into wine. I stage my work on my github fork <https://github.com/ofey404/wine/tree/robocopy>. This program accepts complex command line arguments, so I'm trying to implement my own `getopt` function which accepts dos-style flags(beginning with slash, like `/x`). The dummy code is under programs/robocopy <https://github.com/ofey404/wine/tree/robocopy/programs/robocopy> directory. And I want to add some unittest of `getopt_long()`, in robocopy/tests/getopt.c <https://github.com/ofey404/wine/blob/fe4a71850b023eefadab5ce357ce4671c1fffc…>. I try to import my source code of `getopt.c` relatively into unit test file, but I failed with error message like this: ../wine-git/programs/robocopy/tests/getopt.c:20: error: #include directive with relative path not allowed How can I include my source file correctly into the test? Maybe I should configure something in the `configure` script, but I don't know how to do it. I've read some of the builtin programs, but they seldom have a separate `test/` directory, and I don't find examples of unit tests. Wish you all the best Weiwen Chen

3 4

[PATCH] Allow 16-bit executables loaded from build directory.
by Bernhard Übelacker 26 Jun '21

26 Jun '21

https://bugs.winehq.org/show_bug.cgi?id=51214 ---- And kind of related to commits: bb065801a69 and a0425b9610a. These are the events that seem to lead to the failure: - Loading of module rundll.exe16 fails - Therefore hPrevInstance is zero, which is put into context.Esi - Somehow this seem to lead to the segfault. Unfortunately the last instructions are not shown properly. 2918 WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); 1: x/i $pc => 0x7bc30b49 <load_dll+217>: test $0x4,%al (rr) bt #0 load_dll (load_path=<optimized out>, libname=<optimized out>, default_ext=<optimized out>, flags=<error reading variable: Could not find the frame base for "load_dll".>, pwm=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2918 #1 0x7bc328c3 in LdrLoadDll(a)16 (path_name=<error reading variable: Could not find the frame base for "LdrLoadDll(a)16".>, flags=<optimized out>, libname=<optimized out>, hModule=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2966 #2 0x7b026d63 in load_library (libname=0x21fa78, flags=0) at .../wine-git/dlls/kernelbase/loader.c:168 #3 0x7b027bd9 in LoadLibraryExW(a)12 (name=0x7ffc2c00, file=0x0, flags=0) at .../wine-git/dlls/kernelbase/loader.c:517 #4 0x7b027d35 in LoadLibraryA(a)4 (name=0x21fb54 "rundll.exe16") at .../wine-git/dlls/kernelbase/loader.c:499 #5 0x664275ca in MODULE_LoadModule16 (libname=0x2a267b "C:\\windows\\rundll.exe", implicit=0, lib_only=0) at .../wine-git/dlls/krnl386.exe16/ne_module.c:959 #6 0x664282fe in LoadModule16(a)8 (name=0x2a267b "C:\\windows\\rundll.exe", paramBlock=0x21fe92) at .../wine-git/dlls/krnl386.exe16/ne_module.c:1130 #7 0x7eba1c1c in main (argc=4, argv=0x2a2590) at .../wine-git/programs/winevdm/winevdm.c:556 ... (rr) step 1176 hPrevInstance = NE_GetInstance( pModule ); ... 0x66429023 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1233 1233 context.Esi = pTask->hPrevInstance; ... (rr) bt #0 0x6640395f in wine_call_to_16_regs(a)12 () #1 0x6643f0e5 in K32WOWCallback16Ex(a)20 (vpfn16=0, dwFlags=2, cbArgs=4, pArgs=0x0, pdwRetCode=0x13cfc14) at .../wine-git/dlls/krnl386.exe16/wowthunk.c:439 #2 0x66429060 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1240 #3 0x66432e53 in task_start (p=0x26fc58) at .../wine-git/dlls/krnl386.exe16/task.c:475 #4 0x7b62e250 in WriteTapemark(a)16 () #5 0x7bc555a7 in call_thread_func_wrapper () #6 0x7bc55c60 in call_thread_func (entry=0x66432df0 <task_start>, arg=0x26fc58) at .../wine-git/dlls/ntdll/thread.c:225 ... (rr) stepi 0x6640398e in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x6640398e <wine_call_to_16_regs(a)12+178>: mov 0xa0(%edx),%esi (rr) x/1xw $edx + 0xa0 0x13cfcb4: 0x00000000 (rr) stepi 0x66403994 in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x66403994 <wine_call_to_16_regs(a)12+184>: mov 0x9c(%edx),%edi (rr) 0x6640399a in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x6640399a <wine_call_to_16_regs(a)12+190>: mov 0xb0(%edx),%eax (rr) 0x664039a0 in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x664039a0 <wine_call_to_16_regs(a)12+196>: mov 0xa4(%edx),%ebx (rr) 0x664039a6 in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x664039a6 <wine_call_to_16_regs(a)12+202>: mov 0xac(%edx),%ecx (rr) 0x664039ac in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x664039ac <wine_call_to_16_regs(a)12+208>: mov 0xa8(%edx),%edx (rr) 0x664039b2 in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x664039b2 <wine_call_to_16_regs(a)12+214>: popw %ds (rr) 0x664039b4 in wine_call_to_16_regs(a)12 () 1: x/i $pc => 0x664039b4 <wine_call_to_16_regs(a)12+216>: lretw (rr) 0x00000020 in ?? () 1: x/i $pc => 0x20: <error: Cannot access memory at address 0x20> (rr) 0x00000022 in ?? () 1: x/i $pc => 0x22: <error: Cannot access memory at address 0x22> (rr) 0x00000027 in ?? () 1: x/i $pc => 0x27: <error: Cannot access memory at address 0x27> (rr) 0x00000000 in ?? () 1: x/i $pc => 0x0: <error: Cannot access memory at address 0x0> (rr) 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> (rr) Thread 8 received signal SIGSEGV, Segmentation fault. 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..da539258eb3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } -- 2.30.2

1 1

[PATCH v2] Distinguish the two functions of family_matches and face_matches.
by Jiangyi Chen 26 Jun '21

26 Jun '21

2 1

[PATCH v10 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 25 Jun '21

25 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..d226057c69e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -120,6 +120,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -521,8 +526,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -665,6 +670,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2651,7 +2660,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2671,6 +2680,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2680,6 +2691,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2739,7 +2752,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2758,7 +2771,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2857,7 +2870,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2866,7 +2879,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2874,7 +2887,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2882,7 +2895,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2939,7 +2952,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3433,7 +3446,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

2 5

[PATCH] ole32: Request the needed memory blocks at once.
by Haoyang Chen 25 Jun '21

25 Jun '21

When requesting a large block of memory, newNumBlocks can be very large and time-consuming. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 980b6c8d9f6..1bc8455cc6b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4144,7 +4144,7 @@ static void StorageImpl_SetNextBlockInChain( * */ static ULONG StorageImpl_GetNextFreeBigBlock( - StorageImpl* This) + StorageImpl* This, ULONG neededAddNumBlocks) { ULONG depotBlockIndexPos; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; @@ -4269,7 +4269,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * make sure that the block physically exists before using it */ - neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize; + neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize * neededAddNumBlocks; ILockBytes_Stat(This->lockBytes, &statstg, STATFLAG_NONAME); @@ -7403,7 +7403,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, */ if (blockIndex == BLOCK_END_OF_CHAIN) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, 1); StorageImpl_SetNextBlockInChain(This->parentStorage, blockIndex, BLOCK_END_OF_CHAIN); @@ -7472,7 +7472,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, { while (oldNumBlocks < newNumBlocks) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, newNumBlocks - oldNumBlocks); StorageImpl_SetNextBlockInChain( This->parentStorage, -- 2.20.1

2 1