Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NETAPI32] Add the NetpAllocStrFromWStr helper function
by Eric Kohl 24 Aug '19

24 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61ac4f1ee9322834bef9a… commit 61ac4f1ee9322834bef9a99154af649e4a23fe0b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 24 14:00:33 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 24 14:00:33 2019 +0200 [NETAPI32] Add the NetpAllocStrFromWStr helper function --- dll/win32/netapi32/misc.c | 32 ++++++++++++++++++++++++++++++++ dll/win32/netapi32/netapi32.h | 5 +++++ dll/win32/netapi32/netapi32.spec | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dll/win32/netapi32/misc.c b/dll/win32/netapi32/misc.c index 129dda80484..8fa84a07c6b 100644 --- a/dll/win32/netapi32/misc.c +++ b/dll/win32/netapi32/misc.c @@ -167,6 +167,38 @@ NetpAllocAnsiStrFromWStr( } +PSTR +WINAPI +NetpAllocStrFromWStr( + _In_ PWSTR InString) +{ + UNICODE_STRING UnicodeString; + OEM_STRING OemString; + ULONG Size; + NET_API_STATUS NetStatus; + NTSTATUS Status; + + RtlInitUnicodeString(&UnicodeString, InString); + + Size = RtlUnicodeStringToOemSize(&UnicodeString); + NetStatus = NetApiBufferAllocate(Size, + (PVOID*)&OemString.Buffer); + if (NetStatus != NERR_Success) + return NULL; + + Status = RtlUnicodeStringToOemString(&OemString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + { + NetApiBufferFree(OemString.Buffer); + return NULL; + } + + return OemString.Buffer; +} + + PWSTR WINAPI NetpAllocWStrFromAnsiStr( diff --git a/dll/win32/netapi32/netapi32.h b/dll/win32/netapi32/netapi32.h index 35004bba368..4f4bcb63a43 100644 --- a/dll/win32/netapi32/netapi32.h +++ b/dll/win32/netapi32/netapi32.h @@ -69,6 +69,11 @@ WINAPI NetpAllocAnsiStrFromWStr( _In_ PWSTR InString); +PSTR +WINAPI +NetpAllocStrFromWStr( + _In_ PWSTR InString); + PWSTR WINAPI NetpAllocWStrFromAnsiStr( diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec index f4e88244641..75845a487a8 100644 --- a/dll/win32/netapi32/netapi32.spec +++ b/dll/win32/netapi32/netapi32.spec @@ -268,7 +268,7 @@ @ stub NetpAddTlnFtinfoEntry @ stub NetpAllocConfigName @ stub NetpAllocFtinfoEntry -@ stub NetpAllocStrFromWStr +@ stdcall NetpAllocStrFromWStr(wstr) @ stdcall NetpAllocWStrFromStr(str) @ stdcall NetpAllocWStrFromWStr(wstr) @ stub NetpApiStatusToNtStatus

1 0

[reactos] 01/01: [NETAPI32] Implement DsGetSiteNameA
by Eric Kohl 24 Aug '19

24 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d5c682cd8b620651e183… commit 3d5c682cd8b620651e1838fbdec7ea0243bac412 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 24 13:15:41 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 24 13:15:41 2019 +0200 [NETAPI32] Implement DsGetSiteNameA Also add the NetpAllocAnsiStrFromWStr helper function. --- dll/win32/netapi32/misc.c | 32 ++++++++++++++++++++++++++++++++ dll/win32/netapi32/netapi32.h | 5 +++++ dll/win32/netapi32/netlogon.c | 41 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dll/win32/netapi32/misc.c b/dll/win32/netapi32/misc.c index 5e541b693f7..129dda80484 100644 --- a/dll/win32/netapi32/misc.c +++ b/dll/win32/netapi32/misc.c @@ -135,6 +135,38 @@ NetUnregisterDomainNameChangeNotification( } +PSTR +WINAPI +NetpAllocAnsiStrFromWStr( + _In_ PWSTR InString) +{ + UNICODE_STRING UnicodeString; + ANSI_STRING AnsiString; + ULONG Size; + NET_API_STATUS NetStatus; + NTSTATUS Status; + + RtlInitUnicodeString(&UnicodeString, InString); + + Size = RtlUnicodeStringToAnsiSize(&UnicodeString); + NetStatus = NetApiBufferAllocate(Size, + (PVOID*)&AnsiString.Buffer); + if (NetStatus != NERR_Success) + return NULL; + + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + { + NetApiBufferFree(AnsiString.Buffer); + return NULL; + } + + return AnsiString.Buffer; +} + + PWSTR WINAPI NetpAllocWStrFromAnsiStr( diff --git a/dll/win32/netapi32/netapi32.h b/dll/win32/netapi32/netapi32.h index 7a839ef51ff..35004bba368 100644 --- a/dll/win32/netapi32/netapi32.h +++ b/dll/win32/netapi32/netapi32.h @@ -64,6 +64,11 @@ CopySidFromSidAndRid( _In_ PSID SrcSid, _In_ ULONG RelativeId); +PSTR +WINAPI +NetpAllocAnsiStrFromWStr( + _In_ PWSTR InString); + PWSTR WINAPI NetpAllocWStrFromAnsiStr( diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 98dc5c71632..fd93fad60f7 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -604,19 +604,52 @@ DsGetForestTrustInformationW( DWORD WINAPI DsGetSiteNameA( - _In_ LPCSTR ComputerName, + _In_opt_ LPCSTR ComputerName, _Out_ LPSTR *SiteName) { - FIXME("DsGetSiteNameA(%s, %p)\n", + PWSTR pComputerNameW = NULL; + PWSTR pSiteNameW = NULL; + DWORD dwError = ERROR_SUCCESS; + + TRACE("DsGetSiteNameA(%s, %p)\n", debugstr_a(ComputerName), SiteName); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (ComputerName != NULL) + { + pComputerNameW = NetpAllocWStrFromAnsiStr((PSTR)ComputerName); + if (pComputerNameW == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + } + + dwError = DsGetSiteNameW(pComputerNameW, + &pSiteNameW); + if (dwError != ERROR_SUCCESS) + goto done; + + *SiteName = NetpAllocAnsiStrFromWStr(pSiteNameW); + if (*SiteName == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + } + +done: + if (pSiteNameW != NULL) + NetApiBufferFree(pSiteNameW); + + if (pComputerNameW != NULL) + NetApiBufferFree(pComputerNameW); + + return dwError; } DWORD WINAPI DsGetSiteNameW( - _In_ LPCWSTR ComputerName, + _In_opt_ LPCWSTR ComputerName, _Out_ LPWSTR *SiteName) { NET_API_STATUS status;

1 0

[reactos] 01/01: [NTOSKRNL] Fix indentation. No code changes!
by Eric Kohl 24 Aug '19

24 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b129da05cc6b2c2e0f57… commit 0b129da05cc6b2c2e0f57821830010cd68dec445 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 24 10:02:55 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 24 10:02:55 2019 +0200 [NTOSKRNL] Fix indentation. No code changes! --- ntoskrnl/io/pnpmgr/pnpnotify.c | 379 ++++++++++++++++++++--------------------- 1 file changed, 189 insertions(+), 190 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpnotify.c b/ntoskrnl/io/pnpmgr/pnpnotify.c index eedf193e62f..089215071fd 100644 --- a/ntoskrnl/io/pnpmgr/pnpnotify.c +++ b/ntoskrnl/io/pnpmgr/pnpnotify.c @@ -34,196 +34,195 @@ LIST_ENTRY PnpNotifyListHead; VOID IopNotifyPlugPlayNotification( - IN PDEVICE_OBJECT DeviceObject, - IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, - IN LPCGUID Event, - IN PVOID EventCategoryData1, - IN PVOID EventCategoryData2) + IN PDEVICE_OBJECT DeviceObject, + IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, + IN LPCGUID Event, + IN PVOID EventCategoryData1, + IN PVOID EventCategoryData2) { - PPNP_NOTIFY_ENTRY ChangeEntry; - PLIST_ENTRY ListEntry; - PVOID NotificationStructure; - BOOLEAN CallCurrentEntry; - UNICODE_STRING GuidString; - NTSTATUS Status; - PDEVICE_OBJECT EntryDeviceObject = NULL; - - ASSERT(DeviceObject); - - KeAcquireGuardedMutex(&PnpNotifyListLock); - if (IsListEmpty(&PnpNotifyListHead)) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - - switch (EventCategory) - { - case EventCategoryDeviceInterfaceChange: - { - PDEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - RtlCopyMemory(&NotificationInfos->InterfaceClassGuid, EventCategoryData1, sizeof(GUID)); - NotificationInfos->SymbolicLinkName = (PUNICODE_STRING)EventCategoryData2; - Status = RtlStringFromGUID(&NotificationInfos->InterfaceClassGuid, &GuidString); - if (!NT_SUCCESS(Status)) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); - return; - } - break; - } - case EventCategoryHardwareProfileChange: - { - PHWPROFILE_CHANGE_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(HWPROFILE_CHANGE_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(HWPROFILE_CHANGE_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - break; - } - case EventCategoryTargetDeviceChange: - { - if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) - { - PTARGET_DEVICE_REMOVAL_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - NotificationInfos->Version = 1; - NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); - RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); - } - else - { - PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationInfos; - NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( - PagedPool, - sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION), - TAG_PNP_NOTIFY); - if (!NotificationInfos) - { - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - RtlCopyMemory(NotificationInfos, EventCategoryData1, sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION)); - } - break; - } - default: - { - DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); - KeReleaseGuardedMutex(&PnpNotifyListLock); - return; - } - } - - /* Loop through procedures registred in PnpNotifyListHead - * list to find those that meet some criteria. - */ - ListEntry = PnpNotifyListHead.Flink; - while (ListEntry != &PnpNotifyListHead) - { - ChangeEntry = CONTAINING_RECORD(ListEntry, PNP_NOTIFY_ENTRY, PnpNotifyList); - CallCurrentEntry = FALSE; - - if (ChangeEntry->EventCategory != EventCategory) - { - ListEntry = ListEntry->Flink; - continue; - } - - switch (EventCategory) - { - case EventCategoryDeviceInterfaceChange: - { - if (RtlCompareUnicodeString(&ChangeEntry->Guid, &GuidString, FALSE) == 0) - { - CallCurrentEntry = TRUE; - } - break; - } - case EventCategoryHardwareProfileChange: - { - CallCurrentEntry = TRUE; - break; - } - case EventCategoryTargetDeviceChange: - { - Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); - if (NT_SUCCESS(Status)) - { - if (DeviceObject == EntryDeviceObject) - { - if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) - { - ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - else - { - ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; - } - CallCurrentEntry = TRUE; - } - } - break; - } - default: - { - DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); - break; - } - } - - /* Move to the next element now, as callback may unregister itself */ - ListEntry = ListEntry->Flink; - /* FIXME: If ListEntry was the last element and that callback registers - * new notifications, those won't be checked... */ - - if (CallCurrentEntry) - { - /* Call entry into new allocated memory */ - DPRINT("IopNotifyPlugPlayNotification(): found suitable callback %p\n", - ChangeEntry); - - KeReleaseGuardedMutex(&PnpNotifyListLock); - (ChangeEntry->PnpNotificationProc)( - NotificationStructure, - ChangeEntry->Context); - KeAcquireGuardedMutex(&PnpNotifyListLock); - } - - } - KeReleaseGuardedMutex(&PnpNotifyListLock); - ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); - if (EventCategory == EventCategoryDeviceInterfaceChange) - RtlFreeUnicodeString(&GuidString); + PPNP_NOTIFY_ENTRY ChangeEntry; + PLIST_ENTRY ListEntry; + PVOID NotificationStructure; + BOOLEAN CallCurrentEntry; + UNICODE_STRING GuidString; + NTSTATUS Status; + PDEVICE_OBJECT EntryDeviceObject = NULL; + + ASSERT(DeviceObject); + + KeAcquireGuardedMutex(&PnpNotifyListLock); + if (IsListEmpty(&PnpNotifyListHead)) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + + switch (EventCategory) + { + case EventCategoryDeviceInterfaceChange: + { + PDEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + NotificationInfos->Version = 1; + NotificationInfos->Size = sizeof(DEVICE_INTERFACE_CHANGE_NOTIFICATION); + RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); + RtlCopyMemory(&NotificationInfos->InterfaceClassGuid, EventCategoryData1, sizeof(GUID)); + NotificationInfos->SymbolicLinkName = (PUNICODE_STRING)EventCategoryData2; + Status = RtlStringFromGUID(&NotificationInfos->InterfaceClassGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); + return; + } + break; + } + case EventCategoryHardwareProfileChange: + { + PHWPROFILE_CHANGE_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(HWPROFILE_CHANGE_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + NotificationInfos->Version = 1; + NotificationInfos->Size = sizeof(HWPROFILE_CHANGE_NOTIFICATION); + RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); + break; + } + case EventCategoryTargetDeviceChange: + { + if (Event != &GUID_PNP_CUSTOM_NOTIFICATION) + { + PTARGET_DEVICE_REMOVAL_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + NotificationInfos->Version = 1; + NotificationInfos->Size = sizeof(TARGET_DEVICE_REMOVAL_NOTIFICATION); + RtlCopyMemory(&NotificationInfos->Event, Event, sizeof(GUID)); + } + else + { + PTARGET_DEVICE_CUSTOM_NOTIFICATION NotificationInfos; + NotificationStructure = NotificationInfos = ExAllocatePoolWithTag( + PagedPool, + sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION), + TAG_PNP_NOTIFY); + if (!NotificationInfos) + { + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + RtlCopyMemory(NotificationInfos, EventCategoryData1, sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION)); + } + break; + } + default: + { + DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); + KeReleaseGuardedMutex(&PnpNotifyListLock); + return; + } + } + + /* Loop through procedures registred in PnpNotifyListHead + * list to find those that meet some criteria. + */ + ListEntry = PnpNotifyListHead.Flink; + while (ListEntry != &PnpNotifyListHead) + { + ChangeEntry = CONTAINING_RECORD(ListEntry, PNP_NOTIFY_ENTRY, PnpNotifyList); + CallCurrentEntry = FALSE; + + if (ChangeEntry->EventCategory != EventCategory) + { + ListEntry = ListEntry->Flink; + continue; + } + + switch (EventCategory) + { + case EventCategoryDeviceInterfaceChange: + { + if (RtlCompareUnicodeString(&ChangeEntry->Guid, &GuidString, FALSE) == 0) + { + CallCurrentEntry = TRUE; + } + break; + } + case EventCategoryHardwareProfileChange: + { + CallCurrentEntry = TRUE; + break; + } + case EventCategoryTargetDeviceChange: + { + Status = IoGetRelatedTargetDevice(ChangeEntry->FileObject, &EntryDeviceObject); + if (NT_SUCCESS(Status)) + { + if (DeviceObject == EntryDeviceObject) + { + if (Event == &GUID_PNP_CUSTOM_NOTIFICATION) + { + ((PTARGET_DEVICE_CUSTOM_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + else + { + ((PTARGET_DEVICE_REMOVAL_NOTIFICATION)NotificationStructure)->FileObject = ChangeEntry->FileObject; + } + CallCurrentEntry = TRUE; + } + } + break; + } + default: + { + DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); + break; + } + } + + /* Move to the next element now, as callback may unregister itself */ + ListEntry = ListEntry->Flink; + /* FIXME: If ListEntry was the last element and that callback registers + * new notifications, those won't be checked... */ + + if (CallCurrentEntry) + { + /* Call entry into new allocated memory */ + DPRINT("IopNotifyPlugPlayNotification(): found suitable callback %p\n", + ChangeEntry); + + KeReleaseGuardedMutex(&PnpNotifyListLock); + (ChangeEntry->PnpNotificationProc)(NotificationStructure, + ChangeEntry->Context); + KeAcquireGuardedMutex(&PnpNotifyListLock); + } + + } + KeReleaseGuardedMutex(&PnpNotifyListLock); + ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); + if (EventCategory == EventCategoryDeviceInterfaceChange) + RtlFreeUnicodeString(&GuidString); } /* PUBLIC FUNCTIONS **********************************************************/ @@ -280,7 +279,7 @@ IoRegisterPlugPlayNotification(IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory, return STATUS_INSUFFICIENT_RESOURCES; } - if (EventCategory == EventCategoryDeviceInterfaceChange && + if (EventCategory == EventCategoryDeviceInterfaceChange && EventCategoryFlags & PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES) { DEVICE_INTERFACE_CHANGE_NOTIFICATION NotificationInfos;

1 0

[reactos] 01/01: [TESTS] Add a test for spec2def
by Mark Jansen 23 Aug '19

23 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d2381631fb9b8672ae64… commit 6d2381631fb9b8672ae6495f16bcfb6074dbfbc5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 20 19:09:10 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 23 18:10:28 2019 +0200 [TESTS] Add a test for spec2def --- modules/rostests/tests/CMakeLists.txt | 1 + modules/rostests/tests/spec2def/CMakeLists.txt | 3 + modules/rostests/tests/spec2def/test.py | 113 +++++++++++++++++++++ modules/rostests/tests/spec2def/test.spec | 19 ++++ .../rostests/tests/spec2def/testdata/01-test.def | 14 +++ .../rostests/tests/spec2def/testdata/02-test.def | 13 +++ .../rostests/tests/spec2def/testdata/03-stubs.c | 17 ++++ .../rostests/tests/spec2def/testdata/03-test.def | 14 +++ .../rostests/tests/spec2def/testdata/04-stubs.c | 17 ++++ .../rostests/tests/spec2def/testdata/04-test.def | 13 +++ .../rostests/tests/spec2def/testdata/05-stubs.c | 59 +++++++++++ .../rostests/tests/spec2def/testdata/05-test.def | 14 +++ .../rostests/tests/spec2def/testdata/06-stubs.asm | 25 +++++ .../rostests/tests/spec2def/testdata/06-test.def | 14 +++ .../rostests/tests/spec2def/testdata/07-stubs.asm | 21 ++++ .../rostests/tests/spec2def/testdata/07-test.def | 13 +++ .../rostests/tests/spec2def/testdata/08-stubs.c | 17 ++++ .../rostests/tests/spec2def/testdata/08-test.def | 14 +++ .../rostests/tests/spec2def/testdata/09-stubs.c | 17 ++++ .../rostests/tests/spec2def/testdata/09-test.def | 13 +++ .../rostests/tests/spec2def/testdata/10-stubs.c | 59 +++++++++++ .../rostests/tests/spec2def/testdata/10-test.def | 14 +++ 22 files changed, 504 insertions(+) diff --git a/modules/rostests/tests/CMakeLists.txt b/modules/rostests/tests/CMakeLists.txt index 9e2f07c19de..78164342591 100644 --- a/modules/rostests/tests/CMakeLists.txt +++ b/modules/rostests/tests/CMakeLists.txt @@ -3,3 +3,4 @@ if(NOT MSVC) add_subdirectory(pseh2) endif() add_subdirectory(dllexport) +add_subdirectory(spec2def) diff --git a/modules/rostests/tests/spec2def/CMakeLists.txt b/modules/rostests/tests/spec2def/CMakeLists.txt new file mode 100644 index 00000000000..9553930a3a4 --- /dev/null +++ b/modules/rostests/tests/spec2def/CMakeLists.txt @@ -0,0 +1,3 @@ + +add_custom_target(spec2def_test + py -3 ${CMAKE_CURRENT_SOURCE_DIR}/test.py $<TARGET_FILE:native-spec2def>) diff --git a/modules/rostests/tests/spec2def/test.py b/modules/rostests/tests/spec2def/test.py new file mode 100644 index 00000000000..122af4f978f --- /dev/null +++ b/modules/rostests/tests/spec2def/test.py @@ -0,0 +1,113 @@ +import subprocess +import os +import tempfile +import sys +import difflib + +# ${_spec_file} = ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} +# spec2def -n=${_dllname} -a=${ARCH} ${ARGN} --implib -d=${BIN_PATH}/${_libname}_implib.def ${_spec_file} +# spec2def -n=${_dllname} -a=${ARCH} -d=${BIN_PATH}/${_file}.def -s=${BIN_PATH}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${_spec_file} +# spec2def --ms -a=${_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${_spec_file} +# spec2def --ms -a=${ARCH} -n=${_dllname} -d=${BIN_PATH}/${_file}.def -s=${BIN_PATH}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${_spec_file} + +SCRIPT_DIR = os.path.dirname(__file__) +SPEC_FILE = os.path.join(SCRIPT_DIR, 'test.spec') +DATA_DIR = os.path.join(SCRIPT_DIR, 'testdata') + +class ResultFile: + def __init__(self, datadir, filename): + self.filename = filename + with open(os.path.join(datadir, filename), 'r') as content: + self.data = content.read() + + def normalize(self): + data = self.data.splitlines() + data = [line for line in data if line] + return '\n'.join(data) + + +class TestCase: + def __init__(self, spec_args, prefix): + self.spec_args = spec_args + self.prefix = prefix + self.expect_files = [] + self.result_files = [] + self.stdout = self.stderr = None + self.returncode = None + + def run(self, cmd, tmpdir, all_datafiles): + datafiles = [filename for filename in all_datafiles if filename.startswith(self.prefix)] + self.expect_files = [ResultFile(DATA_DIR, datafile) for datafile in datafiles] + tmppath = os.path.join(tmpdir, self.prefix) + args = [elem.replace('$tmp$', tmppath) for elem in self.spec_args] + args = [cmd] + args + [SPEC_FILE] + proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + self.stdout, self.stderr = proc.communicate() + self.returncode = proc.returncode + self.result_files = [ResultFile(tmpdir, tmpfile) for tmpfile in os.listdir(tmpdir)] + + def verify(self): + if False: + for result in self.result_files: + with open(os.path.join(DATA_DIR, result.filename), 'w') as content: + content.write(result.data) + return + + if self.returncode != 0: + print('Failed return code', self.returncode, 'for', self.prefix) + return + self.expect_files.sort(key= lambda elem: elem.filename) + self.result_files.sort(key= lambda elem: elem.filename) + exp_len = len(self.expect_files) + res_len = len(self.result_files) + if exp_len != res_len: + print('Not enough files for', self.prefix, 'got:', res_len, 'wanted:', exp_len) + return + + for n in range(len(self.expect_files)): + exp = self.expect_files[n] + res = self.result_files[n] + if exp.normalize() == res.normalize(): + # Content 100% the same, ignoring empty newlines + continue + + exp_name = 'expected/' + exp.filename + res_name = 'output/' + res.filename + exp = exp.data.splitlines() + res = res.data.splitlines() + diff = difflib.unified_diff(exp, res, fromfile=exp_name, tofile=res_name, lineterm='') + for line in diff: + print(line) + + +TEST_CASES = [ + # GCC implib + TestCase([ '-n=testdll.xyz', '-a=i386', '--implib', '-d=$tmp$test.def', '--no-private-warnings' ], '01-'), + TestCase([ '-n=testdll.xyz', '-a=x86_64', '--implib', '-d=$tmp$test.def', '--no-private-warnings' ], '02-'), + # GCC normal + TestCase([ '-n=testdll.xyz', '-a=i386', '-d=$tmp$test.def', '-s=$tmp$stubs.c' ], '03-'), + TestCase([ '-n=testdll.xyz', '-a=x86_64', '-d=$tmp$test.def', '-s=$tmp$stubs.c' ], '04-'), + TestCase([ '-n=testdll.xyz', '-a=i386', '-d=$tmp$test.def', '-s=$tmp$stubs.c', '--with-tracing' ], '05-'), + # MSVC implib + TestCase([ '--ms', '-n=testdll.xyz', '-a=i386', '--implib', '-d=$tmp$test.def', '-l=$tmp$stubs.asm' ], '06-'), + TestCase([ '--ms', '-n=testdll.xyz', '-a=x86_64', '--implib', '-d=$tmp$test.def', '-l=$tmp$stubs.asm' ], '07-'), + # MSVC normal + TestCase([ '--ms', '-n=testdll.xyz', '-a=i386', '-d=$tmp$test.def', '-s=$tmp$stubs.c' ], '08-'), + TestCase([ '--ms', '-n=testdll.xyz', '-a=x86_64', '-d=$tmp$test.def', '-s=$tmp$stubs.c' ], '09-'), + TestCase([ '--ms', '-n=testdll.xyz', '-a=i386', '-d=$tmp$test.def', '-s=$tmp$stubs.c', '--with-tracing' ], '10-'), +] + + +def run_test(testcase, cmd, all_files): + with tempfile.TemporaryDirectory() as tmpdirname: + testcase.run(cmd, tmpdirname, all_files) + testcase.verify() + +def main(args): + cmd = args[0] if args else 'spec2def' + all_files = os.listdir(DATA_DIR) + for testcase in TEST_CASES: + run_test(testcase, cmd, all_files) + +if __name__ == '__main__': + main(sys.argv[1:]) diff --git a/modules/rostests/tests/spec2def/test.spec b/modules/rostests/tests/spec2def/test.spec new file mode 100644 index 00000000000..52fbdbd5046 --- /dev/null +++ b/modules/rostests/tests/spec2def/test.spec @@ -0,0 +1,19 @@ +; Comments be here() + +# 2 stdcall CommentedOutFunction(ptr long ptr ptr) # comment 2 +6 fastcall FastcallFunction(ptr ptr ptr long) +@ stdcall StdcallFunction(long) +8 fastcall -ret64 Ret64Function(double) + +7 fastcall -arch=i386 Fastcalli386(long) +10 stdcall -arch=i386,x86_64 Stdcalli386x64() + +@ stdcall -version=0x351-0x502 StdcallVersionRange(long long wstr wstr) +@ stdcall -stub -version=0x600+ StdcallStubVersion600(ptr) + +@ stdcall StdcallForwarderToSameDll() StdcallTargetInSameDll +@ stdcall -version=0x600+ StdcallForwarder(ptr ptr ptr) ntdll.RtlStdcallForwarder + +@ stub StubFunction +@ stdcall -stub StdcallSuccessStub(ptr) + diff --git a/modules/rostests/tests/spec2def/testdata/01-test.def b/modules/rostests/tests/spec2def/testdata/01-test.def new file mode 100644 index 00000000000..fded88c0f4f --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/01-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + @FastcallFunction@16 + StdcallFunction@4 + @Ret64Function@8 + @Fastcalli386@4 + Stdcalli386x64@0 + StdcallVersionRange@16 + StdcallForwarderToSameDll@0=StdcallTargetInSameDll@0 + StubFunction + StdcallSuccessStub@4 diff --git a/modules/rostests/tests/spec2def/testdata/02-test.def b/modules/rostests/tests/spec2def/testdata/02-test.def new file mode 100644 index 00000000000..5884c6f74c3 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/02-test.def @@ -0,0 +1,13 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction + StdcallFunction + Ret64Function + Stdcalli386x64 + StdcallVersionRange + StdcallForwarderToSameDll=StdcallTargetInSameDll + StubFunction + StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/03-stubs.c b/modules/rostests/tests/spec2def/testdata/03-stubs.c new file mode 100644 index 00000000000..2e8ea99472c --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/03-stubs.c @@ -0,0 +1,17 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int __stdcall StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/03-test.def b/modules/rostests/tests/spec2def/testdata/03-test.def new file mode 100644 index 00000000000..3867a320ac3 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/03-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction=@FastcallFunction@16 @6 + StdcallFunction=StdcallFunction@4 + Ret64Function=@Ret64Function@8 @8 + Fastcalli386=@Fastcalli386@4 @7 + Stdcalli386x64=Stdcalli386x64@0 @10 + StdcallVersionRange=StdcallVersionRange@16 + StdcallForwarderToSameDll=StdcallTargetInSameDll@0 + StubFunction + StdcallSuccessStub=StdcallSuccessStub@4 diff --git a/modules/rostests/tests/spec2def/testdata/04-stubs.c b/modules/rostests/tests/spec2def/testdata/04-stubs.c new file mode 100644 index 00000000000..5fcc8f47bf0 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/04-stubs.c @@ -0,0 +1,17 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/04-test.def b/modules/rostests/tests/spec2def/testdata/04-test.def new file mode 100644 index 00000000000..7331f890b22 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/04-test.def @@ -0,0 +1,13 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction @6 + StdcallFunction + Ret64Function @8 + Stdcalli386x64 @10 + StdcallVersionRange + StdcallForwarderToSameDll=StdcallTargetInSameDll + StubFunction + StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/05-stubs.c b/modules/rostests/tests/spec2def/testdata/05-stubs.c new file mode 100644 index 00000000000..6194756a81d --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/05-stubs.c @@ -0,0 +1,59 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> +#include <wine/debug.h> +#include <inttypes.h> +WINE_DECLARE_DEBUG_CHANNEL(relay); + +extern int __stdcall StdcallFunction(long a0); + +int __stdcall $relaytrace$StdcallFunction(long a0) +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallFunction(0x%lx)\n", (long)a0); + retval = StdcallFunction(a0); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallFunction: retval = 0x%lx\n", retval); + return retval; +} + +extern int __stdcall Stdcalli386x64(); + +int __stdcall $relaytrace$Stdcalli386x64() +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: Stdcalli386x64()\n"); + retval = Stdcalli386x64(); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: Stdcalli386x64: retval = 0x%lx\n", retval); + return retval; +} + +extern int __stdcall StdcallVersionRange(long a0, long a1, wchar_t* a2, wchar_t* a3); + +int __stdcall $relaytrace$StdcallVersionRange(long a0, long a1, wchar_t* a2, wchar_t* a3) +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallVersionRange(0x%lx,0x%lx,'%ws','%ws')\n", (long)a0, (long)a1, (wchar_t*)a2, (wchar_t*)a3); + retval = StdcallVersionRange(a0, a1, a2, a3); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallVersionRange: retval = 0x%lx\n", retval); + return retval; +} + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int __stdcall StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/05-test.def b/modules/rostests/tests/spec2def/testdata/05-test.def new file mode 100644 index 00000000000..ee21b9cde67 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/05-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction=@FastcallFunction@16 @6 + StdcallFunction=$relaytrace$StdcallFunction@4 + Ret64Function=@Ret64Function@8 @8 + Fastcalli386=@Fastcalli386@4 @7 + Stdcalli386x64=$relaytrace$Stdcalli386x64@0 @10 + StdcallVersionRange=$relaytrace$StdcallVersionRange@16 + StdcallForwarderToSameDll=StdcallTargetInSameDll@0 + StubFunction + StdcallSuccessStub=$relaytrace$StdcallSuccessStub@4 diff --git a/modules/rostests/tests/spec2def/testdata/06-stubs.asm b/modules/rostests/tests/spec2def/testdata/06-stubs.asm new file mode 100644 index 00000000000..5bad411c2f1 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/06-stubs.asm @@ -0,0 +1,25 @@ +; File generated automatically, do not edit! + +.586 +.model flat +.code +PUBLIC @_stub_FastcallFunction@16 +@_stub_FastcallFunction@16: nop +PUBLIC __stub_StdcallFunction@4 +__stub_StdcallFunction@4: nop +PUBLIC @_stub_Ret64Function@8 +@_stub_Ret64Function@8: nop +PUBLIC @_stub_Fastcalli386@4 +@_stub_Fastcalli386@4: nop +PUBLIC __stub_Stdcalli386x64@0 +__stub_Stdcalli386x64@0: nop +PUBLIC __stub_StdcallVersionRange@16 +__stub_StdcallVersionRange@16: nop +PUBLIC __stub_StdcallForwarderToSameDll@0 +__stub_StdcallForwarderToSameDll@0: nop +PUBLIC __stub_StubFunction +__stub_StubFunction: nop +PUBLIC __stub_StdcallSuccessStub@4 +__stub_StdcallSuccessStub@4: nop + + END diff --git a/modules/rostests/tests/spec2def/testdata/06-test.def b/modules/rostests/tests/spec2def/testdata/06-test.def new file mode 100644 index 00000000000..1c665c3a59d --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/06-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction=_stub_FastcallFunction + StdcallFunction=_stub_StdcallFunction + Ret64Function=_stub_Ret64Function + Fastcalli386=_stub_Fastcalli386 + Stdcalli386x64=_stub_Stdcalli386x64 + StdcallVersionRange=_stub_StdcallVersionRange + StdcallForwarderToSameDll=_stub_StdcallForwarderToSameDll + StubFunction=_stub_StubFunction + StdcallSuccessStub=_stub_StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/07-stubs.asm b/modules/rostests/tests/spec2def/testdata/07-stubs.asm new file mode 100644 index 00000000000..74c2a6f2f8d --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/07-stubs.asm @@ -0,0 +1,21 @@ +; File generated automatically, do not edit! + +.code +PUBLIC _stub_FastcallFunction +_stub_FastcallFunction: nop +PUBLIC _stub_StdcallFunction +_stub_StdcallFunction: nop +PUBLIC _stub_Ret64Function +_stub_Ret64Function: nop +PUBLIC _stub_Stdcalli386x64 +_stub_Stdcalli386x64: nop +PUBLIC _stub_StdcallVersionRange +_stub_StdcallVersionRange: nop +PUBLIC _stub_StdcallForwarderToSameDll +_stub_StdcallForwarderToSameDll: nop +PUBLIC _stub_StubFunction +_stub_StubFunction: nop +PUBLIC _stub_StdcallSuccessStub +_stub_StdcallSuccessStub: nop + + END diff --git a/modules/rostests/tests/spec2def/testdata/07-test.def b/modules/rostests/tests/spec2def/testdata/07-test.def new file mode 100644 index 00000000000..ca7a74849c6 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/07-test.def @@ -0,0 +1,13 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction=_stub_FastcallFunction + StdcallFunction=_stub_StdcallFunction + Ret64Function=_stub_Ret64Function + Stdcalli386x64=_stub_Stdcalli386x64 + StdcallVersionRange=_stub_StdcallVersionRange + StdcallForwarderToSameDll=_stub_StdcallForwarderToSameDll + StubFunction=_stub_StubFunction + StdcallSuccessStub=_stub_StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/08-stubs.c b/modules/rostests/tests/spec2def/testdata/08-stubs.c new file mode 100644 index 00000000000..2e8ea99472c --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/08-stubs.c @@ -0,0 +1,17 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int __stdcall StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/08-test.def b/modules/rostests/tests/spec2def/testdata/08-test.def new file mode 100644 index 00000000000..c431c1a799a --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/08-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction @6 + StdcallFunction + Ret64Function @8 + Fastcalli386 @7 + Stdcalli386x64 @10 + StdcallVersionRange + StdcallForwarderToSameDll=StdcallTargetInSameDll + StubFunction + StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/09-stubs.c b/modules/rostests/tests/spec2def/testdata/09-stubs.c new file mode 100644 index 00000000000..5fcc8f47bf0 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/09-stubs.c @@ -0,0 +1,17 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/09-test.def b/modules/rostests/tests/spec2def/testdata/09-test.def new file mode 100644 index 00000000000..7331f890b22 --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/09-test.def @@ -0,0 +1,13 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction @6 + StdcallFunction + Ret64Function @8 + Stdcalli386x64 @10 + StdcallVersionRange + StdcallForwarderToSameDll=StdcallTargetInSameDll + StubFunction + StdcallSuccessStub diff --git a/modules/rostests/tests/spec2def/testdata/10-stubs.c b/modules/rostests/tests/spec2def/testdata/10-stubs.c new file mode 100644 index 00000000000..6194756a81d --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/10-stubs.c @@ -0,0 +1,59 @@ +/* This file is autogenerated, do not edit. */ + +#include <stubs.h> +#include <wine/debug.h> +#include <inttypes.h> +WINE_DECLARE_DEBUG_CHANNEL(relay); + +extern int __stdcall StdcallFunction(long a0); + +int __stdcall $relaytrace$StdcallFunction(long a0) +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallFunction(0x%lx)\n", (long)a0); + retval = StdcallFunction(a0); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallFunction: retval = 0x%lx\n", retval); + return retval; +} + +extern int __stdcall Stdcalli386x64(); + +int __stdcall $relaytrace$Stdcalli386x64() +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: Stdcalli386x64()\n"); + retval = Stdcalli386x64(); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: Stdcalli386x64: retval = 0x%lx\n", retval); + return retval; +} + +extern int __stdcall StdcallVersionRange(long a0, long a1, wchar_t* a2, wchar_t* a3); + +int __stdcall $relaytrace$StdcallVersionRange(long a0, long a1, wchar_t* a2, wchar_t* a3) +{ + int retval; + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallVersionRange(0x%lx,0x%lx,'%ws','%ws')\n", (long)a0, (long)a1, (wchar_t*)a2, (wchar_t*)a3); + retval = StdcallVersionRange(a0, a1, a2, a3); + if (TRACE_ON(relay)) + DPRINTF("testdll.xyz: StdcallVersionRange: retval = 0x%lx\n", retval); + return retval; +} + +int StubFunction() +{ + DbgPrint("WARNING: calling stub StubFunction()\n"); + __wine_spec_unimplemented_stub("testdll.xyz", __FUNCTION__); + return 0; +} + +int __stdcall StdcallSuccessStub(void* a0) +{ + DbgPrint("WARNING: calling stub StdcallSuccessStub(0x%p)\n", (void*)a0); + return 0; +} + diff --git a/modules/rostests/tests/spec2def/testdata/10-test.def b/modules/rostests/tests/spec2def/testdata/10-test.def new file mode 100644 index 00000000000..645edb7321b --- /dev/null +++ b/modules/rostests/tests/spec2def/testdata/10-test.def @@ -0,0 +1,14 @@ +; File generated automatically, do not edit! + +NAME testdll.xyz + +EXPORTS + FastcallFunction @6 + StdcallFunction=$relaytrace$StdcallFunction + Ret64Function @8 + Fastcalli386 @7 + Stdcalli386x64=$relaytrace$Stdcalli386x64 @10 + StdcallVersionRange=$relaytrace$StdcallVersionRange + StdcallForwarderToSameDll=StdcallTargetInSameDll + StubFunction + StdcallSuccessStub=$relaytrace$StdcallSuccessStub

1 0

[reactos] 01/01: [CMAKE] Turn C4715: "'function': not all control paths return a value" into an error on MSVC builds
by Timo Kreuzer 23 Aug '19

23 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767d424b0aafd0eb49eb9… commit 767d424b0aafd0eb49eb91ce3dc18d88bdf69ccf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 17 20:29:16 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 23 14:47:39 2019 +0200 [CMAKE] Turn C4715: "'function': not all control paths return a value" into an error on MSVC builds --- sdk/cmake/msvc.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 44b72771af0..419984b5d11 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -97,8 +97,9 @@ add_compile_flags("/wd4018") # - C4312: conversion from '<integer>' to '<pointer>' of greater size # - C4603: macro is not defined or definition is different after precompiled header use # - C4700: uninitialized variable usage +# - C4715: 'function': not all control paths return a value # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

1 0

[reactos] 02/02: [NTOSKRNL] Demote some noisy dprints
by Mark Jansen 23 Aug '19

23 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1539fb1414d099096475e… commit 1539fb1414d099096475ee7a859e8da54379ad79 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 20 14:20:17 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 23 13:03:36 2019 +0200 [NTOSKRNL] Demote some noisy dprints --- ntoskrnl/io/pnpmgr/plugplay.c | 4 ++-- ntoskrnl/po/power.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 8526817c3c7..7782c3ee135 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -1077,7 +1077,7 @@ IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData) #endif { /* A driver has already been loaded for this device */ - DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); + DPRINT("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); DeviceNode->Problem = CM_PROB_NEED_RESTART; } } @@ -1093,7 +1093,7 @@ IopResetDevice(PPLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData) if (NT_SUCCESS(Status)) { /* Start the service and begin PnP initialization of the device again */ - DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); + DPRINT("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); } } diff --git a/ntoskrnl/po/power.c b/ntoskrnl/po/power.c index 121a41cdda3..fe26c0f4620 100644 --- a/ntoskrnl/po/power.c +++ b/ntoskrnl/po/power.c @@ -625,7 +625,7 @@ VOID NTAPI PoStartNextPowerIrp(IN PIRP Irp) { - UNIMPLEMENTED; + UNIMPLEMENTED_ONCE; } /*

1 0

[reactos] 01/02: [SETUPAPI] Demote some noisy dprints
by Mark Jansen 23 Aug '19

23 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4872912eb26b7f4a5567d… commit 4872912eb26b7f4a5567dddface4aa96d7ee658a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 20 14:19:29 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 23 13:03:36 2019 +0200 [SETUPAPI] Demote some noisy dprints --- dll/win32/setupapi/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/queue.c b/dll/win32/setupapi/queue.c index 4da2b5b5b70..54517205729 100644 --- a/dll/win32/setupapi/queue.c +++ b/dll/win32/setupapi/queue.c @@ -1085,7 +1085,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, hSource = LZOpenFileW((LPWSTR)source, &OfStruct, OF_READ); if (hSource < 0) { - ERR("LZOpenFileW(1) error %d %s\n", (int)hSource, debugstr_w(source)); + TRACE("LZOpenFileW(1) error %d %s\n", (int)hSource, debugstr_w(source)); return FALSE; } @@ -1822,7 +1822,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, TRACE( "end copy %s -> %s\n", debugstr_w(paths->Source), debugstr_w(paths->Target) ); return 0; case SPFILENOTIFY_COPYERROR: - ERR( "copy error %d %s -> %s\n", paths->Win32Error, + TRACE( "copy error %d %s -> %s\n", paths->Win32Error, debugstr_w(paths->Source), debugstr_w(paths->Target) ); return FILEOP_SKIP; case SPFILENOTIFY_NEEDMEDIA:

1 0

[reactos] 01/01: [NTDLL] Use the embedded manifest from the process to check compatibility.
by Mark Jansen 22 Aug '19

22 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=029b8f2cf9912b148f3e6… commit 029b8f2cf9912b148f3e60be0472652f26a1adb9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Dec 23 18:36:59 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Aug 21 18:57:52 2019 +0200 [NTDLL] Use the embedded manifest from the process to check compatibility. --- dll/ntdll/ldr/ldrinit.c | 11 ++++------- sdk/lib/rtl/actctx.c | 7 ++++++- sdk/lib/rtl/rtlp.h | 6 ++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index c23783a77ce..37e731c5960 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -93,7 +93,7 @@ ULONG RtlpDisableHeapLookaside; // TODO: Move to heap.c ULONG RtlpShutdownProcessFlags; // TODO: Use it NTSTATUS LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders, PVOID ImageBase); -void actctx_init(void); +void actctx_init(PVOID* pOldShimData); extern BOOLEAN RtlpUse16ByteSLists; #ifdef _WIN64 @@ -1539,7 +1539,7 @@ LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry) VOID NTAPI -LdrpInitializeProcessCompat(PVOID* pOldShimData) +LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) { static const struct { @@ -1584,7 +1584,7 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) SizeRequired = sizeof(Buffer); Status = RtlQueryInformationActivationContext(RTL_QUERY_ACTIVATION_CONTEXT_FLAG_NO_ADDREF, - NULL, + pProcessActctx, NULL, CompatibilityInformationInActivationContext, Buffer, @@ -2187,10 +2187,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, &LdrpNtDllDataTableEntry->InInitializationOrderLinks); /* Initialize Wine's active context implementation for the current process */ - actctx_init(); - - /* ReactOS specific */ - LdrpInitializeProcessCompat(&OldShimData); + actctx_init(&OldShimData); /* Set the current directory */ Status = RtlSetCurrentDirectory_U(&CurrentDirectory); diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 62a6af88c8d..e51e7c43421 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -5000,7 +5000,7 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, } /* initialize the activation context for the current process */ -void actctx_init(void) +void actctx_init(PVOID* pOldShimData) { ACTCTXW ctx; HANDLE handle; @@ -5018,6 +5018,11 @@ void actctx_init(void) process_actctx = check_actctx(handle); } + /* ReactOS specific: + Now that we have found the process_actctx we can initialize the process compat subsystem */ + LdrpInitializeProcessCompat(process_actctx, pOldShimData); + + ctx.dwFlags = 0; ctx.hModule = NULL; ctx.lpResourceName = NULL; diff --git a/sdk/lib/rtl/rtlp.h b/sdk/lib/rtl/rtlp.h index 1d13f7a61b5..c1cc8dc7ebf 100644 --- a/sdk/lib/rtl/rtlp.h +++ b/sdk/lib/rtl/rtlp.h @@ -243,4 +243,10 @@ WCHAR NTAPI RtlpDowncaseUnicodeChar(IN WCHAR Source); +/* ReactOS only */ +VOID +NTAPI +LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData); + + /* EOF */

1 0

[reactos] 02/02: [TRANSLATION] Changes to Newdev and hdwwiz
by Shy Zedaka 21 Aug '19

21 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbf47846e7e655f0ae945… commit cbf47846e7e655f0ae9453c02e1d355448c6ed4d Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Wed Aug 21 13:03:32 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Aug 21 18:49:59 2019 +0200 [TRANSLATION] Changes to Newdev and hdwwiz --- dll/cpl/hdwwiz/lang/he-IL.rc | 106 ++++++++++++++++++++--------------------- dll/win32/newdev/lang/he-IL.rc | 4 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dll/cpl/hdwwiz/lang/he-IL.rc b/dll/cpl/hdwwiz/lang/he-IL.rc index 893c8fa6535..9f3e9582827 100644 --- a/dll/cpl/hdwwiz/lang/he-IL.rc +++ b/dll/cpl/hdwwiz/lang/he-IL.rc @@ -1,24 +1,24 @@ -/* Traslated by Baruch Rutman */ +/* Translated by Baruch Rutman and Shy Zedaka */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ברוכים הבאים לאשף הוספת החומרה", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "ברוכים הבאים לאשף הוספת התקן", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "אשף זה יעזור לכם ב:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "1) להתקין תוכנה שתתמוך בהתקן שהוספת למחשבך.", -1, 121, 56, 184, 16 + LTEXT "2) לפתור בעיות שאולי קיימות עם ההתקנים שלך.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "אם ההתקן שלך בא עם דיסק התקנה, מומלץ שתלחץ על ביטול כדי לסגור את האשף הזה ושתשתמש בדיסק של היצרן בשביל להגדיר את ההתקן.", 503, 150, 106, 155, 50 + LTEXT "בשביל להמשיך, לחץ על הבא.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -27,63 +27,63 @@ END IDD_ISCONNECTEDPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "האם כבר חיברת את ההתקן למחשבך?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&כן, אני כבר חיברתי את ההתקן", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&לא, עוד לא חיברתי את ההתקן", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "מהרשימה למטה, בחר את ההתקן המותקן, ואז לחץ על הבא בשביל לבדוק את ההגדרות של ההתקן או לפתור בעיות עם ההתקן.", -1, 21, 8, 275, 22 + LTEXT " ""הוסף התקן חדש"" כדי להוסיף התקן שלא מופיע ברשימה, לחץ על ", -1, 21, 32, 275, 24 + LTEXT "ה&תקנים מוגדרים:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + LTEXT "מה אתה רוצה שהאשף יעשה?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&חפש והתקן את ההתקן באופן אוטומטי(מומלץ)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "התקנים שזוההו:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "סוגי &התקן נפוצים:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "זה עלול לקחת מספר דקות לחפש את ההתקנים.", -1, 21, 8, 275, 15 + LTEXT "התקדמות:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -91,59 +91,59 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "מסכם את אשף הוספת התקן", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "סיימת בהצלחה אם אשף הוספת התקן.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "בשביל לסגור את האשף, לחץ על סיום.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "מסכם את אשף הוספת התקן", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "האשף מצא את ההתקנים הבאים מחוברים למחשבך:", -1, 114, 32, 193, 19 + LTEXT "בשביל לסגור את האשף, לחץ על סיום.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "מסכם את אשף הוספת התקן", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "הנה המצב העדכני לגבי ההתקן שבחרת:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "כדי להפעיל את פותר הבעיות לחץ על סיום.", -1, 114, 136, 193, 16 + LTEXT "בשביל לסגור את האשף, לחץ על ביטול.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "אשף הוספת החומרה" +CAPTION "אשף הוספת התקן" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "אין אפשרות להמשיך את אשף הוספת התקן", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "כדי להמשיך, חבר את ההתקן למחשבך.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&כבה את המחשב ברגע שאלחץ על סיום בשביל שאוכל לפתוח את המחשב ולחבר את ההתקן.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "בשביל לסגור את האשף, לחץ על סיום.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN - IDS_CPLNAME "הוסף חומרה" - IDS_CPLDESCRIPTION "הוסף חומרה למחשבך." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "האם החמורה מחוברת?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "הוסף התקן חומרה חדש" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_CPLNAME "הוספת התקן" + IDS_CPLDESCRIPTION "מוסיף/מגדיר התקנים" + IDS_SEARCHTITLE "אנא המתן בזמן שהאשף מחפש..." + IDS_SEARCHTEXT "אשף זה מחפש עבור התקנים שחוברו למחשבך בזמן האחרון אך עדיין לא הוגדרו." + IDS_ISCONNECTED "האם ההתקן מחובר?" + IDS_PROBELISTTITLE "ההתקן הזה כבר מותקן על מחשבך" + IDS_ADDNEWDEVICE "הוסף התקן חדש" + IDS_SELECTWAYTITLE "האשף יכול לעזור לך להתקין התקנים אחרים" + IDS_HDTYPESTITLE "מהרשימה למטה, בחר את סוג ההתקן שאתה רוצה להתקין" END diff --git a/dll/win32/newdev/lang/he-IL.rc b/dll/win32/newdev/lang/he-IL.rc index c57c893b782..078f82db4a2 100644 --- a/dll/win32/newdev/lang/he-IL.rc +++ b/dll/win32/newdev/lang/he-IL.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "אשף זה יתקין מנהל התקן חדש עבור:", IDC_STATIC, 120, 21, 195, 16 LTEXT "לחץ על הבא כדי להמשיך.", IDC_STATIC, 120, 169, 195, 16 LTEXT "התקן לא מוכר", IDC_DEVICE, 148, 36, 147, 17 - LTEXT "אזהרה! התקנת התקן מותאם אישית עלולה לגרום למחשבך להפסיק להגיב או לגרום שלא יהיה ניתן להפעילו!", IDC_STATIC, 120, 59, 195, 16 + LTEXT "אזהרה! התקנה של התקן מותאם אישית עלולה לגרום למחשבך להפסיק להגיב או לגרום שלא יהיה ניתן להפעילו!", IDC_STATIC, 120, 59, 195, 16 CONTROL "התקן מנהל התקן באופן אוטומטי", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "התקן מנהל התקן ממיקום מסוים", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 END @@ -40,7 +40,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "הגדרת התקן" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "חפש במיקומים הבאים", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 12 + CONTROL "חפש במיקומים הבאים:", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 12 CONTROL "בחר באופן ידני", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 12 CONTROL "חפש במדיה נשלפת", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 163, 12 CONTROL "כלול את הנתיב הבא", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 54, 162, 12

1 0

[reactos] 01/02: [TRANSLATION] Change the recycle bin from 'Trash' to 'Recycle bin'
by Shy Zedaka 21 Aug '19

21 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc8180fe63494a7df3f08… commit cc8180fe63494a7df3f08a0fb3bab11c657d8f09 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Mon Aug 19 20:41:20 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Aug 21 18:49:59 2019 +0200 [TRANSLATION] Change the recycle bin from 'Trash' to 'Recycle bin' --- dll/win32/shell32/lang/he-IL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 19c9ca1b676..0598c368e54 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -743,7 +743,7 @@ BEGIN /* special folders */ IDS_DESKTOP "שולחן עבודה" IDS_MYCOMPUTER "המחשב שלי" - IDS_RECYCLEBIN_FOLDER_NAME "אשפה" + IDS_RECYCLEBIN_FOLDER_NAME "סל המיחזור" IDS_CONTROLPANEL "לוח הבקרה" IDS_ADMINISTRATIVETOOLS "כלי ניהול"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs