August 2020 - Wine-Commits - list.winehq.org

Arkadiusz Hiler : winmm: Default to 1ms resolution like we used to.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: e01ef81379f078354ac8c1e5a11af0d807725e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01ef81379f078354ac8c1e5… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Aug 25 10:54:01 2020 +0300 winmm: Default to 1ms resolution like we used to. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index de2a3fbc61..9bb948efbd 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -74,17 +74,30 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) /* * Some observations on the behavior of winmm on Windows. - * First, the call to timeBeginPeriod(xx) can never be used - * to raise the timer resolution, only lower it. + * + * First, the call to timeBeginPeriod(xx) can never be used to + * lower the timer resolution (i.e. increase the update + * interval), only to increase the timer resolution (i.e. lower + * the update interval). * * Second, a brief survey of a variety of Win 2k and Win X * machines showed that a 'standard' (aka default) timer * resolution was 1 ms (Win9x is documented as being 1). However, one * machine had a standard timer resolution of 10 ms. * - * Further, if we set our default resolution to 1, - * the implementation of timeGetTime becomes GetTickCount(), - * and we can optimize the code to reduce overhead. + * Further, timeBeginPeriod(xx) also affects the resolution of + * wait calls such as NtDelayExecution() and + * NtWaitForMultipleObjects() which by default round up their + * timeout to the nearest multiple of 15.625ms across all Windows + * versions. In Wine all of those currently work with sub-1ms + * accuracy. + * + * Effective time resolution is a global value that is the max + * of the resolutions (i.e. min of update intervals) requested by + * all the processes. A lot of programs seem to do + * timeBeginPeriod(1) forcing it onto everyone else. + * + * Defaulting to 1ms accuracy in winmm should be safe. * * Additionally, a survey of Event behaviors shows that * if we request a Periodic event every 50 ms, then Windows @@ -97,6 +110,7 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) * no delays. * * Jeremy White, October 2004 + * Arkadiusz Hiler, August 2020 */ #define MMSYSTIME_MININTERVAL (1) #define MMSYSTIME_MAXINTERVAL (65535) @@ -255,7 +269,12 @@ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) */ DWORD WINAPI timeGetTime(void) { - return GetTickCount(); + LARGE_INTEGER now, freq; + + QueryPerformanceCounter(&now); + QueryPerformanceFrequency(&freq); + + return (now.QuadPart * 1000) / freq.QuadPart; } /**************************************************************************

1 0

