wine-devel May 2020

wine-devel@winehq.org

79 participants
626 discussions

[PATCH v2 1/6] ntoskrnl.exe: Implement PsGetProcessSectionBaseAddress() function.
by Paul Gofman 31 May '20

31 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fbf6262b3eb..cd2143dbf99 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4248,3 +4248,33 @@ void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); } + +void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process) +{ + void *image_base; + NTSTATUS status; + SIZE_T size; + HANDLE h; + + TRACE("process %p.\n", process); + + if ((status = ObOpenObjectByPointer(process, 0, NULL, PROCESS_ALL_ACCESS, NULL, KernelMode, &h))) + { + WARN("Error opening process object, status %#x.\n", status); + return NULL; + } + + status = NtReadVirtualMemory(h, &process->info.PebBaseAddress->ImageBaseAddress, + &image_base, sizeof(image_base), &size); + + NtClose(h); + + if (status || size != sizeof(image_base)) + { + WARN("Error reading process memory, status %#x, size %lu.\n", status, size); + return NULL; + } + + TRACE("returning %p.\n", image_base); + return image_base; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2b7f57e895f..21bb4cc2584 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -904,7 +904,7 @@ @ stub PsGetProcessJob @ stub PsGetProcessPeb @ stub PsGetProcessPriorityClass -@ stub PsGetProcessSectionBaseAddress +@ stdcall PsGetProcessSectionBaseAddress(ptr) @ stub PsGetProcessSecurityPort @ stub PsGetProcessSessionId @ stub PsGetProcessWin32Process diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 2b05fda7118..b9f8295db88 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -229,6 +229,7 @@ NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_ void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); +void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); -- 2.26.2

1 5

[PATCH 1/6] ntoskrnl.exe: Implement PsGetProcessSectionBaseAddress() function.
by Paul Gofman 31 May '20

31 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fbf6262b3eb..8d9a3e308ce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4248,3 +4248,33 @@ void WINAPI KeSignalCallDpcDone(void *barrier) { InterlockedDecrement((LONG *)barrier); } + +void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process) +{ + void *image_base; + NTSTATUS status; + SIZE_T size; + HANDLE h; + + TRACE("process %p.\n", process); + + if (!(h = OpenProcess( PROCESS_ALL_ACCESS, FALSE, process->info.UniqueProcessId))) + { + WARN("Could not open process %#04lx.\n", process->info.UniqueProcessId); + return NULL; + } + + status = NtReadVirtualMemory(h, &process->info.PebBaseAddress->ImageBaseAddress, + &image_base, sizeof(image_base), &size); + + NtClose(h); + + if (status || size != sizeof(image_base)) + { + WARN("Error reading process memory, status %#x, size %lu.\n", status, size); + return NULL; + } + + TRACE("returning %p.\n", image_base); + return image_base; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2b7f57e895f..21bb4cc2584 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -904,7 +904,7 @@ @ stub PsGetProcessJob @ stub PsGetProcessPeb @ stub PsGetProcessPriorityClass -@ stub PsGetProcessSectionBaseAddress +@ stdcall PsGetProcessSectionBaseAddress(ptr) @ stub PsGetProcessSecurityPort @ stub PsGetProcessSessionId @ stub PsGetProcessWin32Process diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 2b05fda7118..b9f8295db88 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -229,6 +229,7 @@ NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_ void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); +void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); -- 2.26.2

3 8

[PATCH 1/3] makedep: Align PE sections so they can be mmapped.
by Rémi Bernon 31 May '20

31 May '20

This should help linux perf tool match the binary files on disk with the code regions in memory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is my old perf patch series rebased and using the recent CROSSDEBUG variable to get split debug info. I'm assuming that the only use cases are PDB split debug info or DWARF split debug info into ELF files for perf, as I don't know any other, but if having DWARF debug in PE files is actually useful for something then these patches are incorrect. I could also see that some CROSSDEBUG checks look for "split" prefix in makedep, and some other set the variable to dwarf. It's not clear to me what this variable is supposed to be set to (other than "pdb"). Does "dwarf" mean separate file as well? tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 536d2263e35f..250250382fa8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3317,6 +3317,7 @@ static void output_module( struct makefile *make ) if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", debug_file )); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); + output_filename( make->is_cross ? "-Wl,--file-alignment,4096" : "" ); output( "\n" ); if (make->unixobj_files.count) -- 2.26.1

