December 2019 - Wine-devel - list.winehq.org

[PATCH v2 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

1 0

[PATCH v2 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

1 0

[PATCH v2 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

1 0

[PATCH v2 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

1 0

[PATCH v2] winegstreamer: Recognize the "video/x-cinepak" type.
by Zebediah Figura 23 Dec '19

23 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove an unused variable dlls/winegstreamer/gstdemux.c | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..e67efd58eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -853,12 +888,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

1 0

[PATCH 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

2 2

[PATCH] msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX.
by Erich E. Hoover 23 Dec '19

23 Dec '19

Apparently cl.exe treats floats as doubles and compares them against FLT_MAX before converting them (see Bug #48324). It would be really nice if people didn't use constants that are more precise than the number format actually supports... Best, Erich

1 0

[PATCH 1/2] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.
by Rémi Bernon 23 Dec '19

23 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this is the correct fix to the failing dinput mouse test. The test fails because the focus is changed back to the second window after it's been created, when the WM_TAKE_FOCUS event actually arrives: as we do not wait for the X11 focus to be set on CreateWindow, it can create an additional and unexpected focus change later on. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..2649d561a6b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -594,14 +594,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -709,7 +717,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -718,7 +726,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -726,7 +734,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -806,9 +814,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1426,6 +1442,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1441,6 +1458,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial so that + we ignore all older focus-related events. This prevents the focus + from being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + thread_data->setfocus_serial = NextRequest(thread_data->display); + XNoOp(thread_data->display); + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..e9b827c7e9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -333,6 +333,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.24.1

1 2

[PATCH] winex11.drv: Always set focus to managed window when requested.
by Rémi Bernon 23 Dec '19

23 Dec '19

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented. We used the WM_MOUSEACTIVATE even when changing focus using Alt-Tab for example, and in this case Windows changes focus regardless of the WM_MOUSEACTIVATE reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I expect this is going to break dinput mouse test on testbot again, as 71d35d8940118bc6de6522913fb8c473fa5b2c24 was "fixing" it. The problem came from the "set focus on mouse hover" setting, Windows has no such mechanism I believe, but then we shouldn't try to prevent focus from changing when using this setting. It should either be disabled, or taken into account in the test by not moving the mouse over another window. I can modify the test if that's what we want to do, but I'm assuming the test was moving the cursor over the original window on purpose. dlls/winex11.drv/event.c | 7 ++++++- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..69012e5b8cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -700,7 +700,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); - if (can_activate_window(hwnd)) + if (is_managed(hwnd)) + { + set_focus( event->display, hwnd, event_time ); + return; + } + else if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..89ea42b7567 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -169,7 +169,7 @@ struct has_popup_result BOOL found; }; -static BOOL is_managed( HWND hwnd ) +BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); BOOL ret = data && data->managed; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..d4f21024634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -605,6 +605,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { -- 2.24.1

3 2

[PATCH 1/3] ole32/tests: Use heap-based object for custom moniker.
by Nikolay Sivov 23 Dec '19

23 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 138 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 42bc094522..2e1e00adc8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -34,6 +34,7 @@ #include "initguid.h" #include "wine/test.h" +#include "wine/heap.h" #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) @@ -246,9 +247,30 @@ static const IUnknownVtbl HeapUnknown_Vtbl = HeapUnknown_Release }; +struct test_moniker +{ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG refcount; + + BOOL no_IROTData; +}; + +static struct test_moniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IMoniker_iface); +} + +static struct test_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); +} + static HRESULT WINAPI -MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + if (!ppvObject) return E_INVALIDARG; @@ -260,7 +282,11 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; if (IsEqualIID(&IID_IROTData, riid)) + { CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); + if (!moniker->no_IROTData) + *ppvObject = &moniker->IROTData_iface; + } if ((*ppvObject)==0) return E_NOINTERFACE; @@ -273,13 +299,20 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI Moniker_AddRef(IMoniker* iface) { - return 2; + struct test_moniker *moniker = impl_from_IMoniker(iface); + return InterlockedIncrement(&moniker->refcount); } static ULONG WINAPI Moniker_Release(IMoniker* iface) { - return 1; + struct test_moniker *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + if (!refcount) + heap_free(moniker); + + return refcount; } static HRESULT WINAPI @@ -457,53 +490,25 @@ Moniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) return S_FALSE; } -static const IMonikerVtbl MonikerNoROTDataVtbl = -{ - MonikerNoROTData_QueryInterface, - Moniker_AddRef, - Moniker_Release, - Moniker_GetClassID, - Moniker_IsDirty, - Moniker_Load, - Moniker_Save, - Moniker_GetSizeMax, - Moniker_BindToObject, - Moniker_BindToStorage, - Moniker_Reduce, - Moniker_ComposeWith, - Moniker_Enum, - Moniker_IsEqual, - Moniker_Hash, - Moniker_IsRunning, - Moniker_GetTimeOfLastChange, - Moniker_Inverse, - Moniker_CommonPrefixWith, - Moniker_RelativePathTo, - Moniker_GetDisplayName, - Moniker_ParseDisplayName, - Moniker_IsSystemMoniker -}; - -static IMoniker MonikerNoROTData = { &MonikerNoROTDataVtbl }; - -static IMoniker Moniker; - static HRESULT WINAPI ROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - return IMoniker_QueryInterface(&Moniker, riid, ppvObject); + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppvObject); } static ULONG WINAPI ROTData_AddRef(IROTData *iface) { - return 2; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); } static ULONG WINAPI ROTData_Release(IROTData* iface) { - return 1; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); } static HRESULT WINAPI @@ -529,35 +534,6 @@ static IROTDataVtbl ROTDataVtbl = ROTData_GetComparisonData }; -static IROTData ROTData = { &ROTDataVtbl }; - -static HRESULT WINAPI -Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - if (!ppvObject) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - if (IsEqualIID(&IID_IROTData, riid)) - { - CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); - *ppvObject = &ROTData; - } - - if ((*ppvObject)==0) - return E_NOINTERFACE; - - IMoniker_AddRef(iface); - - return S_OK; -} - static const IMonikerVtbl MonikerVtbl = { Moniker_QueryInterface, @@ -585,7 +561,17 @@ static const IMonikerVtbl MonikerVtbl = Moniker_IsSystemMoniker }; -static IMoniker Moniker = { &MonikerVtbl }; +static struct test_moniker *create_test_moniker(void) +{ + struct test_moniker *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + obj->IMoniker_iface.lpVtbl = &MonikerVtbl; + obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->refcount = 1; + + return obj; +} static void test_ROT(void) { @@ -594,6 +580,7 @@ static void test_ROT(void) '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; IMoniker *pMoniker = NULL; + struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; DWORD dwCookie; static const char *methods_register_no_ROTData[] = @@ -634,19 +621,22 @@ static void test_ROT(void) hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); + test_moniker = create_test_moniker(); + test_moniker->no_IROTData = TRUE; + expected_method_list = methods_register_no_ROTData; external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + &test_moniker->IMoniker_iface, &dwCookie); + ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); expected_method_list = methods_isrunning_no_ROTData; - hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -658,15 +648,16 @@ static void test_ROT(void) expected_method_list = methods_register; /* try with our own moniker */ + test_moniker->no_IROTData = FALSE; hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie); + (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok_more_than_one_lock(); expected_method_list = methods_isrunning; - hr = IRunningObjectTable_IsRunning(pROT, &Moniker); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -719,6 +710,7 @@ static void test_ROT(void) ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); + IMoniker_Release(&test_moniker->IMoniker_iface); IRunningObjectTable_Release(pROT); } -- 2.24.0

1 2