wine-devel August 2021

wine-devel@winehq.org

78 participants
929 discussions

[PATCH 1/9] gdi32: Use NtGdiSetTextJustification for SetTextJustification.
by Jacek Caban 05 Aug '21

05 Aug '21

2 1

[PATCH 1/4] xinput1_3: Introduce new find_opened_device helper.
by Rémi Bernon 05 Aug '21

05 Aug '21

To look for already opened device, or available device index. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is a bit of refactoring prior to some more patches to make XInput device enumeration and report reading asynchronous. Currently every call to XInputGetState does an ioctl, which introduces a very high load on wineserver and windevice (with multiple round trips to satisfy the ioctl). I intend to optimize this by using a thread queueing asynchronous reads to get … [View More]the HID reports, and update the state in background, as well as refreshing the device list. XInputGetState would then only be about acquiring the critical section and copying the state. dlls/xinput1_3/hid.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 0f4dec44ee3..e7a77813c71 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -71,6 +71,20 @@ struct hid_platform_private { static DWORD last_check = 0; +static BOOL find_opened_device(xinput_controller *devices, SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +{ + struct hid_platform_private *private; + int i; + + *free_slot = XUSER_MAX_COUNT; + for (i = XUSER_MAX_COUNT; i > 0; i--) + { + if (!(private = devices[i - 1].platform_private)) *free_slot = i - 1; + else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; + } + return FALSE; +} + static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) { struct axis_info info = {min, max-min, bits}; @@ -219,7 +233,7 @@ void HID_find_gamepads(xinput_controller *devices) HIDP_CAPS caps; NTSTATUS status; DWORD idx; - int i, open_device_idx; + int i; idx = GetTickCount(); if ((idx - last_check) < 2000) @@ -255,24 +269,9 @@ void HID_find_gamepads(xinput_controller *devices) if (!wcsstr(data->DevicePath, L"IG_")) continue; - open_device_idx = -1; - for (i = 0; i < XUSER_MAX_COUNT; i++) - { - struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].platform_private) - { - if (!wcscmp(data->DevicePath, private->device_path)) - break; - } - else if(open_device_idx < 0) - open_device_idx = i; - } - if (i != XUSER_MAX_COUNT) - /* this device is already opened */ - continue; - if (open_device_idx < 0) - /* no open device slots */ - break; + if (find_opened_device(devices, data, &i)) continue; /* already opened */ + if (i == XUSER_MAX_COUNT) break; /* no more slots */ + device = CreateFileW(data->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (device == INVALID_HANDLE_VALUE) continue; @@ -286,7 +285,7 @@ void HID_find_gamepads(xinput_controller *devices) WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&devices[open_device_idx], ppd, &caps, device, data->DevicePath)) + else if (!init_controller(&devices[i], ppd, &caps, device, data->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else goto done; -- 2.32.0 [View Less]

1 3

[PATCH v2 0/5] Implement reflink support
by Alex Xu (Hello71) 05 Aug '21

05 Aug '21

Over the years, Wine prefixes have gotten bigger and bigger, for a number of reasons. Creating a new Wine prefix for each application is still the current recommendation, as despite the best efforts of Wine developers, some applications still require system-wide workarounds. This leads to significant bloat for each application installed. With a MinGW build of Wine without Mono or Gecko, new 32-bit prefixes are over 150 MB, and new 64-bit prefixes are over 300 MB. The vast majority of these … [View More]files are byte-for-byte identical to Wine's central DLL copies. This patch set implements reflink support in Wine via the copy_file_range syscall. The reasons for selecting copy_file_range over FICLONE are outlined in patch 2. A previous unpublished version of this patch set used FICLONERANGE, but it was less convenient to use from setupapi and has inferior system support. When reflink is supported by the underlying filesystem, new Wine prefix sizes with Mono and Gecko disabled are reduced to less than 1 MB. The resulting Wine prefix is byte-for-byte identical to one created without reflink, but occupies less space on disk. If hard links or symlinks were used, if an application such as winetricks writes to a system file, it would overwrite the central copy. With reflink, the file blocks will be transparently copied by the Linux kernel so that each Wine prefix can be independent. Some files cannot be deduplicated in the current Wine system, as they are dynamically generated during the Wine prefix installation process. These include 16-bit fake DLLs and manifest files. In theory, it should be possible to pre-generate these files, but considering the Wine prefix size is already reduced to less than 1 MB, the extra space savings are likely not worth the effort. Alex Xu (Hello71) (5): ntdll: add support for IOCTL_COPYCHUNK. kernelbase: use IOCTL_COPYCHUNK in CopyFile* setupapi: Use IOCTL_COPYCHUNK, avoid buffering whole file lmshare.h: define STYPE_TEMPORARY kernel32/tests: add IOCTL_COPYCHUNK test configure | 1 + configure.ac | 1 + dlls/kernel32/tests/file.c | 137 +++++++++++++++++++++++++ dlls/kernelbase/file.c | 44 ++++---- dlls/ntdll/unix/file.c | 121 ++++++++++++++++++++++ dlls/setupapi/fakedll.c | 202 ++++++++++++++++++++----------------- include/config.h.in | 3 + include/lmshare.h | 11 +- include/winioctl.h | 34 +++++++ 9 files changed, 431 insertions(+), 123 deletions(-) -- 2.32.0 [View Less]

4 10

[PATCH] oleaut32: Fix locale settings caching in VARIANT_GetLocalisedNumberChars().
by Francois Gouget 05 Aug '21

05 Aug '21

Don't cache locale data coming from the registry because it could change at any time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Previously the settings of the first VarParseNumFromStr(LOCALE_USER_DEFAULT) call ended up being cached and used for all the remaining tests, thus causing many of them to fail. There's a comment that says the caching is because all these lookups are slow. And I guess the common case it likely to be the one that's no longer cached: i.e. … [View More]getting the current user's preferences from the registry. But all in all that case does not seem that slow (roughly 1.1 us per call) so unless it's called millions of times it should be ok. Also checking the registry key's last modification time would not make it much faster (I expect at most x2). --- dlls/oleaut32/tests/vartest.c | 12 +++--------- dlls/oleaut32/variant.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bed4de469df..89859988f1f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2198,7 +2198,7 @@ static void test_VarParseNumFromStrMisc(void) /* But SMONDECIMALSEP has no default! */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L""); hres = wconvert_str(L"3.9", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); @@ -2206,9 +2206,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" "); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2225,9 +2223,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" "); hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2235,9 +2231,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTFAIL; hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2298,14 +2292,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"\xa0"); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Regular thousands separators also have precedence over the currency ones */ hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e4993de75a5..15fc7f9042e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1529,8 +1529,11 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID EnterCriticalSection(&cache_cs); /* Asking for default locale entries is very expensive: It is a registry - server call. So cache one locally, as Microsoft does it too */ - if(lcid == lastLcid && dwFlags == lastFlags) + * server call. So cache one locally, as Microsoft does it too. + * Note: Data in the registry could change at any time so only cache when + * LOCALE_NOUSEROVERRIDE is used. + */ + if (lctype && lcid == lastLcid && dwFlags == lastFlags) { memcpy(lpChars, &lastChars, sizeof(defaultChars)); LeaveCriticalSection(&cache_cs); @@ -1557,9 +1560,12 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); - memcpy(&lastChars, lpChars, sizeof(defaultChars)); - lastLcid = lcid; - lastFlags = dwFlags; + if (lctype) + { + memcpy(&lastChars, lpChars, sizeof(defaultChars)); + lastLcid = lcid; + lastFlags = dwFlags; + } LeaveCriticalSection(&cache_cs); } -- 2.20.1 [View Less]