4 11

[PATCH] msasn1: Add stub for ASN1_Decode function
by Vijay Kiran Kamuju 31 May '20

31 May '20

ASN1decoding_t and ASN1encoding_t are implemented as linked lists. Current implementation does not properly emulate the linked list, as we need to identify where the next link pointers are stored. This patch adds a stub for ASN1_Decode function so that second crash related to the bug #38020 can be avoided and close the bug. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] api-ms-win-downlevel-kernel32-l2-1-0: new dll
by Austin English 31 May '20

31 May '20

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-downlevel-kernel32-l2-1-0.spec | 122 ++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 125 insertions(+) create mode 100644 dlls/api-ms-win-downlevel-kernel32-l2-1-0/Makefile.in create mode 100644 dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec diff --git a/configure.ac b/configure.ac index c0f60fe694..dda8ec95b1 100644 --- a/configure.ac +++ b/configure.ac @@ -2985,6 +2985,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-config-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-devices-query-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-advapi32-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-kernel32-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-downlevel-shell32-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/Makefile.in b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/Makefile.in new file mode 100644 index 0000000000..fb89e55d58 --- /dev/null +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-downlevel-kernel32-l2-1-0.dll diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec new file mode 100644 index 0000000000..d4ed0f4a1a --- /dev/null +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec @@ -0,0 +1,122 @@ +@ stdcall AddAtomA(str) kernel32.AddAtomA +@ stdcall AddAtomW(wstr) kernel32.AddAtomW +@ stdcall BackupRead(ptr ptr long ptr long long ptr) kernel32.BackupRead +@ stdcall BackupWrite(ptr ptr long ptr long long ptr) kernel32.BackupWrite +@ stdcall BindIoCompletionCallback(long ptr long) kernel32.BindIoCompletionCallback +@ stdcall ConvertFiberToThread() kernel32.ConvertFiberToThread +@ stdcall ConvertThreadToFiber(ptr) kernel32.ConvertThreadToFiber +@ stdcall CopyFileA(str str long) kernel32.CopyFileA +@ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW +@ stdcall CreateFiber(long ptr ptr) kernel32.CreateFiber +@ stdcall CreateFileMappingA(long ptr long long long str) kernel32.CreateFileMappingA +@ stub CreateFileTransactedW +@ stdcall CreateMailslotA(str long long ptr) kernel32.CreateMailslotA +@ stdcall CreateNamedPipeA(str long long long long long long ptr) kernel32.CreateNamedPipeA +@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall DeleteAtom(long) kernel32.DeleteAtom +@ stdcall DeleteFiber(ptr) kernel32.DeleteFiber +@ stdcall DnsHostnameToComputerNameW(wstr ptr ptr) kernel32.DnsHostnameToComputerNameW +@ stdcall DosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime +@ stdcall FindAtomA(str) kernel32.FindAtomA +@ stdcall FindAtomW(wstr) kernel32.FindAtomW +@ stdcall FindResourceA(long str str) kernel32.FindResourceA +@ stdcall FindResourceExA(long str str long) kernel32.FindResourceExA +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW +@ stdcall GetActiveProcessorCount(long) kernel32.GetActiveProcessorCount +@ stdcall GetAtomNameA(long ptr long) kernel32.GetAtomNameA +@ stdcall GetAtomNameW(long ptr long) kernel32.GetAtomNameW +@ stdcall GetComputerNameA(ptr ptr) kernel32.GetComputerNameA +@ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stub GetDurationFormatEx +@ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) kernel32.GetFirmwareEnvironmentVariableW +@ stub GetMaximumProcessorGroupCount +@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId +@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId +@ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA +@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) kernel32.GetPrivateProfileIntW +@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) kernel32.GetPrivateProfileSectionW +@ stdcall GetPrivateProfileStringA(str str str ptr long str) kernel32.GetPrivateProfileStringA +@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW +@ stdcall GetProcessAffinityMask(long ptr ptr) kernel32.GetProcessAffinityMask +@ stdcall GetProcessIoCounters(long ptr) kernel32.GetProcessIoCounters +@ stdcall GetProfileIntA(str str long) kernel32.GetProfileIntA +@ stdcall GetProfileIntW(wstr wstr long) kernel32.GetProfileIntW +@ stdcall GetProfileSectionA(str ptr long) kernel32.GetProfileSectionA +@ stdcall GetProfileSectionW(wstr ptr long) kernel32.GetProfileSectionW +@ stdcall GetProfileStringA(str str str ptr long) kernel32.GetProfileStringA +@ stdcall GetProfileStringW(wstr wstr wstr ptr long) kernel32.GetProfileStringW +@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA +@ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA +@ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA +@ stdcall GetSystemPowerStatus(ptr) kernel32.GetSystemPowerStatus +@ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA +@ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW +@ stdcall GetTapeParameters(ptr long ptr ptr) kernel32.GetTapeParameters +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetThreadSelectorEntry(long long ptr) kernel32.GetThreadSelectorEntry +@ stdcall GlobalAddAtomA(str) kernel32.GlobalAddAtomA +@ stdcall GlobalAddAtomW(wstr) kernel32.GlobalAddAtomW +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalDeleteAtom(long) kernel32.GlobalDeleteAtom +@ stdcall GlobalFindAtomA(str) kernel32.GlobalFindAtomA +@ stdcall GlobalFindAtomW(wstr) kernel32.GlobalFindAtomW +@ stdcall GlobalFlags(long) kernel32.GlobalFlags +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall GlobalGetAtomNameA(long ptr long) kernel32.GlobalGetAtomNameA +@ stdcall GlobalGetAtomNameW(long ptr long) kernel32.GlobalGetAtomNameW +@ stdcall GlobalHandle(ptr) kernel32.GlobalHandle +@ stdcall GlobalLock(long) kernel32.GlobalLock +@ stdcall GlobalMemoryStatus(ptr) kernel32.GlobalMemoryStatus +@ stdcall GlobalReAlloc(long long long) kernel32.GlobalReAlloc +@ stdcall GlobalSize(long) kernel32.GlobalSize +@ stdcall GlobalUnlock(long) kernel32.GlobalUnlock +@ stdcall InitAtomTable(long) kernel32.InitAtomTable +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFlags(long) kernel32.LocalFlags +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalSize(long) kernel32.LocalSize +@ stdcall LocalUnlock(long) kernel32.LocalUnlock +@ stdcall MoveFileA(str str) kernel32.MoveFileA +@ stdcall MoveFileExA(str str long) kernel32.MoveFileExA +@ stdcall MoveFileW(wstr wstr) kernel32.MoveFileW +@ stdcall MulDiv(long long long) kernel32.MulDiv +@ stdcall OpenFile(str ptr long) kernel32.OpenFile +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stub RaiseFailFastException +@ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject +@ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA +@ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes +@ stub SetFirmwareEnvironmentVariableW +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo +@ stdcall SetProcessAffinityMask(long long) kernel32.SetProcessAffinityMask +@ stdcall SetThreadAffinityMask(long long) kernel32.SetThreadAffinityMask +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW +@ stdcall SwitchToFiber(ptr) kernel32.SwitchToFiber +@ stdcall UnregisterWait(long) kernel32.UnregisterWait +@ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId +@ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects +@ stdcall WritePrivateProfileSectionA(str str str) kernel32.WritePrivateProfileSectionA +@ stdcall WritePrivateProfileSectionW(wstr wstr wstr) kernel32.WritePrivateProfileSectionW +@ stdcall WritePrivateProfileStringA(str str str str) kernel32.WritePrivateProfileStringA +@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW +@ stdcall lstrcatW(wstr wstr) kernel32.lstrcatW +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcpyW(ptr wstr) kernel32.lstrcpyW +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlenW(wstr) kernel32.lstrlenW + diff --git a/tools/make_specfiles b/tools/make_specfiles index 6ce990c107..420d850b73 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -288,6 +288,7 @@ my @dll_groups = "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-processtopology-obsolete-l1-1-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-downlevel-kernel32-l2-1-0", "ext-ms-win-kernel32-package-current-l1-1-0", "ext-ms-win-kernel32-package-l1-1-1", ], -- 2.26.2

