September 2019 - Wine-Commits

Dmitry Timoshkov : localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 24a16c0037fd7c0f0d15c6980e4cc77ea642e89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a16c0037fd7c0f0d15c698… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:45 2019 +0800 localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/localmon.c | 2 +- dlls/localspl/provider.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 6937e05..e634a33 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -777,7 +777,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) { static MONITOREX mymonitorex = { - sizeof(MONITOREX) - sizeof(DWORD), + sizeof(MONITOR), { localmon_EnumPortsW, localmon_OpenPortW, diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4627284..7a12751 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -504,7 +504,9 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pmonitorEx) { /* Layout of MONITOREX and MONITOR2 mostly matches */ - memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor))); + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor))); + /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */ + pm->monitor.cbSize += sizeof(void *); pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; pm->monitor.pfnXcvOpenPort = NULL; }

1 0

Zebediah Figura : winegstreamer: Handle GST_EVENT_RECONFIGURE.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 3619ff751796b014f3f13fb2858989f9607c7f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3619ff751796b014f3f13fb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:06 2019 -0500 winegstreamer: Handle GST_EVENT_RECONFIGURE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41afc22..61e75b0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -408,6 +408,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) FIXME("%p (%u) stub\n", event, event->type); case GST_EVENT_TAG: case GST_EVENT_QOS: + case GST_EVENT_RECONFIGURE: return gst_pad_event_default(pad, parent, event); } return TRUE;

1 0

