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

Zebediah Figura : xactengine: Explicitly convert notification type constants.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 4ca4a6d8d744959f33563db986eae7dbf6a6eb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ca4a6d8d744959f33563db9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 22 10:30:50 2021 -0500 xactengine: Explicitly convert notification type constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 68 ++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index d7ee07490de..8a3642b89b2 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -843,12 +843,7 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) return; } - if (notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) - { - FIXME("Callback XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED\n"); - } - else - FIXME("Unsupported callback type %d\n", notification->type); + FIXME("Unsupported callback type %d\n", notification->type); } static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, @@ -1125,6 +1120,38 @@ enum { NOTIFY_waveIndex = 0x20 }; +/* these constants don't have the same values across xactengine versions */ +static uint8_t fact_notification_type_from_xact(XACTNOTIFICATIONTYPE type) +{ + /* we can't use a switch statement, because the constants are static const + * variables, and some compilers can't deal with that */ +#define X(a) if (type == XACTNOTIFICATIONTYPE_##a) return FACTNOTIFICATIONTYPE_##a + X(CUEPREPARED); + X(CUEPLAY); + X(CUESTOP); + X(CUEDESTROYED); + X(MARKER); + X(SOUNDBANKDESTROYED); + X(WAVEBANKDESTROYED); + X(LOCALVARIABLECHANGED); + X(GLOBALVARIABLECHANGED); + X(GUICONNECTED); + X(GUIDISCONNECTED); + X(WAVEPLAY); + X(WAVESTOP); + X(WAVEBANKPREPARED); + X(WAVEBANKSTREAMING_INVALIDCONTENT); +#if XACT3_VER >= 0x0205 + X(WAVEPREPARED); + X(WAVELOOPED); + X(WAVEDESTROYED); +#endif +#undef X + + FIXME("unknown type %#x\n", type); + return 0; +} + static inline void unwrap_notificationdesc(FACTNotificationDescription *fd, const XACT_NOTIFICATION_DESCRIPTION *xd) { @@ -1134,43 +1161,42 @@ static inline void unwrap_notificationdesc(FACTNotificationDescription *fd, memset(fd, 0, sizeof(*fd)); + fd->type = fact_notification_type_from_xact(xd->type); + + /* we can't use a switch statement, because the constants are static const + * variables, and some compilers can't deal with that */ + /* Supports SoundBank, Cue index, Cue instance */ - if (xd->type == XACTNOTIFICATIONTYPE_CUEPREPARED || xd->type == XACTNOTIFICATIONTYPE_CUEPLAY || - xd->type == XACTNOTIFICATIONTYPE_CUESTOP || xd->type == XACTNOTIFICATIONTYPE_CUEDESTROYED || - xd->type == XACTNOTIFICATIONTYPE_MARKER || xd->type == XACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) + if (fd->type == FACTNOTIFICATIONTYPE_CUEPREPARED || fd->type == FACTNOTIFICATIONTYPE_CUEPLAY || + fd->type == FACTNOTIFICATIONTYPE_CUESTOP || fd->type == FACTNOTIFICATIONTYPE_CUEDESTROYED || + fd->type == FACTNOTIFICATIONTYPE_MARKER || fd->type == FACTNOTIFICATIONTYPE_LOCALVARIABLECHANGED) { flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue; } /* Supports WaveBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || xd->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || - xd->type == XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEBANKDESTROYED || fd->type == FACTNOTIFICATIONTYPE_WAVEBANKPREPARED || + fd->type == FACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) { flags = NOTIFY_WaveBank; } /* Supports NOTIFY_SoundBank */ - else if (xd->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + else if (fd->type == FACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) { flags = NOTIFY_SoundBank; } /* Supports SoundBank, SoundBank, Cue index, Cue instance, WaveBank, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPLAY || xd->type == XACTNOTIFICATIONTYPE_WAVESTOP) - { - flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; - } -#if XACT3_VER >= 0x0205 - else if (xd->type == XACTNOTIFICATIONTYPE_WAVELOOPED) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEPLAY || fd->type == FACTNOTIFICATIONTYPE_WAVESTOP || + fd->type == FACTNOTIFICATIONTYPE_WAVELOOPED) { flags = NOTIFY_SoundBank | NOTIFY_cueIndex | NOTIFY_Cue | NOTIFY_WaveBank | NOTIFY_Wave; } /* Supports WaveBank, Wave index, Wave instance */ - else if (xd->type == XACTNOTIFICATIONTYPE_WAVEPREPARED || xd->type == XACTNOTIFICATIONTYPE_WAVEDESTROYED) + else if (fd->type == FACTNOTIFICATIONTYPE_WAVEPREPARED || fd->type == FACTNOTIFICATIONTYPE_WAVEDESTROYED) { flags = NOTIFY_WaveBank | NOTIFY_waveIndex | NOTIFY_Wave; } -#endif /* We have to unwrap the FACT object first! */ - fd->type = xd->type; fd->flags = xd->flags; fd->pvContext = xd->pvContext; if (flags & NOTIFY_cueIndex)

1 0

Zebediah Figura : advapi32/tests: Add a test for setting the SD owner of a directory to a group.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: b3dc0c16a76676e5d456f93cb3ea0f82f17b55ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3dc0c16a76676e5d456f93c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 20 14:34:59 2021 -0500 advapi32/tests: Add a test for setting the SD owner of a directory to a group. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ce9c26d238e..08b73495aaa 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8306,6 +8306,74 @@ static void test_elevation(void) CloseHandle(token); } +static void test_group_as_file_owner(void) +{ + char sd_buffer[200], sid_buffer[100]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sd_buffer; + char temp_path[MAX_PATH], path[MAX_PATH]; + SID *admin_sid = (SID *)sid_buffer; + BOOL ret, present, defaulted; + SECURITY_DESCRIPTOR new_sd; + HANDLE file; + DWORD size; + ACL *dacl; + + /* The EA Origin client sets the SD owner of a directory to Administrators, + * while using the default DACL, and subsequently tries to create + * subdirectories. */ + + size = sizeof(sid_buffer); + CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &size); + + ret = CheckTokenMembership(NULL, admin_sid, &present); + ok(ret, "got error %u\n", GetLastError()); + if (!present) + { + skip("user is not an administrator\n"); + return; + } + + GetTempPathA(ARRAY_SIZE(temp_path), temp_path); + sprintf(path, "%s\\testdir", temp_path); + + ret = CreateDirectoryA(path, NULL); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA(path, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(file, DACL_SECURITY_INFORMATION, sd_buffer, sizeof(sd_buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + InitializeSecurityDescriptor(&new_sd, SECURITY_DESCRIPTOR_REVISION); + + ret = SetSecurityDescriptorOwner(&new_sd, admin_sid, FALSE); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(&new_sd, present, dacl, defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(file, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &new_sd); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(file); + + sprintf(path, "%s\\testdir\\subdir", temp_path); + ret = CreateDirectoryA(path, NULL); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA(path); + todo_wine ok(ret, "got error %u\n", GetLastError()); + sprintf(path, "%s\\testdir", temp_path); + ret = RemoveDirectoryA(path); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -8374,6 +8442,7 @@ START_TEST(security) test_duplicate_token(); test_GetKernelObjectSecurity(); test_elevation(); + test_group_as_file_owner(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Alexandre Julliard : ntdll: Remove no longer used defines from the makefile.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 9f2751ca3ff92e5eb9cf1dd6c8eac5aa01f4642f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2751ca3ff92e5eb9cf1dd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:32:30 2021 +0200 ntdll: Remove no longer used defines from the makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 179d00b29ef..0fdfb83df15 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -70,11 +70,6 @@ RC_SRCS = version.rc EXTRA_OBJS = unix/version.o -server_EXTRADEFS = \ - -DBINDIR=\"${bindir}\" \ - -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" - unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \

1 0

Nikolay Sivov : evr/tests: Simplify d3d9 device creation helper.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 53b1b034063fa5056952630e7c61413e381700d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b1b034063fa5056952630e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 11:08:06 2021 +0300 evr/tests: Simplify d3d9 device creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bcea437db4c..2643f6ee92a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -49,10 +49,14 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +static IDirect3DDevice9 *create_device(HWND focus_window) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -66,6 +70,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + IDirect3D9_Release(d3d9); + return device; } @@ -719,16 +725,13 @@ static void test_surface_sample(void) DWORD flags, count, length; IDirect3DDevice9 *device; IMFSample *sample; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; BYTE *data; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -930,7 +933,6 @@ static void test_surface_sample(void) done: if (backbuffer) IDirect3DSurface9_Release(backbuffer); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -945,7 +947,6 @@ static void test_default_mixer_type_negotiation(void) IMFTransform *transform; DWORD index, count; GUID guid, *guids; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -981,9 +982,7 @@ static void test_default_mixer_type_negotiation(void) /* Now try with device manager. */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1118,7 +1117,6 @@ todo_wine done: IMFTransform_Release(transform); - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -1341,7 +1339,6 @@ static void test_MFCreateVideoSampleAllocator(void) LONG refcount, count; unsigned int token; IMFGetService *gs; - IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; @@ -1456,9 +1453,7 @@ static void test_MFCreateVideoSampleAllocator(void) /* Using device manager */ window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1507,7 +1502,6 @@ static void test_MFCreateVideoSampleAllocator(void) IDirect3DDeviceManager9_Release(manager); IDirect3DDevice9_Release(device); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2102,7 +2096,6 @@ static void test_presenter_media_type(void) IDirect3DDeviceManager9 *manager; HRESULT hr; IMFTransform *mixer; - IDirect3D9 *d3d; IDirect3DDevice9 *device; unsigned int token; SIZE frame_size; @@ -2112,9 +2105,7 @@ static void test_presenter_media_type(void) RECT dst; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2196,7 +2187,6 @@ todo_wine { IMFTransform_Release(mixer); done: - IDirect3D9_Release(d3d); DestroyWindow(window); } @@ -2439,16 +2429,13 @@ static void test_mixer_samples(void) DWORD count, flags, color, status; IMFTransform *mixer; IMFSample *sample, *sample2; - IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; LONGLONG pts, duration; window = create_window(); - d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window))) + if (!(device = create_device(window))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -2678,7 +2665,6 @@ static void test_mixer_samples(void) IDirect3DDeviceManager9_Release(manager); done: - IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Alexandre Julliard : configure: Stop building libwine on Android.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: a639db3e8c18f58d28c3e76bc4f9bc90a48ad93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a639db3e8c18f58d28c3e76b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 15:33:30 2021 +0200 configure: Stop building libwine on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 4 ---- dlls/ntdll/unix/loader.c | 2 -- 3 files changed, 12 deletions(-) diff --git a/configure b/configure index 39639235469..762c0b8e2e2 100755 --- a/configure +++ b/configure @@ -9164,12 +9164,6 @@ if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - LIBWINE_SHAREDLIB="libwine.so" - - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" - - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5 $as_echo_n "checking for -lEGL... " >&6; } if ${ac_cv_lib_soname_EGL+:} false; then : diff --git a/configure.ac b/configure.ac index 797f8cfbbbf..68366339ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -893,10 +893,6 @@ case $host_os in [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") - AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so" - WINE_CHECK_SONAME(EGL,eglGetProcAddress) WINE_CHECK_SONAME(GLESv2,glFlush) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 16bba12b571..9947ff2f447 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -935,8 +935,6 @@ static void load_libwine(void) { #ifdef __APPLE__ #define LIBWINE "libwine.1.dylib" -#elif defined(__ANDROID__) -#define LIBWINE "libwine.so" #else #define LIBWINE "libwine.so.1" #endif

1 0

Nikolay Sivov : mfplat: Remove some unnecessary pointer casts.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: e5475da88e7be1d534b4470504e2614bf73e6183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5475da88e7be1d534b44705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 09:25:33 2021 +0300 mfplat: Remove some unnecessary pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fae4d3e5055..e0dbb6a1a78 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -978,7 +978,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia TRACE("%p.\n", iface); CoTaskMemFree(media_type->video_format); - if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) WARN("Failed to create format description, hr %#x.\n", hr); return media_type->video_format; @@ -1378,9 +1378,11 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT TRACE("%p.\n", iface); CoTaskMemFree(media_type->audio_format); - if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType((IMFMediaType *)iface, &media_type->audio_format, &size, - MFWaveFormatExConvertFlag_Normal))) + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, + &size, MFWaveFormatExConvertFlag_Normal))) + { WARN("Failed to create wave format description, hr %#x.\n", hr); + } return media_type->audio_format; }

