July 2021 - Wine-Commits - list.winehq.org

Huw Davies : iphlpapi: Implement GetIfEntry() on top of nsi.
by Alexandre Julliard July 9, 2021

July 9, 2021

Module: wine Branch: master Commit: d044171b72337ec530a9b9ab1334a08e9c91fbaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d044171b72337ec530a9b9ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 9 09:09:26 2021 +0100 iphlpapi: Implement GetIfEntry() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 41 ----------------------------------------- dlls/iphlpapi/ifenum.h | 7 ------- dlls/iphlpapi/iphlpapi_main.c | 33 ++++++++++++++++----------------- 3 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 3b4ac775db7..8108c7ff8c2 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -745,47 +745,6 @@ DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status return ret; } -DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) -{ - BYTE addr[MAX_INTERFACE_PHYSADDR]; - DWORD ret, len = sizeof(addr), type; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!entry) - return ERROR_INVALID_PARAMETER; - - if (getInterfacePhysicalByName(name, &len, addr, &type) == NO_ERROR) { - WCHAR *assigner; - const char *walker; - - memset(entry, 0, sizeof(MIB_IFROW)); - for (assigner = entry->wszName, walker = name; *walker; - walker++, assigner++) - *assigner = *walker; - *assigner = 0; - getInterfaceIndexByName(name, &entry->dwIndex); - entry->dwPhysAddrLen = len; - memcpy(entry->bPhysAddr, addr, len); - memset(entry->bPhysAddr + len, 0, sizeof(entry->bPhysAddr) - len); - entry->dwType = type; - /* FIXME: how to calculate real speed? */ - getInterfaceMtuByName(name, &entry->dwMtu); - /* lie, there's no "administratively down" here */ - entry->dwAdminStatus = MIB_IF_ADMIN_STATUS_UP; - getInterfaceStatusByName(name, &entry->dwOperStatus); - /* punt on dwLastChange? */ - entry->dwDescrLen = min(strlen(name), MAX_INTERFACE_DESCRIPTION - 1); - memcpy(entry->bDescr, name, entry->dwDescrLen); - entry->bDescr[entry->dwDescrLen] = '\0'; - entry->dwDescrLen++; - ret = NO_ERROR; - } - else - ret = ERROR_INVALID_DATA; - return ret; -} - static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, const struct sockaddr *sa) { diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 558dff64cb6..d0143eaaf69 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -87,13 +87,6 @@ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, PDWORD type) DECLSPEC_HIDDEN; -/* Fills in the MIB_IFROW by name. Doesn't fill in interface statistics, - * see ipstats.h for that. - * Returns ERROR_INVALID_PARAMETER if name is NULL, ERROR_INVALID_DATA - * if name isn't valid, and NO_ERROR otherwise. - */ -DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; - DWORD getNumIPAddresses(void) DECLSPEC_HIDDEN; /* Gets the configured IP addresses for the system, and sets *ppIpAddrTable to diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e5b6e72bde1..375766f1e9c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1821,26 +1821,25 @@ static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct n * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) +DWORD WINAPI GetIfEntry( MIB_IFROW *row ) { - DWORD ret; - char nameBuf[MAX_ADAPTER_NAME]; - char *name; + struct nsi_ndis_ifinfo_rw rw; + struct nsi_ndis_ifinfo_dynamic dyn; + struct nsi_ndis_ifinfo_static stat; + NET_LUID luid; + DWORD err; - TRACE("pIfRow %p\n", pIfRow); - if (!pIfRow) - return ERROR_INVALID_PARAMETER; + TRACE( "row %p\n", row ); + if (!row) return ERROR_INVALID_PARAMETER; - name = getInterfaceNameByIndex(pIfRow->dwIndex, nameBuf); - if (name) { - ret = getInterfaceEntryByName(name, pIfRow); - if (ret == NO_ERROR) - ret = getInterfaceStatsByName(name, pIfRow); - } - else - ret = ERROR_INVALID_DATA; - TRACE("returning %d\n", ret); - return ret; + err = ConvertInterfaceIndexToLuid( row->dwIndex, &luid ); + if (err) return err; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + &luid, sizeof(luid), &rw, sizeof(rw), + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (!err) if_row_fill( row, &rw, &dyn, &stat ); + return err; } static int ifrow_cmp( const void *a, const void *b )

1 0

Paul Gofman : mshtml: Move assert.h include to mshtml_private.h.
by Alexandre Julliard July 8, 2021

July 8, 2021

1 0

Jacek Caban : gdi32: Store ntgdi object types in handle table.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 06afb958d457fe5ae7984fe027fc0926bed8d789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06afb958d457fe5ae7984fe0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:45 2021 +0200 gdi32: Store ntgdi object types in handle table. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 14 ++++++------ dlls/gdi32/brush.c | 10 ++++----- dlls/gdi32/dc.c | 12 +++++----- dlls/gdi32/dib.c | 14 ++++++------ dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/enhmetafile.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 41 +++++++++++++++++----------------- dlls/gdi32/metafile.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/objects.c | 55 +++++++++++++++++++++++++++++++--------------- dlls/gdi32/palette.c | 18 +++++++-------- dlls/gdi32/pen.c | 12 +++++----- dlls/gdi32/region.c | 40 ++++++++++++++++----------------- dlls/gdi32/tests/gdiobj.c | 2 -- 17 files changed, 129 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06afb958d457fe5ae798…

1 0

Nikolay Sivov : mf/evr: Query d3d device manager via MR_VIDEO_RENDER_SERVICE service.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 1a4136a9bc1257d2ba0becd33c05e9c472bd2fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4136a9bc1257d2ba0becd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 8 18:55:03 2021 +0300 mf/evr: Query d3d device manager via MR_VIDEO_RENDER_SERVICE service. Default presenter responds to MR_VIDEO_ACCELERATION_SERVICE as well, but we'll have to be compatible to integrate with custom presenters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d048ea59681..5730a6e769f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1610,6 +1610,12 @@ static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); } +static HRESULT video_renderer_get_device_manager(struct video_renderer *renderer, IUnknown **device_manager) +{ + return MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_RENDER_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)device_manager); +} + static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -1660,13 +1666,12 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) /* Set device manager that presenter should have created. */ if (video_renderer_is_mixer_d3d_aware(renderer)) { - IDirect3DDeviceManager9 *device_manager; + IUnknown *device_manager; - if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IDirect3DDeviceManager9, (void **)&device_manager))) + if (SUCCEEDED(video_renderer_get_device_manager(renderer, &device_manager))) { IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); - IDirect3DDeviceManager9_Release(device_manager); + IUnknown_Release(device_manager); } } @@ -1690,8 +1695,7 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere hr = video_renderer_init_presenter_services(renderer); - if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IUnknown, (void **)&renderer->device_manager))) + if (FAILED(video_renderer_get_device_manager(renderer, &renderer->device_manager))) { WARN("Failed to get device manager from the presenter.\n"); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 8b982a1955adfa34127a6ef799f1768d5dd1f179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b982a1955adfa34127a6ef7… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 8 17:52:15 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 427 +++++++++++++++++++++------------------------------------------ 1 file changed, 139 insertions(+), 288 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b982a1955adfa34127a…

1 0

Andrew Eikum : shell32: Fix unused knownfolder definition.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: c99a406b716f90d9746a528b517eac7ad8dd3296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99a406b716f90d9746a528b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 8 10:10:43 2021 -0500 shell32: Fix unused knownfolder definition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51425 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/tests/shellpath.c | 52 ++++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 005e905baaa..2ffd608f645 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2445,9 +2445,9 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x45 */ &GUID_NULL, - CSIDL_Type_User, + CSIDL_Type_Disallowed, + NULL, NULL, - DocumentsW }, { /* 0x46 */ &FOLDERID_DocumentsLibrary, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index df9d4ecc949..0ba3734c518 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -111,6 +111,7 @@ static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; static const BYTE ieSpecialType[] = { PT_IESPECIAL2 }; static const BYTE shellExtType[] = { PT_SHELLEXT }; static const BYTE workgroupType[] = { PT_WORKGRP }; +static const BYTE missingType[] = { 0xff }; #define DECLARE_TYPE(x, y) { x, ARRAY_SIZE(y), y } static const struct shellExpectedValues requiredShellValues[] = { DECLARE_TYPE(CSIDL_BITBUCKET, guidType), @@ -178,6 +179,14 @@ static const struct shellExpectedValues optionalShellValues[] = { DECLARE_TYPE(CSIDL_RESOURCES, folderType), DECLARE_TYPE(CSIDL_RESOURCES_LOCALIZED, folderType), }; +static const struct shellExpectedValues undefinedShellValues[] = { + DECLARE_TYPE(0x0f, missingType), + DECLARE_TYPE(0x32, missingType), + DECLARE_TYPE(0x33, missingType), + DECLARE_TYPE(0x34, missingType), + DECLARE_TYPE(0x3c, missingType), + DECLARE_TYPE(0x45, missingType), +}; #undef DECLARE_TYPE static void loadShell32(void) @@ -1399,8 +1408,7 @@ static BYTE testSHGetSpecialFolderLocation(int folder) HRESULT hr; BYTE ret = 0xff; - /* treat absence of function as success */ - if (!pSHGetSpecialFolderLocation) return TRUE; + if (!pSHGetSpecialFolderLocation) return ret; pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); @@ -1447,8 +1455,14 @@ static void test_SHGetSpecialFolderPath(BOOL optional, int folder) getFolderName(folder)); } +enum ShellValuesTestExpect { + ShellValuesTestExpect_Required, + ShellValuesTestExpect_Optional, + ShellValuesTestExpect_Missing, +}; + static void test_ShellValues(const struct shellExpectedValues testEntries[], - int numEntries, BOOL optional) + int numEntries, enum ShellValuesTestExpect expect) { int i; @@ -1462,7 +1476,9 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + ok((expect == ShellValuesTestExpect_Required && foundTypeMatch) || + (expect == ShellValuesTestExpect_Optional) || + (expect == ShellValuesTestExpect_Missing && type == 0xff), "%s has unexpected type %d (0x%02x)\n", getFolderName(testEntries[i].folder), type, type); @@ -1471,18 +1487,23 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + ok((expect == ShellValuesTestExpect_Required && foundTypeMatch) || + (expect == ShellValuesTestExpect_Optional) || + (expect == ShellValuesTestExpect_Missing && type == 0xff), "%s has unexpected type %d (0x%02x)\n", getFolderName(testEntries[i].folder), type, type); - switch (type) + if (expect != ShellValuesTestExpect_Missing) { - case PT_FOLDER: - case PT_DRIVE: - case PT_DRIVE2: - case PT_IESPECIAL2: - test_SHGetFolderPath(optional, testEntries[i].folder); - test_SHGetSpecialFolderPath(optional, testEntries[i].folder); - break; + switch (type) + { + case PT_FOLDER: + case PT_DRIVE: + case PT_DRIVE2: + case PT_IESPECIAL2: + test_SHGetFolderPath(expect == ShellValuesTestExpect_Optional, testEntries[i].folder); + test_SHGetSpecialFolderPath(expect == ShellValuesTestExpect_Optional, testEntries[i].folder); + break; + } } } } @@ -1555,8 +1576,9 @@ static void test_PidlTypes(void) test_SHGetFolderPath(FALSE, CSIDL_DESKTOP); test_SHGetSpecialFolderPath(FALSE, CSIDL_DESKTOP); - test_ShellValues(requiredShellValues, ARRAY_SIZE(requiredShellValues), FALSE); - test_ShellValues(optionalShellValues, ARRAY_SIZE(optionalShellValues), TRUE); + test_ShellValues(requiredShellValues, ARRAY_SIZE(requiredShellValues), ShellValuesTestExpect_Required); + test_ShellValues(optionalShellValues, ARRAY_SIZE(optionalShellValues), ShellValuesTestExpect_Optional); + test_ShellValues(undefinedShellValues, ARRAY_SIZE(undefinedShellValues), ShellValuesTestExpect_Missing); } /* FIXME: Should be in shobjidl.idl */

1 0

Arkadiusz Hiler : dinput: Don't add 'default value 0' entries to the data transform.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: d10887b8f56792ebcca717ccc28a289f7bcaf107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10887b8f56792ebcca717cc… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Jul 8 13:03:21 2021 +0300 dinput: Don't add 'default value 0' entries to the data transform. This helps when dealing with the quirky c_dfDIJoystick2 format, which defines all the sliders as overlapping, i.e. rglSlider[2], rglVSlider[2], rglASlider[2] and rglFSlider[2] all share the same offset. With the Linux backends, if the device exposes enough axes (e.g. some HOTAS) we end up using rglSlider. Let's make sure we don't unnecessarily override the values there. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 14 +++--- dlls/dinput/tests/device.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 29a569ca9f1..ac60a21326c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -526,20 +526,20 @@ static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *forma TRACE(" "); _dump_EnumObjects_flags(asked_format->rgodf[j].dwType); TRACE("\n"); TRACE(" * dwFlags: 0x%08x\n", asked_format->rgodf[j].dwFlags); TRACE(" "); _dump_ObjectDataFormat_flags(asked_format->rgodf[j].dwFlags); TRACE("\n"); - + + same = 0; + + if (!(asked_format->rgodf[j].dwType & DIDFT_POV)) + continue; /* fill_DataFormat memsets the buffer to 0 */ + if (asked_format->rgodf[j].dwType & DIDFT_BUTTON) dt[index].size = sizeof(BYTE); else dt[index].size = sizeof(DWORD); dt[index].offset_in = -1; dt[index].offset_out = asked_format->rgodf[j].dwOfs; - if (asked_format->rgodf[j].dwType & DIDFT_POV) - dt[index].value = -1; - else - dt[index].value = 0; + dt[index].value = -1; index++; - - same = 0; } } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 485acca4f61..6307957b6e2 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -292,6 +292,126 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) return DIENUM_CONTINUE; } +struct overlapped_state +{ + BYTE keys[4]; + DWORD extra_element; +}; + +static const DIOBJECTDATAFORMAT obj_overlapped_slider_format[] = { + { &GUID_Key, 0, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_A),0}, + { &GUID_Key, 1, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_S),0}, + { &GUID_Key, 2, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_D),0}, + { &GUID_Key, 3, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_F),0}, + { &GUID_Slider, 0, DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, +}; + +static const DIDATAFORMAT overlapped_slider_format = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_ABSAXIS, + sizeof(struct overlapped_state), + ARRAY_SIZE(obj_overlapped_slider_format), + (LPDIOBJECTDATAFORMAT)obj_overlapped_slider_format +}; + +static const DIOBJECTDATAFORMAT obj_overlapped_pov_format[] = { + { &GUID_Key, 0, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_A),0}, + { &GUID_Key, 1, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_S),0}, + { &GUID_Key, 2, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_D),0}, + { &GUID_Key, 3, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(DIK_F),0}, + { &GUID_POV, 0, DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, +}; + +static const DIDATAFORMAT overlapped_pov_format = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_ABSAXIS, + sizeof(struct overlapped_state), + ARRAY_SIZE(obj_overlapped_pov_format), + (LPDIOBJECTDATAFORMAT)obj_overlapped_pov_format +}; + +static void pump_messages(void) +{ + MSG msg; + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} + +void overlapped_format_tests(IDirectInputA *pDI, HWND hwnd) +{ + HRESULT hr; + struct overlapped_state state; + IDirectInputDeviceA *keyboard = NULL; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + + /* 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(); + + /* press D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); + pump_messages(); + + memset(&state, 0xFF, sizeof(state)); + hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + + ok(state.keys[0] == 0x00, "key A should be still up\n"); + ok(state.keys[1] == 0x00, "key S should be still up\n"); + ok(state.keys[2] == 0x80, "keydown for D did not register\n"); + ok(state.keys[3] == 0x00, "key F should be still up\n"); + ok(state.extra_element == 0, "State struct was not memset to zero\n"); + + /* release D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + pump_messages(); + + hr = IDirectInputDevice_Unacquire(keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); + + /* 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(); + + /* press D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE, 0); + pump_messages(); + + memset(&state, 0xFF, sizeof(state)); + hr = IDirectInputDevice_GetDeviceState(keyboard, sizeof(state), &state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + + ok(state.keys[0] == 0xFF, "key state should have been overwritten by the overlapped POV\n"); + ok(state.keys[1] == 0xFF, "key state should have been overwritten by the overlapped POV\n"); + ok(state.keys[2] == 0xFF, "key state should have been overwritten by the overlapped POV\n"); + ok(state.keys[3] == 0xFF, "key state should have been overwritten by the overlapped POV\n"); + ok(state.extra_element == 0, "State struct was not memset to zero\n"); + + /* release D */ + keybd_event(0, DIK_D, KEYEVENTF_SCANCODE|KEYEVENTF_KEYUP, 0); + pump_messages(); + + if (keyboard) IUnknown_Release(keyboard); +} + static void device_tests(void) { HRESULT hr; @@ -342,6 +462,8 @@ static void device_tests(void) if (device) IUnknown_Release(device); } + overlapped_format_tests(pDI, hwnd); + DestroyWindow(hwnd); } if (obj) IUnknown_Release(obj);