Zebediah Figura : winegstreamer: Get rid of the GSTInPin structure.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: d6e2deef19906499b827f8070042a2afee2f7a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e2deef19906499b827f807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:04 2019 -0500 winegstreamer: Get rid of the GSTInPin structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 164 +++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e2deef19906499b827…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 01b19b63a454aa455928c10c694895fdba901aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b19b63a454aa455928c10c… Author: Kim Malmo <berencamlost(a)msn.com> Date: Sun Sep 8 10:00:48 2019 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 72 ++++++------------------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0b6284a..2e345fc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer " +"Wine fant ikke wine-mono pakken, som er nødvendig for at .NET programmer " "skal fungere ordentlig. Wine kan laste ned og installere denne pakken for " "deg.\n" "\n" @@ -7333,10 +7333,8 @@ msgid "Stream descriptor is not selected.\n" msgstr "Enheten er ikke koblet til.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Indeksen mangler.\n" +msgstr "Kilde mangler.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -11161,10 +11159,6 @@ msgid "" msgstr "Tidsformatet til \"song pointer\" og SMPTE kan ikke brukes sammen." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11185,10 +11179,6 @@ msgid "An error occurred with the specified port." msgstr "En feil oppstod med den oppgitte porten." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15339,7 +15329,7 @@ msgstr "Vanlig metafil-framviser" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafiler (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15510,16 +15500,12 @@ msgid "Drive configuration" msgstr "Oppsett av stasjoner" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Klarte ikke koble til monteringsbehandleren; diskstasjonene kan derfor ikke " -"redigeres." +"Klarte ikke koble til monteringsbehandleren; stasjonsoppsettet kan derfor " +"ikke redigeres." #: winecfg.rc:236 msgid "A&dd..." @@ -15804,12 +15790,6 @@ msgid "System drive" msgstr "Systemstasjon" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16888,10 +16868,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdokument (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstdokument (*.txt)" +msgstr "Unicode-tekstdokumenter (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17093,42 +17071,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17192,7 +17134,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" -"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" +"[/K] Kopier filegenskaper; uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Dmitry Timoshkov : localspl: Fix MONITOR2 callback prototypes.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 01d6835835e44cbc5a3d2be3ba8810ade943806d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d6835835e44cbc5a3d2be3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:48 2019 +0800 localspl: Fix MONITOR2 callback prototypes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- include/ddk/winsplp.h | 17 ++++---- 2 files changed, 105 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d6835835e44cbc5a3d…

1 0

Dmitry Timoshkov : winsplp.h: Fix MONITORINIT definition.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: a471c42b8fa73633edf6509790350b9c0e57a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a471c42b8fa73633edf65097… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:52 2019 +0800 winsplp.h: Fix MONITORINIT definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/winsplp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 3776ba6..162f673 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -155,6 +155,7 @@ typedef struct _MONITORINIT { HANDLE hckRegistryRoot; PMONITORREG pMonitorReg; BOOL bLocal; + LPCWSTR pszServerName; } MONITORINIT, *PMONITORINIT; typedef struct _MONITORUI {

1 0

Dmitry Timoshkov : localspl: Use the monitor handle returned by InitializePrintMonitor2.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: e620a3f35900f318e4e303631cef81b4c63d6b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e620a3f35900f318e4e30363… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:41 2019 +0800 localspl: Use the monitor handle returned by InitializePrintMonitor2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index def3215..4627284 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -67,6 +67,7 @@ typedef struct { PMONITORUI monitorUI; MONITOR2 monitor; BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); + HANDLE hmon; HMODULE hdll; DWORD refcount; } monitor_t; @@ -329,7 +330,7 @@ static void monitor_unload(monitor_t * pm) list_remove(&pm->entry); if (pm->monitor.pfnShutdown) - pm->monitor.pfnShutdown(0); + pm->monitor.pfnShutdown(pm->hmon); FreeLibrary(pm->hdll); heap_free(pm->name); @@ -489,7 +490,10 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", monitor2, debugstr_w(driver), debugstr_w(regroot)); if (monitor2) + { memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + pm->hmon = hmon; + } } else if (pInitializePrintMonitor && regroot) { MONITOREX *pmonitorEx; @@ -596,7 +600,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) /* query the userinterface-dllname from the Portmonitor */ /* building (",XcvMonitor %s",pm->name) not needed yet */ if (pm->monitor.pfnXcvOpenPort) - res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pm->monitor.pfnXcvOpenPort(pm->hmon, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); else if (pm->old_XcvOpenPort) res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); TRACE("got %u with %p\n", res, hXcv); @@ -1245,7 +1249,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) if (printer->pm) { if (printer->pm->monitor.pfnXcvOpenPort) - printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + printer->pm->monitor.pfnXcvOpenPort(printer->pm->hmon, &printername[len], pDefault ? pDefault->DesiredAccess : 0, &printer->hXcv); else if (printer->pm->old_XcvOpenPort)

1 0

Alexandre Julliard : kernel32: Move QueryPerformanceCounter/ Frequency functions to ntdll.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: a311140f93fbcb4512e2cd31be027be31b4f4072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a311140f93fbcb4512e2cd31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 12:08:27 2019 +0200 kernel32: Move QueryPerformanceCounter/Frequency functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 45 ----------------------------------------- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/registry.c | 3 +-- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/time.c | 17 ++++++++++++++++ include/winternl.h | 2 ++ 7 files changed, 26 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 3f4f6c6..b360463 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,51 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/**************************************************************************** - * QueryPerformanceCounter (KERNEL32.@) - * - * Get the current value of the performance counter. - * - * PARAMS - * counter [O] Destination for the current counter reading - * - * RETURNS - * Success: TRUE. counter contains the current reading - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceFrequency. - */ -BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter) -{ - NtQueryPerformanceCounter( counter, NULL ); - return TRUE; -} - - -/**************************************************************************** - * QueryPerformanceFrequency (KERNEL32.@) - * - * Get the resolution of the performance counter. - * - * PARAMS - * frequency [O] Destination for the counter resolution - * - * RETURNS - * Success. TRUE. Frequency contains the resolution of the counter. - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceCounter. - */ -BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) -{ - LARGE_INTEGER counter; - NtQueryPerformanceCounter( &counter, frequency ); - return TRUE; -} - - /*********************************************************************** * GetSystemInfo [KERNEL32.@] * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c2cd10..566dfb3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1169,8 +1169,8 @@ @ stdcall -import QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord -@ stdcall QueryPerformanceCounter(ptr) -@ stdcall QueryPerformanceFrequency(ptr) +@ stdcall -import QueryPerformanceCounter(ptr) +@ stdcall -import QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fbeb58c..ee064c3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1204,8 +1204,8 @@ # @ stub QueryInterruptTimePrecise @ stdcall QueryMemoryResourceNotification(ptr ptr) # @ stub QueryOptionalDelayLoadedAPI -@ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter -@ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency +@ stdcall QueryPerformanceCounter(ptr) ntdll.RtlQueryPerformanceCounter +@ stdcall QueryPerformanceFrequency(ptr) ntdll.RtlQueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index adf9ef6..30c5e9f 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1368,8 +1368,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD pdb->HeaderLength = sizeof(*pdb); pdb->NumObjectTypes = 0; pdb->DefaultObject = 0; - QueryPerformanceCounter(&pdb->PerfTime); - QueryPerformanceFrequency(&pdb->PerfFreq); + NtQueryPerformanceCounter( &pdb->PerfTime, &pdb->PerfFreq ); data = pdb + 1; pdb->SystemNameOffset = sizeof(*pdb); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94e70e5..98a423a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -850,6 +850,8 @@ @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryPerformanceCounter(ptr) +@ stdcall RtlQueryPerformanceFrequency(ptr) @ stub RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627..91e5887 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -552,6 +552,23 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER return STATUS_SUCCESS; } +/****************************************************************************** + * RtlQueryPerformanceCounter [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceCounter( LARGE_INTEGER *counter ) +{ + counter->QuadPart = monotonic_counter(); + return TRUE; +} + +/****************************************************************************** + * RtlQueryPerformanceFrequency [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceFrequency( LARGE_INTEGER *frequency ) +{ + frequency->QuadPart = TICKSPERSEC; + return TRUE; +} /****************************************************************************** * NtGetTickCount (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 4715b05..3f2e07b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2799,6 +2799,8 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PU NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceCounter(LARGE_INTEGER*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*);

1 0

Francois Gouget : winemac.drv: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 98b1d68aac8d4195821ff69f6b8f49baadddd8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b1d68aac8d4195821ff69f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:24:49 2019 +0200 winemac.drv: Avoid an unneeded lstrlenW() call. Note that since tiptext is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a2c32b2..75bca5e 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -123,7 +123,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (icon->image) update_image = TRUE; - if (lstrlenW(icon->tiptext)) + if (*icon->tiptext) update_tooltip = TRUE; } else

1 0

Francois Gouget : ddrawex: Tweak the createDD() name to make CodeSpell happy.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: b035f5c74c9f8ff2fee8c9f6bc41967d0afd99f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b035f5c74c9f8ff2fee8c9f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:23:50 2019 +0200 ddrawex: Tweak the createDD() name to make CodeSpell happy. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/ddrawex.c | 4 ++-- dlls/ddrawex/tests/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7134a04..60d84fe 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -27,7 +27,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -46,7 +46,7 @@ static ULONG get_ref(IUnknown *o) static void RefCountTest(void) { - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index c6c02a8..3081cfe 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -29,7 +29,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -74,7 +74,7 @@ static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*te IDirectDrawSurface2 *surf3; IDirectDrawSurface4 *surf4; HRESULT hr; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; @@ -156,7 +156,7 @@ static void GetDCTest(void) static void CapsTest(void) { DDSURFACEDESC ddsd; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDrawSurface *surf; HRESULT hr; @@ -247,7 +247,7 @@ static void test_surface_from_dc3(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **)&dd3); ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); IDirectDraw_Release(dd1); @@ -314,7 +314,7 @@ static void test_surface_from_dc4(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); if (hr == E_NOINTERFACE) { win_skip("DirectDraw4 is not supported\n");

1 0