1 0

Jacek Caban : mshtml: Factor out get_time_stamp helper.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 37a236870388fb1ba3e5e29ecef3f8d0a2a8cd5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a236870388fb1ba3e5e29e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 22 01:49:11 2021 +0200 mshtml: Factor out get_time_stamp helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 8 +------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 51b976c2077..b3b95083f80 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2208,12 +2208,8 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev { dispex_static_data_t *dispex_data = &DOMEvent_dispex; DOMEvent *event = NULL; - FILETIME time; nsresult nsres; - /* 1601 to 1970 is 369 years plus 89 leap days */ - const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; - if(check_event_iface(nsevent, &IID_nsIDOMCustomEvent)) { DOMCustomEvent *custom_event = heap_alloc_zero(sizeof(*custom_event)); if(!custom_event) @@ -2247,9 +2243,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev } nsIDOMEvent_AddRef(event->nsevent = nsevent); - GetSystemTimeAsFileTime(&time); - event->time_stamp = (((ULONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime) / 10000 - - time_epoch; + event->time_stamp = get_time_stamp(); nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); if(NS_SUCCEEDED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4cbddb68022..9d1737cc81f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1212,6 +1212,7 @@ HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; +ULONGLONG get_time_stamp(void) DECLSPEC_HIDDEN; enum timer_type { TIMER_TIMEOUT, diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index c26f3754fd4..b7616058461 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -380,3 +380,14 @@ thread_data_t *get_thread_data(BOOL create) return thread_data; } + +ULONGLONG get_time_stamp(void) +{ + FILETIME time; + + /* 1601 to 1970 is 369 years plus 89 leap days */ + const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; + + GetSystemTimeAsFileTime(&time); + return (((ULONGLONG)time.dwHighDateTime << 32) + time.dwLowDateTime) / 10000 - time_epoch; +}

1 0

Zebediah Figura : evr: Stub IEVRFilterConfig.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 8c59a0467776ac2387686b477d2fa8089bd529fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c59a0467776ac2387686b47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:23:44 2021 -0500 evr: Stub IEVRFilterConfig. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50415 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 1 + 2 files changed, 67 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 94239417794..1965fd247de 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct evr { struct strmbase_renderer renderer; + IEVRFilterConfig IEVRFilterConfig_iface; }; static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -40,6 +41,19 @@ static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) return CONTAINING_RECORD(iface, struct evr, renderer); } +static HRESULT evr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (IsEqualGUID(iid, &IID_IEVRFilterConfig)) + *out = &filter->IEVRFilterConfig_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static void evr_destroy(struct strmbase_renderer *iface) { struct evr *filter = impl_from_strmbase_renderer(iface); @@ -64,9 +78,60 @@ static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, .renderer_render = evr_render, + .renderer_query_interface = evr_query_interface, .renderer_destroy = evr_destroy, }; +static struct evr *impl_from_IEVRFilterConfig(IEVRFilterConfig *iface) +{ + return CONTAINING_RECORD(iface, struct evr, IEVRFilterConfig_iface); +} + +static HRESULT WINAPI filter_config_QueryInterface(IEVRFilterConfig *iface, REFIID iid, void **out) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI filter_config_AddRef(IEVRFilterConfig *iface) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI filter_config_Release(IEVRFilterConfig *iface) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI filter_config_SetNumberOfStreams(IEVRFilterConfig *iface, DWORD count) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + + FIXME("filter %p, count %u, stub!\n", filter, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI filter_config_GetNumberOfStreams(IEVRFilterConfig *iface, DWORD *count) +{ + struct evr *filter = impl_from_IEVRFilterConfig(iface); + + FIXME("filter %p, count %p, stub!\n", filter, count); + + return E_NOTIMPL; +} + +static const IEVRFilterConfigVtbl filter_config_vtbl = +{ + filter_config_QueryInterface, + filter_config_AddRef, + filter_config_Release, + filter_config_SetNumberOfStreams, + filter_config_GetNumberOfStreams, +}; + HRESULT evr_filter_create(IUnknown *outer, void **out) { struct evr *object; @@ -76,6 +141,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) strmbase_renderer_init(&object->renderer, outer, &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); + object->IEVRFilterConfig_iface.lpVtbl = &filter_config_vtbl; TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fb4a2130f37..bcea437db4c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -253,6 +253,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IEVRFilterConfig, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE);

1 0

Zebediah Figura : windows.gaming.input: Link directly to combase.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: ac1c34715368943a39ef20f422125d3d588d5e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1c34715368943a39ef20f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:34:58 2021 -0500 windows.gaming.input: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/tests/Makefile.in | 2 +- dlls/windows.gaming.input/tests/input.c | 50 ++++++----------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/windows.gaming.input/tests/Makefile.in b/dlls/windows.gaming.input/tests/Makefile.in index 7fce9b04551..88e1c05fbcf 100644 --- a/dlls/windows.gaming.input/tests/Makefile.in +++ b/dlls/windows.gaming.input/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.gaming.input.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ input.c diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index 6ce06de346e..b05dc508637 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -34,13 +34,6 @@ #include "wine/test.h" -static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); - struct gamepad_event_handler { IEventHandler_Gamepad IEventHandler_Gamepad_iface; @@ -119,13 +112,13 @@ static void test_Gamepad(void) gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(gamepad_name, wcslen(gamepad_name), &str); + hr = WindowsCreateString(gamepad_name, wcslen(gamepad_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { @@ -213,9 +206,9 @@ static void test_Gamepad(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } struct controller_event_handler @@ -296,13 +289,13 @@ static void test_RawGameController(void) controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl; - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK || hr == S_FALSE, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(controller_name, wcslen(controller_name), &str); + hr = WindowsCreateString(controller_name, wcslen(controller_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { @@ -390,36 +383,13 @@ static void test_RawGameController(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(input) { - HMODULE combase; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoActivateInstance); - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); -#undef LOAD_FUNCPTR - test_Gamepad(); test_RawGameController(); }

1 0

Zebediah Figura : windows.globalization: Link directly to combase.
by Alexandre Julliard April 22, 2021

April 22, 2021

Module: wine Branch: master Commit: 862684feaec45e3ae13cf6a8de793efff5e435f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862684feaec45e3ae13cf6a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 21 20:34:59 2021 -0500 windows.globalization: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/tests/Makefile.in | 2 +- dlls/windows.globalization/tests/globalization.c | 64 +++++++----------------- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in index d928414c6ea..7ee2bc407d6 100644 --- a/dlls/windows.globalization/tests/Makefile.in +++ b/dlls/windows.globalization/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.globalization.dll -IMPORTS = uuid +IMPORTS = combase uuid C_SRCS = \ globalization.c diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 631c7ad2449..ebe7ccc4704 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -38,14 +38,6 @@ /* kernel32.dll */ static INT (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); -/* combase.dll */ -static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); -static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); -static void (WINAPI *pRoUninitialize)(void); -static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); -static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); -static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); - static void test_GlobalizationPreferences(void) { @@ -56,28 +48,29 @@ static void test_GlobalizationPreferences(void) IActivationFactory *factory = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; HSTRING str, tmp_str; + const WCHAR *buf; BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - hr = pRoInitialize(RO_INIT_MULTITHREADED); + hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); - hr = pWindowsCreateString(class_name, wcslen(class_name), &str); + hr = WindowsCreateString(class_name, wcslen(class_name), &str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); - hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); - pWindowsDeleteString(str); - pRoUninitialize(); + WindowsDeleteString(str); + RoUninitialize(); return; } @@ -103,7 +96,7 @@ static void test_GlobalizationPreferences(void) hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); if (pGetUserDefaultGeoName) { @@ -116,7 +109,7 @@ static void test_GlobalizationPreferences(void) len, wine_dbgstr_w(buf), wine_dbgstr_w(country)); } - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); @@ -138,7 +131,7 @@ static void test_GlobalizationPreferences(void) hr = IVectorView_HSTRING_GetAt(languages, 0, &tmp_str); ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), @@ -151,9 +144,9 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == TRUE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); - hr = pWindowsCreateString(L"deadbeef", 8, &tmp_str); + hr = WindowsCreateString(L"deadbeef", 8, &tmp_str); ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); i = 0xdeadbeef; @@ -162,7 +155,7 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); ok(i == 0 && found == FALSE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); @@ -178,14 +171,14 @@ static void test_GlobalizationPreferences(void) ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); ok(i == 1, "IVectorView_HSTRING_GetMany returned count %u, expected 1\n", i); - buf = pWindowsGetStringRawBuffer(tmp_str, &len); + buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); ok(wcslen(locale) == len && !memcmp(buf, locale, len), "IGlobalizationPreferencesStatics_get_Languages 0 returned len %u, str %s, expected %s\n", len, wine_dbgstr_w(buf), wine_dbgstr_w(locale)); - pWindowsDeleteString(tmp_str); + WindowsDeleteString(tmp_str); IVectorView_HSTRING_Release(languages); @@ -229,35 +222,14 @@ static void test_GlobalizationPreferences(void) IInspectable_Release(inspectable); IActivationFactory_Release(factory); - pWindowsDeleteString(str); + WindowsDeleteString(str); - pRoUninitialize(); + RoUninitialize(); } START_TEST(globalization) { - HMODULE combase, kernel32; - - if (!(combase = LoadLibraryW(L"combase.dll"))) - { - win_skip("Failed to load combase.dll, skipping tests\n"); - return; - } - -#define LOAD_FUNCPTR(x) \ - if (!(p##x = (void*)GetProcAddress(combase, #x))) \ - { \ - win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ - return; \ - } - - LOAD_FUNCPTR(RoGetActivationFactory); - LOAD_FUNCPTR(RoInitialize); - LOAD_FUNCPTR(RoUninitialize); - LOAD_FUNCPTR(WindowsCreateString); - LOAD_FUNCPTR(WindowsDeleteString); - LOAD_FUNCPTR(WindowsGetStringRawBuffer); -#undef LOAD_FUNCPTR + HMODULE kernel32; kernel32 = GetModuleHandleA("kernel32"); pGetUserDefaultGeoName = (void*)GetProcAddress(kernel32, "GetUserDefaultGeoName");

1 0