Arkadiusz Hiler : winmm: Add timeGetTime() implementation.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 781d530e9c0d39aa117930317e7c1911d4829fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=781d530e9c0d39aa11793031… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Aug 25 10:54:00 2020 +0300 winmm: Add timeGetTime() implementation. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 4 ++-- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/time.c | 18 ++++++++++++------ dlls/winmm/winmm.c | 12 ++++++------ dlls/winmm/winmm.spec | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 7531bd6481..313e9684e9 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -202,12 +202,12 @@ static void test_api(void) if (winetest_interactive) { #define MAX_TIME 15000 - DWORD tick = GetTickCount(), spent; + DWORD tick = timeGetTime(), spent; infoex.ex.dwSize = sizeof(infoex.ex); infoex.ex.dwFlags = JOY_RETURNALL; do { - spent = GetTickCount() - tick; + spent = timeGetTime() - tick; ret = joyGetPosEx(joyid, &infoex.ex); if (ret == JOYERR_NOERROR) { diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 2b1e91fe98..a78f9b5ac7 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -555,7 +555,7 @@ static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR insta switch (msg) { case MM_MOM_POSITIONCB: if (records->count < ARRAY_SIZE(records->time_stamp)) - records->time_stamp[records->count] = GetTickCount(); + records->time_stamp[records->count] = timeGetTime(); records->count++; break; case MM_MOM_DONE: diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 22c89852a2..de2a3fbc61 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -131,7 +131,7 @@ static int TIME_MMSysTimeCallback(void) } timer = LIST_ENTRY( ptr, WINE_TIMERENTRY, entry ); - delta_time = timer->dwTriggerTime - GetTickCount(); + delta_time = timer->dwTriggerTime - timeGetTime(); if (delta_time > 0) break; list_remove( &timer->entry ); @@ -242,16 +242,22 @@ void TIME_MMTimeStop(void) */ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) { - if (wSize >= sizeof(*lpTime)) { - lpTime->wType = TIME_MS; - lpTime->u.ms = GetTickCount(); - + lpTime->wType = TIME_MS; + lpTime->u.ms = timeGetTime(); } return 0; } +/************************************************************************** + * timeGetTime [WINMM.@] + */ +DWORD WINAPI timeGetTime(void) +{ + return GetTickCount(); +} + /************************************************************************** * timeSetEvent [WINMM.@] */ @@ -272,7 +278,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, return 0; lpNewTimer->wDelay = wDelay; - lpNewTimer->dwTriggerTime = GetTickCount() + wDelay; + lpNewTimer->dwTriggerTime = timeGetTime() + wDelay; /* FIXME - wResol is not respected, although it is not clear that we could change our precision meaningfully */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 9075a78f34..eea29ea61e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1030,7 +1030,7 @@ static DWORD midistream_get_playing_position(WINE_MIDIStream* lpMidiStrm) case MSM_STATUS_PAUSED: return lpMidiStrm->dwElapsedMS; case MSM_STATUS_PLAYING: - return GetTickCount() - lpMidiStrm->dwStartTicks; + return timeGetTime() - lpMidiStrm->dwStartTicks; default: FIXME("Unknown playing status %hu\n", lpMidiStrm->status); return 0; @@ -1080,7 +1080,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ if (lpMidiStrm->status != MSM_STATUS_PLAYING) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwElapsedMS; + lpMidiStrm->dwStartTicks = timeGetTime() - lpMidiStrm->dwElapsedMS; lpMidiStrm->status = MSM_STATUS_PLAYING; LeaveCriticalSection(&lpMidiStrm->lock); } @@ -1090,7 +1090,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ if (lpMidiStrm->status != MSM_STATUS_PAUSED) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwElapsedMS = GetTickCount() - lpMidiStrm->dwStartTicks; + lpMidiStrm->dwElapsedMS = timeGetTime() - lpMidiStrm->dwStartTicks; lpMidiStrm->status = MSM_STATUS_PAUSED; LeaveCriticalSection(&lpMidiStrm->lock); } @@ -1126,7 +1126,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI case WINE_MSM_HEADER: /* sets initial tick count for first MIDIHDR */ if (!lpMidiStrm->dwStartTicks) - lpMidiStrm->dwStartTicks = GetTickCount(); + lpMidiStrm->dwStartTicks = timeGetTime(); lpMidiHdr = (LPMIDIHDR)msg->lParam; lpData = (LPBYTE)lpMidiHdr->lpData; TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%u/%u dwFlags=0x%08x size=%lu]\n", @@ -1235,8 +1235,8 @@ start_header: dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; - TRACE("%u/%u/%u\n", dwToGo, GetTickCount(), me->dwDeltaTime); - while (dwToGo - (dwCurrTC = GetTickCount()) <= MAXLONG) { + TRACE("%u/%u/%u\n", dwToGo, timeGetTime(), me->dwDeltaTime); + while (dwToGo - (dwCurrTC = timeGetTime()) <= MAXLONG) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, dwToGo - dwCurrTC, QS_ALLINPUT) == WAIT_OBJECT_0) { /* got a message, handle it */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 9c6ed2dfa8..d7c7379d77 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -147,7 +147,7 @@ @ stdcall timeEndPeriod(long) @ stdcall timeGetDevCaps(ptr long) @ stdcall timeGetSystemTime(ptr long) -@ stdcall timeGetTime() kernel32.GetTickCount +@ stdcall timeGetTime() @ stdcall timeKillEvent(long) @ stdcall timeSetEvent(long long ptr long long) @ stdcall waveInAddBuffer(long ptr long)

1 0

Gabriel Ivăncescu : msscript.ocx: Uncache the module objects when script is restarted, but not the Procedure count.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: b1e9b091eea8ce0e2a51b3834102fdb3211d73fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e9b091eea8ce0e2a51b383… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 26 16:36:29 2020 +0300 msscript.ocx: Uncache the module objects when script is restarted, but not the Procedure count. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 31 +++++++++++++++++-------------- dlls/msscript.ocx/tests/msscript.c | 20 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 112403a78c..ee0cf2537e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -355,8 +355,6 @@ static void uncache_module_objects(ScriptModule *module) ITypeComp_Release(module->script_typecomp); module->script_typecomp = NULL; } - if (module->procedures) - module->procedures->count = -1; } static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) @@ -369,12 +367,15 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } -static HRESULT start_script(ScriptHost *host) +static HRESULT start_script(ScriptModule *module) { HRESULT hr = S_OK; - if (host->script_state != SCRIPTSTATE_STARTED) - hr = set_script_state(host, SCRIPTSTATE_STARTED); + if (module->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(module->host, SCRIPTSTATE_STARTED); + if (SUCCEEDED(hr)) uncache_module_objects(module); + } return hr; } @@ -418,10 +419,12 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(module->host); + hr = start_script(module); if (FAILED(hr)) return hr; uncache_module_objects(module); + if (module->procedures) + module->procedures->count = -1; hr = IActiveScriptParse_ParseScriptText(module->host->parse, script_text, module->name, NULL, NULL, 0, 1, flag, res, &excepinfo); @@ -438,7 +441,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA HRESULT hr; UINT i; - hr = start_script(module->host); + hr = start_script(module); if (FAILED(hr)) return hr; hr = get_script_dispatch(module, &disp); @@ -1082,7 +1085,7 @@ static HRESULT WINAPI procedure_enum_Next(IEnumVARIANT *iface, ULONG celt, VARIA if (!rgVar) return E_POINTER; if (!This->procedures->module->host) return E_FAIL; - hr = start_script(This->procedures->module->host); + hr = start_script(This->procedures->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->procedures->module, &ti); @@ -1295,7 +1298,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCol if (!ppenumProcedures) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); + hr = start_script(This->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->module, &ti); @@ -1334,7 +1337,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollect if (!ppdispProcedure) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); + hr = start_script(This->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->module, &typeinfo); @@ -1414,11 +1417,11 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollec if (!plCount) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); - if (FAILED(hr)) return hr; - if (This->count == -1) { + hr = start_script(This->module); + if (FAILED(hr)) return hr; + hr = get_script_typeinfo(This->module, &ti); if (FAILED(hr)) return hr; @@ -1609,7 +1612,7 @@ static HRESULT WINAPI ScriptModule_get_CodeObject(IScriptModule *iface, IDispatc if (!This->host) return E_FAIL; - hr = start_script(This->host); + hr = start_script(This); if (FAILED(hr)) return hr; hr = get_script_dispatch(This, ppdispObject); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 5b958633da..2e7f14d6bd 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3855,7 +3855,19 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(GetTypeAttr); CHECK_CALLED(ReleaseTypeAttr); + /* Reset uncaches the objects, but not the count */ + SET_EXPECT(SetScriptState_INITIALIZED); + IScriptControl_Reset(sc); + CHECK_CALLED(SetScriptState_INITIALIZED); + count = 0; + hr = IScriptProcedureCollection_get_Count(procs, &count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + /* Try without ITypeComp interface */ + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(GetTypeInfo); SET_EXPECT(QI_ITypeComp); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"foobar"); @@ -3863,8 +3875,16 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == E_NOINTERFACE, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(GetTypeInfo); CHECK_CALLED(QI_ITypeComp); + count = 0; + hr = IScriptProcedureCollection_get_Count(procs, &count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + /* Make ITypeComp available */ TypeComp_available = TRUE; SET_EXPECT(QI_ITypeComp);

1 0

Nikolay Sivov : ole32: Use InternalIsProcessInitialized().
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 844cb4997ddc47a5c4edc7cd496d9fd6a69b9f88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=844cb4997ddc47a5c4edc7cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:49 2020 +0300 ole32: Use InternalIsProcessInitialized(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 22 +++++++++++++++++----- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 11 ----------- dlls/ole32/compobj_private.h | 3 --- dlls/ole32/moniker.c | 5 +++-- dlls/ole32/ole32.spec | 1 - 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 228260ba21..28a63c6c7f 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -113,8 +113,6 @@ static CRITICAL_SECTION_DEBUG psclsid_cs_debug = }; static CRITICAL_SECTION cs_registered_ps = { &psclsid_cs_debug, -1, 0, 0, 0, 0 }; -extern BOOL WINAPI InternalIsInitialized(void); - static struct init_spy *get_spy_entry(struct tlsdata *tlsdata, unsigned int id) { struct init_spy *spy; @@ -324,6 +322,20 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) return S_OK; } +/*********************************************************************** + * InternalIsProcessInitialized (combase.@) + */ +BOOL WINAPI InternalIsProcessInitialized(void) +{ + struct apartment *apt; + + if (!(apt = apartment_get_current_or_mta())) + return FALSE; + apartment_release(apt); + + return TRUE; +} + /*********************************************************************** * InternalTlsAllocData (combase.@) */ @@ -2020,7 +2032,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) TRACE("%s, %p\n", debugstr_guid(riid), pclsid); - if (!InternalIsInitialized()) + if (!InternalIsProcessInitialized()) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; @@ -2078,7 +2090,7 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) TRACE("%s, %s\n", debugstr_guid(riid), debugstr_guid(rclsid)); - if (!InternalIsInitialized()) + if (!InternalIsProcessInitialized()) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; @@ -2388,7 +2400,7 @@ HRESULT WINAPI CoGetContextToken(ULONG_PTR *token) TRACE("%p\n", token); - if (!InternalIsInitialized()) + if (!InternalIsProcessInitialized()) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f2f4506ae5..ea2177ca7b 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -263,7 +263,7 @@ @ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr) @ stdcall InternalIrotRevoke(long ptr ptr ptr) @ stub InternalIsApartmentInitialized -@ stub InternalIsProcessInitialized +@ stdcall InternalIsProcessInitialized() @ stub InternalMarshalObjRef @ stub InternalNotifyDDStartOrStop @ stub InternalOleModalLoopBlockFn diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 45187fc811..dfd81a8d0f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1608,17 +1608,6 @@ HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) return E_NOTIMPL; } -BOOL WINAPI InternalIsInitialized(void) -{ - struct apartment *apt; - - if (!(apt = apartment_get_current_or_mta())) - return FALSE; - apartment_release(apt); - - return TRUE; -} - typedef struct { IGlobalOptions IGlobalOptions_iface; LONG ref; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 5fc100e816..6e14d69e42 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -351,7 +351,4 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; -extern BOOL WINAPI InternalIsInitialized(void); -extern void WINAPI DestroyRunningObjectTable(void); - #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 874b58f99e..251c3c4784 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -35,7 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); - +/* Combase exports */ +BOOL WINAPI InternalIsProcessInitialized(void); HRESULT WINAPI InternalIrotRegister(const MonikerComparisonData *moniker_data, const InterfaceData *object, const InterfaceData *moniker, const FILETIME *time, DWORD flags, IrotCookie *cookie, IrotContextHandle *ctxt_handle); @@ -720,7 +721,7 @@ HRESULT WINAPI GetRunningObjectTable(DWORD reserved, IRunningObjectTable **ret) if (reserved!=0) return E_UNEXPECTED; - if (!InternalIsInitialized()) + if (!InternalIsProcessInitialized()) return CO_E_NOTINITIALIZED; *ret = &rot.IRunningObjectTable_iface; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9c6b9396e1..c4e7b594fb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -298,7 +298,6 @@ @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg @ stub WriteStringStream -@ stdcall InternalIsInitialized() @ stdcall InternalGetRegisteredClassObject(ptr ptr long ptr) @ stdcall InternalRevokeAllClasses(ptr) @ stdcall Internal_apartment_disconnectproxies(ptr)

1 0

Nikolay Sivov : combase: Move CoGetApartmentType().
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 373c753e996d0c38e56d4ca5f0d7f4c5f1ae9ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=373c753e996d0c38e56d4ca5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:47 2020 +0300 combase: Move CoGetApartmentType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 2 +- dlls/combase/combase.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 3 +-- dlls/combase/combase_private.h | 2 ++ dlls/ole32/compobj.c | 38 -------------------------------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/ole32.spec | 2 +- 7 files changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 1ce7021bef..2d1f7a7574 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -627,7 +627,7 @@ static struct apartment *apartment_get_or_create(DWORD model) return apt; } -struct apartment * WINAPI apartment_get_mta(void) +struct apartment * apartment_get_mta(void) { struct apartment *apt; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7d61faefa9..47e31ebad1 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2422,6 +2422,45 @@ HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) return S_OK; } +/*********************************************************************** + * CoGetApartmentType (combase.@) + */ +HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) +{ + struct tlsdata *tlsdata; + struct apartment *apt; + HRESULT hr; + + TRACE("%p, %p\n", type, qualifier); + + if (!type || !qualifier) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->apt) + *type = APTTYPE_CURRENT; + else if (tlsdata->apt->multi_threaded) + *type = APTTYPE_MTA; + else if (tlsdata->apt->main) + *type = APTTYPE_MAINSTA; + else + *type = APTTYPE_STA; + + *qualifier = APTTYPEQUALIFIER_NONE; + + if (!tlsdata->apt && (apt = apartment_get_mta())) + { + apartment_release(apt); + *type = APTTYPE_MTA; + *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + return S_OK; + } + + return tlsdata->apt ? S_OK : CO_E_NOTINITIALIZED; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 52c4ef51b2..143de28d7d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -96,7 +96,7 @@ @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID -@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @@ -356,7 +356,6 @@ @ stdcall enter_apartment(ptr long) @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) -@ stdcall apartment_get_mta() @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_global_cleanup() diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 32ffba0df8..1f80f1a12b 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -133,8 +133,10 @@ struct stub_manager HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model); void WINAPI leave_apartment(struct tlsdata *data); +void WINAPI apartment_release(struct apartment *apt); HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; +struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN; /* Stub Manager */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5adcd94b2c..975af46f85 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1771,44 +1771,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * CoGetApartmentType [OLE32.@] - */ -HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) -{ - struct oletls *info = COM_CurrentInfo(); - struct apartment *apt; - - TRACE("(%p, %p)\n", type, qualifier); - - if (!type || !qualifier) - return E_INVALIDARG; - - if (!info) - return E_OUTOFMEMORY; - - if (!info->apt) - *type = APTTYPE_CURRENT; - else if (info->apt->multi_threaded) - *type = APTTYPE_MTA; - else if (info->apt->main) - *type = APTTYPE_MAINSTA; - else - *type = APTTYPE_STA; - - *qualifier = APTTYPEQUALIFIER_NONE; - - if (!info->apt && (apt = apartment_get_mta())) - { - apartment_release(apt); - *type = APTTYPE_MTA; - *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; - return S_OK; - } - - return info->apt ? S_OK : CO_E_NOTINITIALIZED; -} - /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 2c8c337c64..9d6a1d1b79 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -257,7 +257,6 @@ struct class_reg_data; extern HRESULT WINAPI apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) DECLSPEC_HIDDEN; -extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7d3d1e2e6e..0b38e74388 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -26,7 +26,7 @@ @ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) combase.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState -@ stdcall CoGetApartmentType(ptr ptr) +@ stdcall CoGetApartmentType(ptr ptr) combase.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext @ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stdcall CoGetCallerTID(ptr)

