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

Nikolay Sivov : combase: Move CoGetClassObject().
by Alexandre Julliard 27 Aug '20

27 Aug '20

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

Nikolay Sivov : ole32: Use InternalIsProcessInitialized().
by Alexandre Julliard 27 Aug '20

27 Aug '20

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

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

27 Aug '20

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 613504869507d0111549b3c261ee2bac8408f429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=613504869507d0111549b3c2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 27 17:51:49 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index b814acb829..a5f1c55eb3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6791,10 +6791,8 @@ msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ei toteutettu" +msgstr "Ei toteutettu.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" @@ -12489,6 +12487,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Tuetut komennot -\n" +"\n" +"hardlink kovan linkin hallinta\n" #: fsutil.mc:35 msgid "" @@ -12496,10 +12497,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - Tuetut komennot -\n" +"\n" +"create luo kova linkki\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Syntaksi: fsutil hardlink create <uusi> <entinen>\n" #: hostname.rc:30 msgid "Usage: hostname\n" @@ -16490,10 +16494,8 @@ msgid "&Beginner" msgstr "&Aloittelija" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Rajapinta" +msgstr "&Keskitaso" #: winemine.rc:46 msgid "&Expert" @@ -16524,10 +16526,8 @@ msgid "Beginner" msgstr "Aloittelija" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Rajapinta" +msgstr "Keskitaso" #: winemine.rc:66 msgid "Expert"

1 0

Arkadiusz Hiler : winmm: Add timeGetTime() implementation.
by Alexandre Julliard 27 Aug '20

27 Aug '20

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

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

27 Aug '20

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

Jacek Caban : server: Move setting current screen_buffer into a helper.
by Alexandre Julliard 27 Aug '20

27 Aug '20

Module: wine Branch: master Commit: 8b5e0bdf8b9db3ab19bbabdb2ce591f5fc876ac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b5e0bdf8b9db3ab19bbabdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 15:03:43 2020 +0200 server: Move setting current screen_buffer into a helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/server/console.c b/server/console.c index 2c2978fc0c..00ad37ef35 100644 --- a/server/console.c +++ b/server/console.c @@ -594,11 +594,14 @@ static void disconnect_console_server( struct console_server *server ) } } -static void generate_sb_initial_events( struct console_input *console_input ) +static void set_active_screen_buffer( struct console_input *console_input, struct screen_buffer *screen_buffer ) { - struct screen_buffer *screen_buffer = console_input->active; struct condrv_renderer_event evt; + if (console_input->active == screen_buffer) return; + if (console_input->active) release_object( console_input->active ); + console_input->active = (struct screen_buffer *)grab_object( screen_buffer ); + evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; evt.u.resize.width = screen_buffer->width; evt.u.resize.height = screen_buffer->height; @@ -689,11 +692,7 @@ static struct object *create_console_output( struct console_input *console_input memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data, screen_buffer->width * sizeof(char_info_t) ); - if (!console_input->active) - { - console_input->active = (struct screen_buffer*)grab_object( screen_buffer ); - generate_sb_initial_events( console_input ); - } + if (!console_input->active) set_active_screen_buffer( console_input, screen_buffer ); return &screen_buffer->obj; } @@ -1270,21 +1269,6 @@ static void screen_buffer_destroy( struct object *obj ) assert( obj->ops == &screen_buffer_ops ); list_remove( &screen_buffer->entry ); - - if (screen_buffer->input && screen_buffer->input->active == screen_buffer) - { - struct screen_buffer *sb; - - screen_buffer->input->active = NULL; - LIST_FOR_EACH_ENTRY( sb, &screen_buffer_list, struct screen_buffer, entry ) - { - if (sb->input == screen_buffer->input) - { - sb->input->active = sb; - break; - } - } - } if (screen_buffer->fd) release_object( screen_buffer->fd ); free( screen_buffer->data ); free( screen_buffer->font.face_name ); @@ -1958,12 +1942,7 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 0; } - if (screen_buffer != screen_buffer->input->active) - { - if (screen_buffer->input->active) release_object( screen_buffer->input->active ); - screen_buffer->input->active = (struct screen_buffer *)grab_object( screen_buffer ); - generate_sb_initial_events( screen_buffer->input ); - } + set_active_screen_buffer( screen_buffer->input, screen_buffer ); return 1; case IOCTL_CONDRV_FILL_OUTPUT:

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_PEEK.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: aef321ec0f9b54cc07071e0757c57b73210f304c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef321ec0f9b54cc07071e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:53:03 2020 +0200 conhost: Implement IOCTL_CONDRV_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index d65a605f04..05a160f9cc 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -213,6 +213,17 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) ); + case IOCTL_CONDRV_PEEK: + { + void *result; + TRACE( "peek\n "); + if (in_size) return STATUS_INVALID_PARAMETER; + *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); + if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + if (*out_size) memcpy( result, console->records, *out_size ); + return STATUS_SUCCESS; + } + case IOCTL_CONDRV_GET_INPUT_INFO: { struct condrv_input_info *info;

1 0

Shawn M. Chapla : gdiplus: Remove outdated FIXME comment about compositing mode.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 1f8e40e46124845a10d940ca8e3abd12c1d07b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8e40e46124845a10d940ca… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:38 2020 -0400 gdiplus: Remove outdated FIXME comment about compositing mode. Removes an outdated comment about graphics compositing mode being unused. Graphics compositing mode has been used in pixel blending since a16a4d97. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f0da41c6cb..5702200324 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4781,7 +4781,6 @@ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } -/* FIXME: Compositing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, CompositingMode *mode) {

1 0

Shawn M. Chapla : gdiplus: Add missing allocation failure checks to graphics functions.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: c155b043fd62e2482d05fa62ad5382d96a2e9823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c155b043fd62e2482d05fa62… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Aug 25 18:13:39 2020 -0400 gdiplus: Add missing allocation failure checks to graphics functions. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5702200324..c3542b3d65 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5192,7 +5192,14 @@ GpStatus gdip_format_string(HDC hdc, } if (hotkeyprefix_count) + { hotkeyprefix_offsets = heap_alloc_zero(sizeof(INT) * hotkeyprefix_count); + if (!hotkeyprefix_offsets) + { + heap_free(stringdup); + return OutOfMemory; + } + } hotkeyprefix_count = 0; @@ -6555,6 +6562,7 @@ GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST G if(count<=0) return InvalidParameter; ptf = heap_alloc_zero(sizeof(GpPointF) * count); + if (!ptf) return OutOfMemory; for(i = 0;i < count; i++){ ptf[i].X = (REAL)points[i].X;

1 0