1 4

[PATCH] conhost: Copy font properties to the new screen buffer.
by Jacek Caban 05 Aug '21

05 Aug '21

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I removed font_name initialization, calloc already zeroes the buffer. programs/conhost/conhost.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

1 0

[PATCH v2] conhost: Copy font properties to the new screen buffer
by Hugh McMaster 05 Aug '21

05 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Shallow copy struct font_info then duplicate font face. programs/conhost/conhost.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 061f09989eb..768c52b877e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -68,6 +68,7 @@ static void … [View More]destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->font.face_name ); free( screen_buffer->data ); free( screen_buffer ); } @@ -85,8 +86,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->font.weight = FW_NORMAL; - screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; if (console->active) { @@ -96,15 +95,23 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; screen_buffer->popup_attr = console->active->attr; + screen_buffer->font = console->active->font; + + if (!(screen_buffer->font.face_name = malloc(screen_buffer->font.face_len))) return NULL; + memcpy(screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len); } else { - screen_buffer->max_width = width; - screen_buffer->max_height = height; - screen_buffer->win.right = width - 1; - screen_buffer->win.bottom = height - 1; - screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; - screen_buffer->popup_attr = 0xf5; + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; + screen_buffer->font.weight = FW_NORMAL; + screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + screen_buffer->font.face_name = NULL; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) -- 2.32.0 [View Less]

1 0

[PATCH v2] dinput/tests: Make overlapped format tests more robust.
by Arkadiusz Hiler 05 Aug '21

05 Aug '21