1 0

Nikolay Sivov : combase: Move MTA usage functions.
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 66d912a7b59df690fe258e69075310b77d55117c URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d912a7b59df690fe258e69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:46 2020 +0300 combase: Move MTA usage functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 4 ++-- dlls/combase/combase.c | 21 +++++++++++++++++++++ dlls/combase/combase.spec | 6 ++---- dlls/combase/combase_private.h | 2 ++ dlls/ole32/compobj.c | 21 --------------------- dlls/ole32/compobj_private.h | 2 -- dlls/ole32/ole32.spec | 4 ++-- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 81071563c0..1ce7021bef 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1187,7 +1187,7 @@ struct mta_cookie struct list entry; }; -HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) +HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) { struct mta_cookie *mta_cookie; @@ -1211,7 +1211,7 @@ HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) return S_OK; } -void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) +void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) { struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index cddc9e2306..7d61faefa9 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2401,6 +2401,27 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) unlock_init_spies(tlsdata); } +/*********************************************************************** + * CoIncrementMTAUsage (combase.@) + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + TRACE("%p\n", cookie); + + return apartment_increment_mta_usage(cookie); +} + +/*********************************************************************** + * CoDecrementMTAUsage (combase.@) + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + TRACE("%p\n", cookie); + + apartment_decrement_mta_usage(cookie); + return S_OK; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 01377c8045..52c4ef51b2 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -86,7 +86,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -122,7 +122,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() -@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @@ -357,8 +357,6 @@ @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) @ stdcall apartment_get_mta() -@ stdcall apartment_decrement_mta_usage(ptr) -@ stdcall apartment_increment_mta_usage(ptr) @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_global_cleanup() diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 122522baad..32ffba0df8 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -133,6 +133,8 @@ struct stub_manager HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model); void WINAPI leave_apartment(struct tlsdata *data); +HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; +void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; /* Stub Manager */ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5afacf3ee3..5adcd94b2c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1809,27 +1809,6 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } -/*********************************************************************** - * CoIncrementMTAUsage [OLE32.@] - */ -HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) -{ - TRACE("%p\n", cookie); - - return apartment_increment_mta_usage(cookie); -} - -/*********************************************************************** - * CoDecrementMTAUsage [OLE32.@] - */ -HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) -{ - TRACE("%p\n", cookie); - - apartment_decrement_mta_usage(cookie); - return S_OK; -} - /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e910746fef..2c8c337c64 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -257,8 +257,6 @@ struct class_reg_data; extern HRESULT WINAPI apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) DECLSPEC_HIDDEN; -extern void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; -extern HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e80cafd366..7d3d1e2e6e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,7 +14,7 @@ @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx -@ stdcall CoDecrementMTAUsage(ptr) +@ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -48,7 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) combase.CoGetTreatAsClass @ stdcall CoImpersonateClient() combase.CoImpersonateClient -@ stdcall CoIncrementMTAUsage(ptr) +@ stdcall CoIncrementMTAUsage(ptr) combase.CoIncrementMTAUsage @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) combase.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity

