wine-devel September 2021

wine-devel@winehq.org

83 participants
748 discussions

[PATCH 2/5] clock: Add DPI system awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/clock/clock.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest index 4a9f38c4ff8..393459c383c 100644 --- a/programs/clock/clock.manifest +++ b/programs/clock/clock.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 1/5] control: Add DPI system awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Most builtin programs already achieved system DPI awareness. When scaling for DPI unaware applications are implemented and enabled. These programs will be consider as DPI unaware due to their lack of DPI awareness settings in their manifest. So add them now to avoid blurry application windows in the future. programs/control/control.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/control/control.manifest b/programs/control/control.manifest index 2834937e564..0b677f379b0 100644 --- a/programs/control/control.manifest +++ b/programs/control/control.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 0/7] DbgHelp: A bunch of fixes/improvements related to module management
by Eric Pouech 06 Sep '21

06 Sep '21

- Various corner case bug fixes when loading modules - Reporting machine information for modules - Improved management of module's name: + native (W10) stores & matches with module's name truncated to 64 characters + updated builtin to have equivalent behavior A+ --- Eric Pouech (7): dbghelp: SymLoadModule* should return the base address in case of success, and 0 otherwise dbghelp: native allows loading virtual module at any address dbghelp: return correct error code when reloading a module in SymLoadModule* dbghelp: use module->modulename instead of module->module.ModuleName in traces dbghelp: use the correct module name for lookups including module's name include/imagehlp.h: extend IMAGEHLP_MODULE*64 with new fields (keeping in sync with dbghelp.h) dbghelp: Properly managing the new MachineType field in IMAGEHLP_MODULE(W)64 dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 6 +++--- dlls/dbghelp/elf_module.c | 33 ++++++++++++++++++++++++--------- dlls/dbghelp/macho_module.c | 11 ++++++----- dlls/dbghelp/module.c | 30 ++++++++++++++++++++++-------- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 8 +++++--- dlls/dbghelp/symbol.c | 24 ++++++++++++------------ dlls/dbghelp/type.c | 4 ++-- include/imagehlp.h | 4 ++++ 10 files changed, 80 insertions(+), 44 deletions(-)

1 7

[PATCH 1/3] winebus.sys: Return an event from SDL bus wait on device creation.
by Rémi Bernon 06 Sep '21

06 Sep '21

Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 14 ++++---------- dlls/winebus.sys/main.c | 10 ++++++++++ dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 14 ++++++++++++++ dlls/winebus.sys/unixlib.h | 7 +++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1f7cf237e25..80252e7e6b1 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -741,7 +741,6 @@ static void sdl_add_device(unsigned int index) .serial = {'0','0','0','0',0}, }; struct platform_private *private; - DEVICE_OBJECT *device = NULL; char guid_str[34]; SDL_Joystick* joystick; @@ -791,16 +790,11 @@ static void sdl_add_device(unsigned int index) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; private->unix_device.vtbl = &sdl_device_vtbl; + private->sdl_joystick = joystick; + private->sdl_controller = controller; + private->id = id; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - else - { - private->sdl_joystick = joystick; - private->sdl_controller = controller; - private->id = id; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } static void process_device_event(SDL_Event *event) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6093a0b79eb..8a565bc3c46 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -578,6 +578,16 @@ static DWORD CALLBACK bus_main_thread(void *args) LeaveCriticalSection(&device_list_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; + case BUS_EVENT_TYPE_DEVICE_CREATED: + device = bus_create_hid_device(&event->device_created.desc, event->device_created.device); + if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); + else + { + WARN("failed to create device for %s bus device %p\n", + debugstr_w(bus.name), event->device_created.device); + winebus_call(device_remove, event->device_created.device); + } + break; } } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 81c4658068b..5cf999fff86 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -61,6 +61,7 @@ extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; struct hid_descriptor diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 2337cb3706d..9b0ccc0ae1a 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -327,6 +327,20 @@ BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, voi return TRUE; } +BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) +{ + ULONG size = sizeof(struct bus_event); + struct bus_event *event = HeapAlloc(GetProcessHeap(), 0, size); + if (!event) return FALSE; + + event->type = BUS_EVENT_TYPE_DEVICE_CREATED; + event->device_created.device = device; + event->device_created.desc = *desc; + list_add_tail(queue, &event->entry); + + return TRUE; +} + BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) { struct list *entry = list_head(queue); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 96671de0cac..85a03dd17ee 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -65,6 +65,7 @@ enum bus_event_type { BUS_EVENT_TYPE_NONE, BUS_EVENT_TYPE_DEVICE_REMOVED, + BUS_EVENT_TYPE_DEVICE_CREATED, }; struct bus_event @@ -79,6 +80,12 @@ struct bus_event const WCHAR *bus_id; void *context; } device_removed; + + struct + { + struct unix_device *device; + struct device_desc desc; + } device_created; }; }; -- 2.33.0