1 0

[PATCH] winapi_test: Add/remove headers for urlmon test, in tests.dat.
by Serge Gautherie 30 May '20

30 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..57a65e1 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1261,9 +1261,9 @@ Unit tests for data structure packing %header -basetsd.h winnt.h windef.h +guiddef.h urlmon.h %include -- 2.10.0.windows.1

2 1

[PATCH v2 07/12] quartz/tests: Fix -Wabsolute-value warnings.
by Jacek Caban 30 May '20

30 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: llabs() is not available on msvcrt (although previous version would usually work because compilers optimize it). This version brings more compare_double fixes based on msvcrt tests. dlls/quartz/tests/filtergraph.c | 18 ++++++++++++------ dlls/quartz/tests/systemclock.c | 8 +++++++- dlls/quartz/tests/vmr9.c | 21 +++++++++++---------- 3 files changed, 30 insertions(+), 17 deletions(-)

2 1

[PATCH 1/5] amstream: Move initialization code from audio_stream_create into AMAudioStream::Initialize and ::JoinAMMultiMediaStream.
by Anton Baskanov 30 May '20

30 May '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/audiostream.c | 50 +++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 265c3bf9f2..a38cbc5f63 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -502,11 +502,24 @@ static HRESULT WINAPI audio_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, REFMSPID purpose_id, const STREAM_TYPE stream_type) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); + TRACE("stream %p, source_object %p, flags %x, purpose_id %s, stream_type %u.\n", stream, source_object, flags, + debugstr_guid(purpose_id), stream_type); - return S_FALSE; + if (!purpose_id) + return E_POINTER; + + if (source_object) + FIXME("Specifying a stream object is not yet supported.\n"); + + if (flags & AMMSF_CREATEPEER) + FIXME("AMMSF_CREATEPEER is not yet supported.\n"); + + stream->purpose_id = *purpose_id; + stream->stream_type = stream_type; + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) @@ -530,13 +543,15 @@ static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTE } static HRESULT WINAPI audio_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, - IAMMultiMediaStream *am_multi_media_stream) + IAMMultiMediaStream *mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - return S_FALSE; + stream->parent = (IMultiMediaStream *)mmstream; + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *filter) @@ -1262,12 +1277,10 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { struct audio_stream *object; + HRESULT hr; TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - if (stream_object) - FIXME("Specifying a stream object is not yet supported.\n"); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -1279,12 +1292,23 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, object->ref = 1; InitializeCriticalSection(&object->cs); - object->parent = parent; - object->purpose_id = *purpose_id; - object->stream_type = stream_type; list_init(&object->receive_queue); list_init(&object->update_queue); + hr = IAMMediaStream_Initialize(&object->IAMMediaStream_iface, stream_object, 0, purpose_id, stream_type); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } + + hr = IAMMediaStream_JoinAMMultiMediaStream(&object->IAMMediaStream_iface, (IAMMultiMediaStream *)parent); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } + *media_stream = &object->IAMMediaStream_iface; return S_OK; -- 2.17.1