Both Acquire() and event processing with DirectInput seem to be asynchronous. In most cases we can just keep hammering GetDeviceData() until the event gets processed. Things get pretty racy around Acquire() though. If we fire event right after the device is acquired we can find ourselves in one of the three situations: 1. Event happened after acquiring has completed - the wait will suffice. 2. Event happened before acquiring did any real work - the device will pick up the state as if the … [View More]event was processed, but there's nothing in GetDeviceData(). Because of that we cannot fail on wait. 3. Event happened somewhere in the middle of acquiring - we ended up both missing the event for GetDeviceData() and we have outdated state. Sending event again will register as if the button was not already pressed. This change covers all three scenarios. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- Cc: Rémi Bernon <rbernon(a)codeweavers.com> supersedes 210869 dlls/dinput/tests/device.c | 73 +++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 6307957b6e2..b21a02dfe56 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -343,11 +343,54 @@ static void pump_messages(void) } } +#define wait_for_device_data_and_discard(device) wait_for_device_data_and_discard_(__LINE__, device) +static BOOL wait_for_device_data_and_discard_(int line, IDirectInputDeviceA *device) +{ + DWORD cnt; + HRESULT hr; + DWORD start_time; + + pump_messages(); + + start_time = GetTickCount(); + do + { + cnt = 10; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(DIDEVICEOBJECTDATA_DX3), NULL, &cnt, 0); + ok_(__FILE__, line)(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceData() failed: %08x\n", hr); + ok_(__FILE__, line)(cnt == 0 || cnt == 1, "Unexpected number of events: %d\n", cnt); + } while (cnt != 1 && (GetTickCount() - start_time < 500)); + + return cnt == 1; +} + +#define acquire_and_wait(device, valid_dik) acquire_and_wait_(__LINE__, device, valid_dik) +static void acquire_and_wait_(int line, IDirectInputDeviceA *device, DWORD valid_dik) +{ + HRESULT hr; + int tries = 2; + + hr = IDirectInputDevice_Acquire(device); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + + do + { + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE, 0); + } while (!wait_for_device_data_and_discard(device) && tries--); + + keybd_event(0, valid_dik, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + ok_(__FILE__, line)(wait_for_device_data_and_discard(device), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); +} + void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; struct overlapped_state state; IDirectInputDeviceA *keyboard = NULL; + DIPROPDWORD dp; + + SetFocus(hwnd); hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -355,15 +398,21 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped slider - default value 0 */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_slider_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 10; + hr = IDirectInputDevice_SetProperty(keyboard, DIPROP_BUFFERSIZE, &dp.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetProperty() failed: %08x\n", hr); + + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -377,7 +426,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); hr = IDirectInputDevice_Unacquire(keyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); @@ -385,15 +435,13 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* test overlapped pov - default value - 0xFFFFFFFF */ hr = IDirectInputDevice_SetDataFormat(keyboard, &overlapped_pov_format); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); - hr = IDirectInputDevice_Acquire(keyboard); - ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); - SetFocus(hwnd); - pump_messages(); + acquire_and_wait(keyboard, DIK_F); /* press D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); memset(&state, 0xFF, sizeof(state)); hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); @@ -407,7 +455,8 @@ void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) /* release D */ keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); - pump_messages(); + ok(wait_for_device_data_and_discard(keyboard), + "Timed out while waiting for injected events to be picked up by DirectInput.\n"); if (keyboard) IUnknown_Release(keyboard); } -- 2.32.0 [View Less]

2 1

[PATCH] jscript: Fix use after free in Object_defineProperty().
by Paul Gofman 05 Aug '21

05 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c8c0572c839..169b47caea4 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -470,11 +470,15 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl }else { hres = JS_E_OBJECT_EXPECTED; } - jsstr_release(name_str); + … [View More]

2 1

[PATCH] gdi32: Use documented structure layout for EMF-to-WMF embedding records.
by Nikolay Sivov 05 Aug '21

05 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The only goal is to remove "unknowns" that's been documented since. I think this patch does not conflict with last ntgdi batch. dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/metafile.c | 10 ++++------ dlls/gdi32/ntgdi_private.h | 10 ++++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25ffcff93bf..b12db98d9e6 100644 --- a/dlls/gdi32/… [View More]enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2804,7 +2804,7 @@ static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; - if (chunk->magic != WMFC_MAGIC) goto done; + if (chunk->comment_id != WMFC_MAGIC) goto done; if (!emf_bits) { diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index b0428960b50..6b4df5680ba 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1096,13 +1096,11 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = WMFC_MAGIC; - chunk->unk04 = 1; - chunk->unk06 = 0; - chunk->unk08 = 0; - chunk->unk0a = 1; + chunk->comment_id = WMFC_MAGIC; + chunk->comment_type = 0x1; + chunk->version = 0x00010000; chunk->checksum = 0; /* We fixup the first chunk's checksum before returning from GetWinMetaFileBits */ - chunk->unk0e = 0; + chunk->flags = 0; chunk->num_chunks = (size + max_chunk_size - 1) / max_chunk_size; chunk->chunk_size = max_chunk_size; chunk->remaining_size = size; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index c3ae797ddf6..755d3193615 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -462,13 +462,11 @@ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; #include <pshpack2.h> typedef struct { - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ WORD checksum; - DWORD unk0e; /* 0 */ + DWORD flags; /* Always 0 */ DWORD num_chunks; DWORD chunk_size; DWORD remaining_size; -- 2.30.2 [View Less]