1 2

[PATCH] ntdll/tests: Remove unused variable sbi from test_query_process
by Alex Henrie 06 Sep '21

06 Sep '21

The code that used it was removed in commit 8ac77cfbf96689d83463928a9d0bdc5fcd054cb9. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e642427bffb..d05db6d1858 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -444,7 +444,6 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - SYSTEM_BASIC_INFORMATION sbi; PROCESS_BASIC_INFORMATION pbi; THREAD_BASIC_INFORMATION tbi; OBJECT_ATTRIBUTES attr; @@ -492,8 +491,6 @@ static void test_query_process(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); spi = spi_buf; - pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - for (;;) { DWORD_PTR tid; -- 2.33.0

1 0

[PATCH] dbghelp: Use the internal modulename when comparing Module names.
by Alistair Leslie-Hughes 05 Sep '21

05 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/elf_module.c | 4 ++-- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/symbol.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 7be7e8efce6..7f9f336d6b4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1068,8 +1068,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; } - if (wcsstr(module->module.ModuleName, S_ElfW) || - !wcscmp(module->module.ModuleName, S_WineLoaderW)) + if (wcsstr(module->modulename, S_ElfW) || + !wcscmp(module->modulename, S_WineLoaderW)) { /* add the thunks for native libraries */ if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3bc2a9e143a..66e9177c722 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -271,7 +271,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { - if (!wcsicmp(name, module->module.ModuleName)) return module; + if (!wcsnicmp(name, module->modulename, ARRAYSIZE(module->modulename))) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 9863a736299..31cd7771ad2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1089,7 +1089,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, { if (pair.requested->type == DMT_PE && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } @@ -1104,7 +1104,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, !module_get_containee(pair.pcs, pair.requested) && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } -- 2.33.0

1 0

[PATCH] cmd: Fix capitalization of WCMD_ReadFile in comment
by Alex Henrie 05 Sep '21

05 Sep '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index acf8f63b1f1..8c6ed1c057c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -212,7 +212,7 @@ void WCMD_leave_paged_mode(void) } /*************************************************************************** - * WCMD_Readfile + * WCMD_ReadFile * * Read characters in from a console/file, returning result in Unicode */ -- 2.33.0

1 0

[PATCH] msvcp140_1: Remove __cdecl on static functions where not needed.
by Francois Gouget 05 Sep '21

05 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp140_1/msvcp140_1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 823adedf3ac..c6a6ff19f13 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -64,7 +64,7 @@ void __cdecl MSVCRT_operator_delete(void *mem) free(mem); } -static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) +static void* MSVCRT_operator_new_aligned(size_t size, size_t alignment) { void *retval; int freed; @@ -85,7 +85,7 @@ static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) return NULL; } -static void __cdecl MSVCRT_operator_delete_aligned(void *mem, size_t alignment) +static void MSVCRT_operator_delete_aligned(void *mem, size_t alignment) { _aligned_free(mem); } -- 2.30.2

2 1

How to install Wine?
by igor evgen 05 Sep '21

05 Sep '21

Hi there, I tried to install Wine (whatever latest version) on my Ubuntu 21.04. My computer Terminal advised: <wget dl.winehq.org/wine-builds/Release.key sudo apt-key add Release.key sudo apt-add-repository 'dl.winehq.org/wine-builds/ubuntu'>. The above was followed & done more than once, including the way recommended by winehq.org. (I mean to enter a site, copy a command to a Terminal, etc., as a dummy does.) However, Terminal answered: <The following packages have unmet dependencies. winehq-stable : Depends: wine-stable (= 6.0.1~hirsute-1) E: Unable to correct problems, you have held broken packages.> Does it mean that Wine cannot be installed on my 21.04? Kindly note, I am not a computer engineer, just a user.What I quoted from the Terminal program is not my expertise. Thank you.Igor

2 1

[PATCH] sppc: Stub SLClose.
by Esme Povirk 04 Sep '21

04 Sep '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 19895041a32..a5250df23b9 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) sppc.SLClose @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index c05f15a28db..ce3183f39bd 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -51,6 +51,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId -- 2.25.1

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel September 2021