1 0

Nikolay Sivov : combase: Move CoGetClassObject().
by Alexandre Julliard Aug. 27, 2020

Aug. 27, 2020

Module: wine Branch: master Commit: 5a2435cfff2feb930357571bfcd60c0b6df7a861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a2435cfff2feb930357571b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 11:37:48 2020 +0300 combase: Move CoGetClassObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 23 +--- dlls/combase/combase.c | 209 +++++++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 3 +- dlls/combase/combase_private.h | 34 ++++++ dlls/combase/rpc.c | 238 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj.c | 203 ----------------------------------- dlls/ole32/compobj_private.h | 5 - dlls/ole32/ole32.spec | 2 +- dlls/ole32/rpc.c | 228 --------------------------------------- 9 files changed, 481 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2435cfff2feb930357…

1 0

Biswapriyo Nath : include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 5aca2b07e587602eccaade401cfe5455a11f2ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aca2b07e587602eccaade40… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10sdklayers.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index b5b0d031ae..317f7c23e0 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -614,6 +614,20 @@ interface ID3D10Debug : IUnknown HRESULT Validate(); } +[ + local, + object, + uuid(9b7e4e02-342c-4106-a19f-4f2704f689f0), + pointer_default(unique) +] +interface ID3D10SwitchToRef : IUnknown +{ + BOOL SetUseRef( + [in] BOOL useref + ); + BOOL GetUseRef(); +} + [ local, object,

1 0

Biswapriyo Nath : include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 85da080aa2690f41c19453034537c40e76351146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85da080aa2690f41c1945303… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11sdklayers.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index e54ac01b03..54236fcdac 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -1239,6 +1239,19 @@ interface ID3D11Debug : IUnknown { HRESULT ValidateContextForDispatch(ID3D11DeviceContext *pContext); } +[ + object, + uuid(1ef337e3-58e7-4f83-a692-db221f5ed47e), + local, + pointer_default(unique) +] +interface ID3D11SwitchToRef : IUnknown { + BOOL SetUseRef( + [in] BOOL useref + ); + BOOL GetUseRef(); +} + [ object, uuid(6543dbb6-1b48-42f5-ab82-e97ec74326f6),

1 0

Biswapriyo Nath : include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: e9ec3560d4604f7e7d282b9a5cdbdec4b7880583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ec3560d4604f7e7d282b9a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 26 00:11:57 2020 +0530 include/d3d10sdklayers.idl: Add D3D10Debug interface. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10sdklayers.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index c6606d2fd6..b5b0d031ae 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -24,6 +24,10 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetMessage") cpp_quote("#endif") +const UINT D3D10_DEBUG_FEATURE_FLUSH_PER_RENDER_OP = 0x1; +const UINT D3D10_DEBUG_FEATURE_FINISH_PER_RENDER_OP = 0x2; +const UINT D3D10_DEBUG_FEATURE_PRESENT_PER_RENDER_OP = 0x4; + typedef enum D3D10_MESSAGE_CATEGORY { D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED, @@ -585,6 +589,31 @@ typedef struct D3D10_INFO_QUEUE_FILTER D3D10_INFO_QUEUE_FILTER_DESC DenyList; } D3D10_INFO_QUEUE_FILTER; +[ + local, + object, + uuid(9b7e4e01-342c-4106-a19f-4f2704f689f0), + pointer_default(unique) +] +interface ID3D10Debug : IUnknown +{ + HRESULT SetFeatureMask( + [in] UINT mask + ); + UINT GetFeatureMask(); + HRESULT SetPresentPerRenderOpDelay( + [in] UINT milliseconds + ); + UINT GetPresentPerRenderOpDelay(); + HRESULT SetSwapChain( + [in] IDXGISwapChain *swapchain + ); + HRESULT GetSwapChain( + [out] IDXGISwapChain **swapchain + ); + HRESULT Validate(); +} + [ local, object,

1 0