2 1

[PATCH v2 6/6] iphlpapi: Add support for the EnableRouting member.
by Huw Davies 05 Aug '21

05 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 86 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a790d3339ac..6a934f926d1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2395,64 +2395,60 @@ err: * Get the network parameters for the local computer. * * PARAMS - * pFixedInfo [Out] buffer … [View More]for network parameters - * pOutBufLen [In/Out] length of output buffer + * info [Out] buffer for network parameters + * size [In/Out] length of output buffer * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * * NOTES - * If pOutBufLen is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and pOutBufLen will be set to the required byte + * If size is less than required, the function will return + * ERROR_INSUFFICIENT_BUFFER, and size will be set to the required byte * size. */ -DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) +DWORD WINAPI GetNetworkParams( FIXED_INFO *info, ULONG *size ) { - DWORD ret, size, serverListSize; - LONG regReturn; - HKEY hKey; + DWORD needed = sizeof(*info), dns_size, err; + MIB_IPSTATS ip_stats; + HKEY key; - TRACE("pFixedInfo %p, pOutBufLen %p\n", pFixedInfo, pOutBufLen); - if (!pOutBufLen) - return ERROR_INVALID_PARAMETER; + TRACE( "info %p, size %p\n", info, size ); + if (!size) return ERROR_INVALID_PARAMETER; - get_dns_server_list( NULL, NULL, NULL, &serverListSize ); - size = sizeof(FIXED_INFO) + serverListSize - sizeof(IP_ADDR_STRING); - if (!pFixedInfo || *pOutBufLen < size) { - *pOutBufLen = size; - return ERROR_BUFFER_OVERFLOW; - } + if (get_dns_server_list( NULL, NULL, NULL, &dns_size ) == ERROR_BUFFER_OVERFLOW) + needed += dns_size - sizeof(IP_ADDR_STRING); + if (!info || *size < needed) + { + *size = needed; + return ERROR_BUFFER_OVERFLOW; + } - memset(pFixedInfo, 0, size); - size = sizeof(pFixedInfo->HostName); - GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); - size = sizeof(pFixedInfo->DomainName); - GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); - get_dns_server_list( NULL, &pFixedInfo->DnsServerList, (IP_ADDR_STRING *)(pFixedInfo + 1), - &serverListSize ); - /* Assume the first DNS server in the list is the "current" DNS server: */ - pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; - pFixedInfo->NodeType = HYBRID_NODETYPE; - regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey); - if (regReturn != ERROR_SUCCESS) - regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", 0, KEY_READ, - &hKey); - if (regReturn == ERROR_SUCCESS) - { - DWORD size = sizeof(pFixedInfo->ScopeId); - - RegQueryValueExA(hKey, "ScopeID", NULL, NULL, (LPBYTE)pFixedInfo->ScopeId, &size); - RegCloseKey(hKey); - } + *size = needed; + memset( info, 0, needed ); + needed = sizeof(info->HostName); + GetComputerNameExA( ComputerNameDnsHostname, info->HostName, &needed ); + needed = sizeof(info->DomainName); + GetComputerNameExA( ComputerNameDnsDomain, info->DomainName, &needed ); + get_dns_server_list( NULL, &info->DnsServerList, (IP_ADDR_STRING *)(info + 1), &dns_size ); + info->CurrentDnsServer = &info->DnsServerList; + info->NodeType = HYBRID_NODETYPE; + err = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", + 0, KEY_READ, &key ); + if (err) + err = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", + 0, KEY_READ, &key ); + if (!err) + { + needed = sizeof(info->ScopeId); + RegQueryValueExA( key, "ScopeID", NULL, NULL, (BYTE *)info->ScopeId, &needed ); + RegCloseKey( key ); + } - /* FIXME: can check whether routing's enabled in /proc/sys/net/ipv4/ip_forward - I suppose could also check for a listener on port 53 to set EnableDns */ - ret = NO_ERROR; - TRACE("returning %d\n", ret); - return ret; + if (!GetIpStatistics( &ip_stats )) + info->EnableRouting = (ip_stats.u.Forwarding == MIB_IP_FORWARDING); + + return ERROR_SUCCESS; } -- 2.23.0 [View Less]

1 0

← Newer
1
...
78
79
80
81
82
83
84
...
93
Older →

Jump to page:

2025

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 August 2021