3 10

[PATCH v3 1/3] d3dcompiler: Store derefs as an offset to a variable.
by Zebediah Figura 30 May '20

30 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Always emit a mul expr in new_array_deref(), now that we're storing the offset in components. dlls/d3dcompiler_43/d3dcompiler_private.h | 24 +--- dlls/d3dcompiler_43/hlsl.y | 131 ++++++++++++---------- dlls/d3dcompiler_43/utils.c | 76 ++----------- 3 files changed, 86 insertions(+), 145 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 387e932a6cc..31cf1ed582d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -841,30 +841,10 @@ struct hlsl_ir_swizzle DWORD swizzle; }; -enum hlsl_ir_deref_type -{ - HLSL_IR_DEREF_VAR, - HLSL_IR_DEREF_ARRAY, - HLSL_IR_DEREF_RECORD, -}; - struct hlsl_deref { - enum hlsl_ir_deref_type type; - union - { - struct hlsl_ir_var *var; - struct - { - struct hlsl_ir_node *array; - struct hlsl_ir_node *index; - } array; - struct - { - struct hlsl_ir_node *record; - struct hlsl_struct_field *field; - } record; - } v; + struct hlsl_ir_var *var; + struct hlsl_ir_node *offset; }; struct hlsl_ir_deref diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cc868757a26..f66553898f3 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -538,8 +538,7 @@ static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs return NULL; init_node(&assign->node, HLSL_IR_ASSIGNMENT, rhs->data_type, rhs->loc); - assign->lhs.type = HLSL_IR_DEREF_VAR; - assign->lhs.v.var = lhs; + assign->lhs.var = lhs; assign->rhs = rhs; if (type_is_single_reg(lhs->data_type)) assign->writemask = (1 << lhs->data_type->dimx) - 1; @@ -547,6 +546,21 @@ static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs return assign; } +static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) +{ + struct hlsl_type *type; + struct hlsl_ir_constant *c; + + if (!(type = new_hlsl_type(d3dcompiler_strdup("uint"), HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1))) + return NULL; + + if (!(c = d3dcompiler_alloc(sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, type, loc); + c->v.value.u[0] = n; + return c; +} + static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct source_location loc) { struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); @@ -557,61 +571,75 @@ static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct return NULL; } init_node(&deref->node, HLSL_IR_DEREF, var->data_type, loc); - deref->src.type = HLSL_IR_DEREF_VAR; - deref->src.v.var = var; + deref->src.var = var; return deref; } -static struct hlsl_ir_node *get_var_deref(struct hlsl_ir_node *node) +static struct hlsl_ir_deref *new_deref(struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, + struct hlsl_type *data_type, const struct source_location loc) { - struct hlsl_ir_assignment *assign; + struct hlsl_ir_node *add = NULL; struct hlsl_ir_deref *deref; struct hlsl_ir_var *var; - char name[27]; - if (node->type == HLSL_IR_DEREF) - return node; + if (var_node->type == HLSL_IR_DEREF) + { + const struct hlsl_deref *src = &deref_from_node(var_node)->src; - sprintf(name, "<deref-%p>", node); - if (!(var = new_synthetic_var(name, node->data_type, node->loc))) - return NULL; + var = src->var; + if (src->offset) + { + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset, loc))) + return NULL; + list_add_after(&offset->entry, &add->entry); + offset = add; + } + } + else + { + struct hlsl_ir_assignment *assign; + char name[27]; - TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(node->type)); + sprintf(name, "<deref-%p>", var_node); + if (!(var = new_synthetic_var(name, var_node->data_type, var_node->loc))) + return NULL; - if (!(assign = make_simple_assignment(var, node))) - return NULL; - list_add_after(&node->entry, &assign->node.entry); + TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(var_node->type)); + + if (!(assign = make_simple_assignment(var, var_node))) + return NULL; - if (!(deref = new_var_deref(var, var->loc))) + list_add_after(&var_node->entry, &assign->node.entry); + } + + if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) return NULL; - list_add_after(&assign->node.entry, &deref->node.entry); - return &deref->node; + init_node(&deref->node, HLSL_IR_DEREF, data_type, loc); + deref->src.var = var; + deref->src.offset = offset; + list_add_after(&offset->entry, &deref->node.entry); + return deref; } static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, - struct hlsl_struct_field *field, const struct source_location loc) + const struct hlsl_struct_field *field, const struct source_location loc) { - struct hlsl_ir_deref *deref; + struct hlsl_ir_constant *c; - if (!(record = get_var_deref(record))) + if (!(c = new_uint_constant(field->reg_offset * 4, loc))) return NULL; + list_add_after(&record->entry, &c->node.entry); - if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) - return NULL; - - init_node(&deref->node, HLSL_IR_DEREF, field->type, loc); - deref->src.type = HLSL_IR_DEREF_RECORD; - deref->src.v.record.record = record; - deref->src.v.record.field = field; - return deref; + return new_deref(record, &c->node, field->type, loc); } static struct hlsl_ir_deref *new_array_deref(struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct source_location loc) { const struct hlsl_type *expr_type = array->data_type; - struct hlsl_ir_deref *deref; struct hlsl_type *data_type; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *mul; TRACE("Array dereference from type %s.\n", debug_hlsl_type(expr_type)); @@ -621,6 +649,7 @@ static struct hlsl_ir_deref *new_array_deref(struct hlsl_ir_node *array, } else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) { + /* This needs to be lowered now, while we still have type information. */ FIXME("Index of matrix or vector type.\n"); return NULL; } @@ -633,17 +662,15 @@ static struct hlsl_ir_deref *new_array_deref(struct hlsl_ir_node *array, return NULL; } - if (!(array = get_var_deref(array))) + if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) return NULL; - - if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) + list_add_after(&index->entry, &c->node.entry); + if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node, loc))) return NULL; + list_add_after(&c->node.entry, &mul->entry); + index = mul; - init_node(&deref->node, HLSL_IR_DEREF, data_type, loc); - deref->src.type = HLSL_IR_DEREF_ARRAY; - deref->src.v.array.array = array; - deref->src.v.array.index = index; - return deref; + return new_deref(array, index, data_type, loc); } static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, @@ -2748,22 +2775,6 @@ static unsigned int index_instructions(struct list *instrs, unsigned int index) return index; } -/* Walk the chain of derefs and retrieve the actual variable we care about. */ -static struct hlsl_ir_var *hlsl_var_from_deref(const struct hlsl_deref *deref) -{ - switch (deref->type) - { - case HLSL_IR_DEREF_VAR: - return deref->v.var; - case HLSL_IR_DEREF_ARRAY: - return hlsl_var_from_deref(&deref_from_node(deref->v.array.array)->src); - case HLSL_IR_DEREF_RECORD: - return hlsl_var_from_deref(&deref_from_node(deref->v.record.record)->src); - } - assert(0); - return NULL; -} - /* Compute the earliest and latest liveness for each variable. In the case that * a variable is accessed inside of a loop, we promote its liveness to extend * to at least the range of the entire loop. Note that we don't need to do this @@ -2781,10 +2792,12 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_ASSIGNMENT: { struct hlsl_ir_assignment *assignment = assignment_from_node(instr); - var = hlsl_var_from_deref(&assignment->lhs); + var = assignment->lhs.var; if (!var->first_write) var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; assignment->rhs->last_read = instr->index; + if (assignment->lhs.offset) + assignment->lhs.offset->last_read = instr->index; break; } case HLSL_IR_CONSTANT: @@ -2800,10 +2813,10 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs case HLSL_IR_DEREF: { struct hlsl_ir_deref *deref = deref_from_node(instr); - var = hlsl_var_from_deref(&deref->src); + var = deref->src.var; var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; - if (deref->src.type == HLSL_IR_DEREF_ARRAY) - deref->src.v.array.index->last_read = instr->index; + if (deref->src.offset) + deref->src.offset->last_read = instr->index; break; } case HLSL_IR_EXPR: diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ac9da97f27c..4b1f99de65d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1437,29 +1437,6 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask return new_writemask; } -static BOOL validate_lhs_deref(const struct hlsl_ir_node *lhs) -{ - struct hlsl_ir_deref *deref; - - if (lhs->type != HLSL_IR_DEREF) - { - hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); - return FALSE; - } - - deref = deref_from_node(lhs); - - if (deref->src.type == HLSL_IR_DEREF_VAR) - return TRUE; - if (deref->src.type == HLSL_IR_DEREF_ARRAY) - return validate_lhs_deref(deref->src.v.array.array); - if (deref->src.type == HLSL_IR_DEREF_RECORD) - return validate_lhs_deref(deref->src.v.record.record); - - assert(0); - return FALSE; -} - struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { @@ -1513,12 +1490,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign lhs = lhs_inner; } - if (!validate_lhs_deref(lhs)) - { - d3dcompiler_free(assign); - return NULL; - } - TRACE("Creating proper assignment expression.\n"); if (writemask == BWRITERSP_WRITEMASK_ALL) type = lhs->data_type; @@ -1562,26 +1533,12 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign enum hlsl_ir_expr_op op = op_from_assignment(assign_op); struct hlsl_ir_node *expr; - if (assign->lhs.type != HLSL_IR_DEREF_VAR) - { - FIXME("LHS expression not supported in compound assignments yet.\n"); - assign->rhs = rhs; - } - else - { - TRACE("Adding an expression for the compound assignment.\n"); - expr = new_binary_expr(op, lhs, rhs, lhs->loc); - list_add_after(&rhs->entry, &expr->entry); - assign->rhs = expr; - } - } - else - { - list_remove(&lhs->entry); - /* Don't recursively free the deref; we just copied its members. */ - d3dcompiler_free(lhs); - assign->rhs = rhs; + TRACE("Adding an expression for the compound assignment.\n"); + expr = new_binary_expr(op, lhs, rhs, lhs->loc); + list_add_after(&rhs->entry, &expr->entry); + rhs = expr; } + assign->rhs = rhs; return &assign->node; } @@ -1879,23 +1836,14 @@ static void debug_dump_ir_var(const struct hlsl_ir_var *var) static void debug_dump_deref(const struct hlsl_deref *deref) { - switch (deref->type) + wine_dbg_printf("deref("); + debug_dump_ir_var(deref->var); + wine_dbg_printf(")"); + if (deref->offset) { - case HLSL_IR_DEREF_VAR: - wine_dbg_printf("deref("); - debug_dump_ir_var(deref->v.var); - wine_dbg_printf(")"); - break; - case HLSL_IR_DEREF_ARRAY: - debug_dump_src(deref->v.array.array); - wine_dbg_printf("["); - debug_dump_src(deref->v.array.index); - wine_dbg_printf("]"); - break; - case HLSL_IR_DEREF_RECORD: - debug_dump_src(deref->v.record.record); - wine_dbg_printf(".%s", debugstr_a(deref->v.record.field->name)); - break; + wine_dbg_printf("["); + debug_dump_src(deref->offset); + wine_dbg_printf("]"); } } -- 2.26.2