1 0

Jacek Caban : gdi32/test: Add more handle table tests.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: c56cf0131bfa758ff35964124046a825a3f6eb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56cf0131bfa758ff3596412… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:26 2021 +0200 gdi32/test: Add more handle table tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/gdiobj.c | 83 ++++++++++++++++++++++++++++++++++++++++++----- include/ntgdi.h | 31 ++++++++++++++++-- 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 80c8b284c62..5665361d5e6 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -378,12 +378,45 @@ static GDI_SHARED_MEMORY *get_gdi_shared(void) return (GDI_SHARED_MEMORY *)NtCurrentTeb()->Peb->GdiSharedHandleTable; } +static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_stock ) +{ + GDI_SHARED_MEMORY *gdi_shared = get_gdi_shared(); + unsigned int handle = HandleToULong( obj ); + GDI_HANDLE_ENTRY *entry; + + entry = &gdi_shared->Handles[handle & 0xffff]; + ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", + entry->Unique, handle >> 16); + if (type != NTGDI_OBJ_MEMDC) + { + todo_wine + ok(entry->ExtType == type, "ExtType = %x, expected %x\n", entry->ExtType, type); + } + else + { + todo_wine + ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); + } + todo_wine_if(is_stock) + ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); + todo_wine + ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); + ok(entry->Object, "Object = NULL\n"); + ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); +} + static void test_shared_handle_table(void) { GDI_SHARED_MEMORY *gdi_shared; GDI_HANDLE_ENTRY *entry; unsigned int handle; + HENHMETAFILE enhmetafile; + HMETAFILE metafile; + HPEN pen; HRGN hrgn; + HBRUSH brush; + LOGBRUSH lb; + HDC dc; if (sizeof(void *) == 4 && !is_wow64) { @@ -394,18 +427,13 @@ static void test_shared_handle_table(void) hrgn = CreateRectRgn(10, 10, 20, 20); ok(hrgn != 0, "CreateRectRgn failed\n"); - - handle = (UINT_PTR)hrgn; + handle = HandleToULong( hrgn ); entry = &gdi_shared->Handles[handle & 0xffff]; - ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", - entry->Unique, handle >> 16); - todo_wine - ok(entry->Type == 4, "Type = %x\n", entry->Type); - ok(entry->Object, "Object = NULL\n"); todo_wine ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", entry->Owner.ProcessId, GetCurrentProcessId()); - ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + + test_shared_handle_entry( hrgn, NTGDI_OBJ_REGION, FALSE ); DeleteObject(hrgn); ok(entry->Unique == handle >> 16, "Unique = %x, expected %x\n", @@ -417,6 +445,45 @@ static void test_shared_handle_table(void) ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %x\n", entry->Owner.ProcessId, GetCurrentProcessId()); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); + + test_shared_handle_entry( GetStockObject( WHITE_PEN ), NTGDI_OBJ_PEN, TRUE ); + test_shared_handle_entry( GetStockObject( WHITE_BRUSH ), NTGDI_OBJ_BRUSH, TRUE ); + + brush = CreateSolidBrush(0); + test_shared_handle_entry( brush, NTGDI_OBJ_BRUSH, FALSE ); + DeleteObject(brush); + + lb.lbStyle = BS_SOLID; + lb.lbColor = RGB(12,34,56); + lb.lbHatch = HS_CROSS; + pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); + test_shared_handle_entry( pen, NTGDI_OBJ_EXTPEN, FALSE ); + DeleteObject(pen); + + test_shared_handle_entry( GetStockObject( SYSTEM_FONT ), NTGDI_OBJ_FONT, TRUE ); + test_shared_handle_entry( GetStockObject( DEFAULT_PALETTE ), NTGDI_OBJ_PAL, TRUE ); + test_shared_handle_entry( GetStockObject( STOCK_LAST + 1 ), NTGDI_OBJ_BITMAP, TRUE ); + + dc = CreateDCW(L"display", NULL, NULL, NULL); + ok(GetObjectType(dc) == OBJ_DC, "GetObjectType(dc) = %x\n", GetObjectType(dc)); + test_shared_handle_entry( dc, NTGDI_OBJ_DC, FALSE ); + DeleteDC(dc); + + dc = CreateMetaFileW(NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_METADC, FALSE ); + metafile = CloseMetaFile(dc); + test_shared_handle_entry( metafile, NTGDI_OBJ_METAFILE, FALSE ); + DeleteObject(metafile); + + dc = CreateEnhMetaFileW(NULL, NULL, NULL, NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_ENHMETADC, FALSE ); + enhmetafile = CloseEnhMetaFile(dc); + test_shared_handle_entry( enhmetafile, NTGDI_OBJ_ENHMETAFILE, FALSE ); + DeleteObject(metafile); + + dc = CreateCompatibleDC(NULL); + test_shared_handle_entry( dc, NTGDI_OBJ_MEMDC, FALSE ); + DeleteDC(dc); } START_TEST(gdiobj) diff --git a/include/ntgdi.h b/include/ntgdi.h index 196fb69bf4e..7e8954468fb 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -34,14 +34,39 @@ typedef struct _GDI_HANDLE_ENTRY }; ULONG Value; } Owner; - USHORT Unique; - UCHAR Type; - UCHAR Flags; + union + { + struct + { + UCHAR ExtType : 7; + UCHAR StockFlag : 1; + UCHAR Generation; + }; + USHORT Unique; + }; + UCHAR Type; + UCHAR Flags; UINT64 UserPointer; } GDI_HANDLE_ENTRY, *PGDI_HANDLE_ENTRY; #define GDI_MAX_HANDLE_COUNT 0x10000 +#define NTGDI_OBJ_DC 0x01 +#define NTGDI_OBJ_ENHMETADC 0x21 +#define NTGDI_OBJ_REGION 0x04 +#define NTGDI_OBJ_METAFILE 0x26 +#define NTGDI_OBJ_ENHMETAFILE 0x46 +#define NTGDI_OBJ_METADC 0x66 +#define NTGDI_OBJ_PAL 0x08 +#define NTGDI_OBJ_BITMAP 0x09 +#define NTGDI_OBJ_FONT 0x0a +#define NTGDI_OBJ_BRUSH 0x10 +#define NTGDI_OBJ_PEN 0x30 +#define NTGDI_OBJ_EXTPEN 0x50 + +/* Wine extension, native uses NTGDI_OBJ_DC */ +#define NTGDI_OBJ_MEMDC 0x41 + typedef struct _GDI_SHARED_MEMORY { GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT];

1 0

Jacek Caban : gdi32/tests: Remove workarounds for old Windows versions.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: 4b1094099c697ba59c791feb7b040c2d32cd4265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1094099c697ba59c791feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 8 17:11:13 2021 +0200 gdi32/tests: Remove workarounds for old Windows versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 94 +++++++-------------------------------------- 1 file changed, 13 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1094099c697ba59c79…

1 0

Paul Gofman : mshtml: Export requestAnimationFrame() through a private interface.
by Alexandre Julliard July 8, 2021

July 8, 2021

Module: wine Branch: master Commit: fdb304ff1444a898fd81f12961c3006f4800ca32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb304ff1444a898fd81f129… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 8 03:34:21 2021 +0300 mshtml: Export requestAnimationFrame() through a private interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 31 ++++++++- dlls/mshtml/htmlwindow.c | 126 +++++++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 6 ++ dlls/mshtml/mshtml_private_iface.idl | 18 +++++ 4 files changed, 149 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdb304ff1444a898fd81…

1 0