- Wine-Devel - list.winehq.org

[PATCH] po: Update Finnish translation.
by Lauri Kenttä Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index b814acb829f..a5f1c55eb38 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" -- 2.28.0

1 0

[PATCH 1/2] winmm: Add timeGetTime() implementation.
by Arkadiusz Hiler Aug. 27, 2020

Aug. 27, 2020

... and use it instead GetTickCount() within winmm. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- 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 7531bd6481f..313e9684e96 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 2b1e91fe98a..a78f9b5ac71 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 22c89852a2f..de2a3fbc61e 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 9075a78f343..eea29ea61e5 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 9c6ed2dfa83..d7c7379d77c 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) -- 2.28.0

2 4

[PATCH 6/6] conhost: Implement IOCTL_CONDRV_SET_MODE.
by Jacek Caban Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 10 ++++++++++ programs/conhost/conhost.c | 6 ++++++ 2 files changed, 16 insertions(+)

2 1

[v2 PATCH] shcore: Add GetScaleFactorForDevice() stub.
by Nikolay Sivov Aug. 27, 2020

Aug. 27, 2020

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed typo in the header. Thanks, Zebediah. dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f7..32649cccd9c 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e31..368fab19541 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62b..4689d83e7d9 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); -- 2.28.0

1 0

[PATCH v2 1/6] widl: Print full namespace name on error.
by Rémi Bernon Aug. 27, 2020

Aug. 27, 2020

Not really necessary as the errors are usually more cryptic, but nice to have when it fails there. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Tweak style in a few locations. tools/widl/parser.y | 10 ++++++++-- tools/widl/widltypes.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1c..98bd8949f13 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -118,7 +118,7 @@ static statement_list_t *append_statements(statement_list_t *, statement_list_t static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); static struct namespace global_namespace = { - NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) + NULL, NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) }; static struct namespace *current_namespace = &global_namespace; @@ -1833,6 +1833,12 @@ static void push_namespace(const char *name) if(!namespace) { namespace = xmalloc(sizeof(*namespace)); namespace->name = xstrdup(name); + if (!current_namespace->full_name) namespace->full_name = xstrdup(name); + else + { + namespace->full_name = xmalloc(strlen(current_namespace->full_name) + strlen(name) + 1); + sprintf(namespace->full_name, "%s.%s", current_namespace->full_name, name); + } namespace->parent = current_namespace; list_add_tail(&current_namespace->children, &namespace->entry); list_init(&namespace->children); @@ -1961,7 +1967,7 @@ static type_t *find_type_or_error(const char *name, int t) { type_t *type = find_type(name, NULL, t); if (!type) { - error_loc("type '%s' not found\n", name); + error_loc("type '%s' not found in %s\n", name, current_namespace->full_name); return NULL; } return type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..1634f9bd50b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -409,6 +409,7 @@ struct alias_details struct namespace { const char *name; + char *full_name; struct namespace *parent; struct list entry; struct list children; -- 2.28.0

1 5

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

Aug. 27, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- 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 112403a..ee0cf25 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 5b95863..2e7f14d 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); -- 2.21.0

2 1

[PATCH 5/6] conhost: Implement IOCTL_CONDRV_GET_MODE.
by Jacek Caban Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 8 ++++++-- programs/conhost/conhost.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 4/6] server: Forward screen buffer ioctls to conhost if possible.
by Jacek Caban Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

1 0

[PATCH 3/6] conhost: Initial support for screen buffers.
by Jacek Caban Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 100 ++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] server: Allow passing screen buffer ioctls to conhost.
by Jacek Caban Aug. 27, 2020

Aug. 27, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 4 ++++ server/console.c | 47 +++++++++++++++++++++++++++++++------------ server/protocol.def | 1 + 3 files changed, 39 insertions(+), 13 deletions(-)

1 0