6 12

[PATCH v2 resend] winapi: Update 'perl -w' to 'use warnings 'all''.
by Serge Gautherie 29 May '20

29 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/c_function.pm | 1 + tools/winapi/c_parser.pm | 1 + tools/winapi/c_type.pm | 1 + tools/winapi/config.pm | 1 + tools/winapi/function.pm | 1 + tools/winapi/make_filter | 3 ++- tools/winapi/make_filter_options.pm | 4 +++- tools/winapi/make_parser.pm | 1 + tools/winapi/modules.pm | 1 + tools/winapi/msvcmaker | 3 ++- tools/winapi/msvcmaker_options.pm | 4 +++- tools/winapi/nativeapi.pm | 1 + tools/winapi/options.pm | 2 ++ tools/winapi/output.pm | 2 ++ tools/winapi/preprocessor.pm | 1 + tools/winapi/setup.pm | 1 + tools/winapi/tests.pm | 1 + tools/winapi/type.pm | 1 + tools/winapi/util.pm | 1 + tools/winapi/winapi.pm | 1 + tools/winapi/winapi_check | 3 ++- tools/winapi/winapi_check_options.pm | 8 ++++++-- tools/winapi/winapi_documentation.pm | 1 + tools/winapi/winapi_extract | 3 ++- tools/winapi/winapi_extract_options.pm | 4 +++- tools/winapi/winapi_function.pm | 4 +++- tools/winapi/winapi_global.pm | 1 + tools/winapi/winapi_local.pm | 1 + tools/winapi/winapi_module_user.pm | 1 + tools/winapi/winapi_parser.pm | 1 + tools/winapi/winapi_test | 3 ++- tools/winapi/winapi_test_options.pm | 4 +++- 32 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 773c6b2..4bef581 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -19,6 +19,7 @@ package c_function; use strict; +use warnings 'all'; sub new($) { diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d42e04a..77e524f 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -19,6 +19,7 @@ package c_parser; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index c6aeb6a..ba1aec2 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -19,6 +19,7 @@ package c_type; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index fd45dc7..ceba90a 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -19,6 +19,7 @@ package config; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm index c53daa6..2bc2c4c 100644 --- a/tools/winapi/function.pm +++ b/tools/winapi/function.pm @@ -19,6 +19,7 @@ package function; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index 45665de..f080706 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # # Copyright 1999, 2000, 2001 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/make_filter$%; diff --git a/tools/winapi/make_filter_options.pm b/tools/winapi/make_filter_options.pm index 0cb81cd..7008487 100644 --- a/tools/winapi/make_filter_options.pm +++ b/tools/winapi/make_filter_options.pm @@ -17,9 +17,11 @@ # package make_filter_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 773c5f3..2f5788d 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -19,6 +19,7 @@ package make_parser; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index cbf1a2a..0651a7f 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -19,6 +19,7 @@ package modules; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index a18eb97..864b2b7 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1,8 +1,9 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/msvcmaker$%; diff --git a/tools/winapi/msvcmaker_options.pm b/tools/winapi/msvcmaker_options.pm index 32bdffd..242dcb9 100644 --- a/tools/winapi/msvcmaker_options.pm +++ b/tools/winapi/msvcmaker_options.pm @@ -17,9 +17,11 @@ # package msvcmaker_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 4804486..bc58d96 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -19,6 +19,7 @@ package nativeapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 3daeb11..2254852 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -19,6 +19,7 @@ package options; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -58,6 +59,7 @@ sub parse_value($$) { package _options; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm index f2c8d79..381570a 100644 --- a/tools/winapi/output.pm +++ b/tools/winapi/output.pm @@ -19,6 +19,7 @@ package output; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -34,6 +35,7 @@ $output = '_output'->new; package _output; use strict; +use warnings 'all'; my $stdout_isatty = -t STDOUT; my $stderr_isatty = -t STDERR; diff --git a/tools/winapi/preprocessor.pm b/tools/winapi/preprocessor.pm index 3d49773..796f7df 100644 --- a/tools/winapi/preprocessor.pm +++ b/tools/winapi/preprocessor.pm @@ -19,6 +19,7 @@ package preprocessor; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index 60a35c5..ed08460 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -19,6 +19,7 @@ package setup; use strict; +use warnings 'all'; BEGIN { use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); diff --git a/tools/winapi/tests.pm b/tools/winapi/tests.pm index 142538c..6553da3 100644 --- a/tools/winapi/tests.pm +++ b/tools/winapi/tests.pm @@ -19,6 +19,7 @@ package tests; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/type.pm b/tools/winapi/type.pm index 8f66780..b18383a 100644 --- a/tools/winapi/type.pm +++ b/tools/winapi/type.pm @@ -19,6 +19,7 @@ package type; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm index 6697d56..8f400da 100644 --- a/tools/winapi/util.pm +++ b/tools/winapi/util.pm @@ -19,6 +19,7 @@ package util; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); require Exporter; diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index c770465..62b4311 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -19,6 +19,7 @@ package winapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 61a0635..bfc9fc7 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 1999-2002 Patrik Stridvall # @@ -28,6 +28,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_check$%; diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index 23abb1f..8e17744 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -17,9 +17,11 @@ # package winapi_check_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -161,9 +163,11 @@ my $options_usage = "usage: winapi_check [--help] [<files>]\n"; $options = '_winapi_check_options'->new(\%options_long, \%options_short, $options_usage); package _winapi_check_options; -use base qw(_options); use strict; +use warnings 'all'; + +use base qw(_options); sub report_module($$) { my $self = shift; diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index d959e11..2be7c8c 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -19,6 +19,7 @@ package winapi_documentation; use strict; +use warnings 'all'; use config qw($current_dir $wine_dir); use modules qw($modules); diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 1d165b9..b53fbcf 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_extract$%; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index 0e5754e..5126ba4 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -17,9 +17,11 @@ # package winapi_extract_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 633e9ea..d4cfb72 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -17,9 +17,11 @@ # package winapi_function; -use base qw(function); use strict; +use warnings 'all'; + +use base qw(function); use config qw($current_dir $wine_dir); use util qw(normalize_set); diff --git a/tools/winapi/winapi_global.pm b/tools/winapi/winapi_global.pm index 38c0dfe..bb1403c 100644 --- a/tools/winapi/winapi_global.pm +++ b/tools/winapi/winapi_global.pm @@ -19,6 +19,7 @@ package winapi_global; use strict; +use warnings 'all'; use modules qw($modules); use nativeapi qw($nativeapi); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 42dd146..a9aef17 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -19,6 +19,7 @@ package winapi_local; use strict; +use warnings 'all'; use nativeapi qw($nativeapi); use options qw($options); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index ef14453..53bce8e 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -19,6 +19,7 @@ package winapi_module_user; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3703837..87e286f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -19,6 +19,7 @@ package winapi_parser; use strict; +use warnings 'all'; use output qw($output); use options qw($options); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f..8051591 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_test$%; diff --git a/tools/winapi/winapi_test_options.pm b/tools/winapi/winapi_test_options.pm index 240e840..c422b65 100644 --- a/tools/winapi/winapi_test_options.pm +++ b/tools/winapi/winapi_test_options.pm @@ -17,9 +17,11 @@ # package winapi_test_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; -- 2.10.0.windows.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2020