Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WS2_32_APITEST:WSAASYNC] Fix and improve some tests. ROSTESTS-317 (#1132)
by Serge Gautherie 15 May '20

15 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffd0ab39b577995a5c520… commit ffd0ab39b577995a5c5208ace9a5146bddd20dee Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri May 15 15:45:35 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 15 15:45:35 2020 +0200 [WS2_32_APITEST:WSAASYNC] Fix and improve some tests. ROSTESTS-317 (#1132) - Add getsockname() addr_con_loc looping case. Fix intermittent failure on Windows (NT <= 6.0): "WSAAsync.c:232: Test failed: ERROR: getsockname function wrong addr, expected 100007f returned 0" ROSTESTS-317 - Improve select() ServerSocket looping case. Visible on Windows (NT >= 6.1). --- modules/rostests/apitests/ws2_32/WSAAsync.c | 44 +++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/WSAAsync.c b/modules/rostests/apitests/ws2_32/WSAAsync.c index 400cba8b52a..0850d8fe321 100644 --- a/modules/rostests/apitests/ws2_32/WSAAsync.c +++ b/modules/rostests/apitests/ws2_32/WSAAsync.c @@ -10,6 +10,7 @@ #define SVR_PORT 5000 #define WAIT_TIMEOUT_ 10000 #define EXIT_FLAGS (FD_ACCEPT|FD_CONNECT) +#define MAX_LOOPCOUNT 9u START_TEST(WSAAsync) { @@ -36,6 +37,8 @@ START_TEST(WSAAsync) struct fd_set select_efds; struct timeval timeval; BOOL ConnectSent = FALSE; + unsigned int Addr_con_locLoopCount = 0, + ServerSocketLoopCount = 0; if (WSAStartup(MAKEWORD(2, 2), &WsaData) != 0) { @@ -124,7 +127,7 @@ START_TEST(WSAAsync) if (dwWait != WAIT_OBJECT_0 && // server socket event dwWait != WAIT_OBJECT_0+1) // client socket event { - ok(0, "Unknown event received %ld\n", dwWait); + ok(FALSE, "Unknown event received %lu\n", dwWait); skip("ERROR: Connection timeout\n"); break; } @@ -227,12 +230,27 @@ START_TEST(WSAAsync) else { if (nSockNameRes != 0) - ok(0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes); + ok(FALSE, "ERROR: getsockname function failed, expected 0 error %d\n", nSockNameRes); if (len != sizeof(addr_con_loc)) - ok(0, "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len); - // FIXME: fails on WHS testbot - //if (addr_con_loc.sin_addr.s_addr != server_addr_in.sin_addr.s_addr) - // ok(0, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); + ok(FALSE, "ERROR: getsockname function wrong size, expected %Iu returned %d\n", sizeof(addr_con_loc), len); + + if (addr_con_loc.sin_addr.s_addr == 0ul) + { + if (++Addr_con_locLoopCount >= MAX_LOOPCOUNT) + { + ok(FALSE, "Giving up, on getsockname() (%u/%u), as addr_con_loc is not set yet\n", + Addr_con_locLoopCount, MAX_LOOPCOUNT); + goto done; + } + + trace("Looping, for getsockname() (%u/%u), as addr_con_loc is not set yet\n", + Addr_con_locLoopCount, MAX_LOOPCOUNT); + Sleep(1); + continue; + } + + if (addr_con_loc.sin_addr.s_addr != server_addr_in.sin_addr.s_addr) + ok(FALSE, "ERROR: getsockname function wrong addr, expected %08lx returned %08lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); } if ((dwFlags & FD_ACCEPT) != 0) {// client connected @@ -281,6 +299,20 @@ START_TEST(WSAAsync) ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %d\n", WSAGetLastError()); dwFlags |= FD_ACCEPT; } + else + { + if (++ServerSocketLoopCount >= MAX_LOOPCOUNT) + { + ok(FALSE, "Giving up, on select() (%u/%u), as ServerSocket is not readable yet\n", + ServerSocketLoopCount, MAX_LOOPCOUNT); + goto done; + } + + trace("Looping, for select() (%u/%u), as ServerSocket is not readable yet\n", + ServerSocketLoopCount, MAX_LOOPCOUNT); + Sleep(1); + continue; + } } } }

1 0

[reactos] 01/01: [SHELL32] Don't hardcode C: drive again (#2777)
by Katayama Hirofumi MZ 15 May '20

15 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62e59652a038f8ffab2d6… commit 62e59652a038f8ffab2d66d4af699ecc6b779a40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 15 16:36:13 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 15 16:36:13 2020 +0900 [SHELL32] Don't hardcode C: drive again (#2777) - Avoid buffer overrun. - Don't hardcode C: drive. CORE-13235 --- dll/win32/shell32/folders/CRecycleBin.cpp | 32 ++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index a32c42b621f..dbf03672cee 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -192,10 +192,12 @@ CRecycleBinEnum::~CRecycleBinEnum() HRESULT WINAPI CRecycleBinEnum::Initialize(DWORD dwFlags) { WCHAR szDrive[8]; - if (GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive))) - PathAddBackslashW(szDrive); - else - StringCbCopyW(szDrive, sizeof(szDrive), L"C:\\"); + if (!GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive) - 1)) + { + ERR("GetEnvironmentVariableW failed\n"); + return E_FAIL; + } + PathAddBackslashW(szDrive); if (dwFlags & SHCONTF_NONFOLDERS) { @@ -367,10 +369,12 @@ HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO l Context.pFileDetails = _ILGetRecycleStruct(apidl); Context.bFound = FALSE; - if (GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive))) - PathAddBackslashW(szDrive); - else - StringCbCopyW(szDrive, sizeof(szDrive), L"C:\\"); + if (!GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive) - 1)) + { + ERR("GetEnvironmentVariableW failed\n"); + return E_FAIL; + } + PathAddBackslashW(szDrive); EnumerateRecycleBinW(szDrive, CBSearchRecycleBin, (PVOID)&Context); if (!Context.bFound) @@ -823,14 +827,20 @@ HRESULT WINAPI CRecycleBin::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) HRESULT hr; LPSHELLBROWSER lpSB; IShellView * lpSV = NULL; + WCHAR szDrive[8]; TRACE("%p %p verb %p\n", this, lpcmi, lpcmi->lpVerb); if (LOWORD(lpcmi->lpVerb) == iIdEmpty) { - // FIXME - // path & flags - hr = SHEmptyRecycleBinW(lpcmi->hwnd, L"C:\\", 0); + if (!GetEnvironmentVariableW(L"SystemDrive", szDrive, _countof(szDrive) - 1)) + { + ERR("GetEnvironmentVariableW failed\n"); + return E_FAIL; + } + PathAddBackslashW(szDrive); + + hr = SHEmptyRecycleBinW(lpcmi->hwnd, szDrive, 0); TRACE("result %x\n", hr); if (hr != S_OK) return hr;

1 0

[reactos] 01/01: [SHELL32] Implement SheShortenPathA (#2785)
by Katayama Hirofumi MZ 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c3775f77c8ed49c18de3… commit 6c3775f77c8ed49c18de3fab99afed93c62cf692 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 14 22:52:22 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 22:52:22 2020 +0900 [SHELL32] Implement SheShortenPathA (#2785) Implement shell32!SheShortenPathA function. --- dll/win32/shell32/stubs.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 2daa26c7022..ebba2f3b298 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -453,8 +453,12 @@ EXTERN_C BOOL WINAPI SheShortenPathA(LPSTR lpPath, BOOL bShorten) { - FIXME("SheShortenPathA() stub\n"); - return FALSE; + BOOL ret; + WCHAR szPath[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, lpPath, -1, szPath, _countof(szPath)); + ret = SheShortenPathW(szPath, bShorten); + WideCharToMultiByte(CP_ACP, 0, szPath, -1, lpPath, MAX_PATH, NULL, NULL); + return ret; } /*

1 0

[reactos] 01/01: [SHELL32] Implement MakeShellURLFromPathA (#2784)
by Katayama Hirofumi MZ 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7a97a2af263416cee122… commit b7a97a2af263416cee122c7384a7043ae2882a55 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 14 22:51:53 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 22:51:53 2020 +0900 [SHELL32] Implement MakeShellURLFromPathA (#2784) Implement shell32!MakeShellURLFromPathA function. --- dll/win32/shell32/stubs.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 3be6d2ec3b5..2daa26c7022 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -171,9 +171,12 @@ EXTERN_C BOOL WINAPI MakeShellURLFromPathA(LPCSTR lpPath, LPSTR lpUrl, INT cchMax) { - FIXME("MakeShellURLFromPathA() stub\n"); - lpUrl = NULL; - return FALSE; + WCHAR szPath[MAX_PATH], szURL[MAX_PATH]; + BOOL ret; + SHAnsiToUnicode(lpPath, szPath, _countof(szPath)); + ret = MakeShellURLFromPathW(szPath, szURL, _countof(szURL)); + SHUnicodeToAnsi(szURL, lpUrl, cchMax); + return ret; } /*

1 0

[reactos] 01/01: [OPENGLCFG] Empty list boxes if registry key is missing (#2750)
by Ricardo Hanke 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c5f367172455537030dd… commit 0c5f367172455537030dd29d1c05d7a34633841a Author: Ricardo Hanke <58061452+Mondgestein(a)users.noreply.github.com> AuthorDate: Thu May 14 14:47:48 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:47:48 2020 +0200 [OPENGLCFG] Empty list boxes if registry key is missing (#2750) If the registry key that holds the names of installed opengl drivers is missing, all list boxes in openglcfg are empty. This is a minor code rearrangement to fix this behavior. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- dll/cpl/openglcfg/general.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dll/cpl/openglcfg/general.c b/dll/cpl/openglcfg/general.c index 3f228da19b9..115d374880e 100644 --- a/dll/cpl/openglcfg/general.c +++ b/dll/cpl/openglcfg/general.c @@ -10,20 +10,11 @@ static VOID InitSettings(HWND hWndDlg) { HKEY hKeyRenderer; HKEY hKeyDrivers; + DWORD dwType = 0; + DWORD dwSize = MAX_KEY_LENGTH; WCHAR szBuffer[MAX_KEY_LENGTH]; WCHAR szBultin[MAX_KEY_LENGTH]; WCHAR szDriver[MAX_KEY_LENGTH]; - DWORD dwType = 0; - DWORD dwSize = MAX_KEY_LENGTH; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KEY_DRIVERS, 0, KEY_READ, &hKeyDrivers) != ERROR_SUCCESS) - return; - - if (RegCreateKeyExW(HKEY_CURRENT_USER, KEY_RENDERER, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hKeyRenderer, NULL) != ERROR_SUCCESS) - { - RegCloseKey(hKeyDrivers); - return; - } LoadString(hApplet, IDS_DEBUG_DNM, (LPTSTR)szBultin, 127); SendDlgItemMessageW(hWndDlg, IDC_DEBUG_OUTPUT, CB_ADDSTRING, 0, (LPARAM)szBultin); @@ -42,9 +33,14 @@ static VOID InitSettings(HWND hWndDlg) LoadString(hApplet, IDS_RENDERER_RSWR, (LPTSTR)szBultin, 127); SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_ADDSTRING, 0, (LPARAM)szBultin); + if (RegCreateKeyExW(HKEY_CURRENT_USER, KEY_RENDERER, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hKeyRenderer, NULL) != ERROR_SUCCESS) + return; + if (RegQueryValueExW(hKeyRenderer, NULL, NULL, &dwType, (LPBYTE)szDriver, &dwSize) != ERROR_SUCCESS || dwSize == sizeof(WCHAR)) SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, RENDERER_DEFAULT, 0); + RegCloseKey(hKeyRenderer); + if (dwType == REG_SZ) { DWORD ret; @@ -53,12 +49,14 @@ static VOID InitSettings(HWND hWndDlg) if (wcsncmp(szBultin, szDriver, MAX_KEY_LENGTH) == 0) SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, RENDERER_RSWR, 0); + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KEY_DRIVERS, 0, KEY_READ, &hKeyDrivers) != ERROR_SUCCESS) + return; + ret = RegQueryInfoKeyW(hKeyDrivers, NULL, NULL, NULL, &dwNumDrivers, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS || dwNumDrivers == 0) { RegCloseKey(hKeyDrivers); - RegCloseKey(hKeyRenderer); return; } @@ -90,10 +88,9 @@ static VOID InitSettings(HWND hWndDlg) if (wcsncmp(szBuffer, szDriver, MAX_KEY_LENGTH) == 0) SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, iKey + 2, 0); } - } - RegCloseKey(hKeyDrivers); - RegCloseKey(hKeyRenderer); + RegCloseKey(hKeyDrivers); + } return; }

1 0

[reactos] 01/01: [NTDLL_APITEST] Add initial NtQueryInformationThread() testcase (#2782)
by George Bișoc 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ce40ea841f01828cafc5… commit 5ce40ea841f01828cafc5027c48892b3d727e83c Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Thu May 14 14:32:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:32:38 2020 +0200 [NTDLL_APITEST] Add initial NtQueryInformationThread() testcase (#2782) --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/NtQueryInformationThread.c | 106 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 109 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index fc46b1db676..6e25db84d12 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -26,6 +26,7 @@ list(APPEND SOURCE NtProtectVirtualMemory.c NtQueryInformationFile.c NtQueryInformationProcess.c + NtQueryInformationThread.c NtQueryKey.c NtQuerySystemEnvironmentValue.c NtQuerySystemInformation.c diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationThread.c b/modules/rostests/apitests/ntdll/NtQueryInformationThread.c new file mode 100644 index 00000000000..df4d2d0b939 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtQueryInformationThread.c @@ -0,0 +1,106 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtQueryInformationThread API + * COPYRIGHT: Copyright 2020 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static +void +Test_ThreadBasicInformationClass(void) +{ + NTSTATUS Status; + PTHREAD_BASIC_INFORMATION ThreadInfoBasic; + ULONG ReturnedLength; + + ThreadInfoBasic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(THREAD_BASIC_INFORMATION)); + if (!ThreadInfoBasic) + { + skip("Failed to allocate memory for THREAD_BASIC_INFORMATION!\n"); + return; + } + + /* Everything is NULL */ + Status = NtQueryInformationThread(NULL, + ThreadBasicInformation, + NULL, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Don't give a valid thread handle */ + Status = NtQueryInformationThread(NULL, + ThreadBasicInformation, + ThreadInfoBasic, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* The information length is incorrect */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + ThreadInfoBasic, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Don't query anything from the function */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + NULL, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The buffer is misaligned and length information is wrong */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + (PVOID)1, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The buffer is misaligned */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + (PVOID)1, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The buffer is misaligned, try with an alignment size of 2 */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + (PVOID)2, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Query the basic information we need from the thread */ + Status = NtQueryInformationThread(GetCurrentThread(), + ThreadBasicInformation, + ThreadInfoBasic, + sizeof(THREAD_BASIC_INFORMATION), + &ReturnedLength); + ok_hex(Status, STATUS_SUCCESS); + ok(ReturnedLength != 0, "The size of the buffer pointed by ThreadInformation shouldn't be 0!\n"); + + /* Output the thread basic information details */ + trace("ReturnedLength = %lu\n", ReturnedLength); + trace("ThreadInfoBasic->ExitStatus = 0x%08lx\n", ThreadInfoBasic->ExitStatus); + trace("ThreadInfoBasic->TebBaseAddress = %p\n", ThreadInfoBasic->TebBaseAddress); + trace("ThreadInfoBasic->ClientId.UniqueProcess = %p\n", ThreadInfoBasic->ClientId.UniqueProcess); + trace("ThreadInfoBasic->ClientId.UniqueThread = %p\n", ThreadInfoBasic->ClientId.UniqueThread); + trace("ThreadInfoBasic->AffinityMask = %lu\n", ThreadInfoBasic->AffinityMask); + trace("ThreadInfoBasic->Priority = %li\n", ThreadInfoBasic->Priority); + trace("ThreadInfoBasic->BasePriority = %li\n", ThreadInfoBasic->BasePriority); + + HeapFree(GetProcessHeap(), 0, ThreadInfoBasic); +} + +START_TEST(NtQueryInformationThread) +{ + Test_ThreadBasicInformationClass(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index b2131a07b81..293a7cc45c5 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -24,6 +24,7 @@ extern void func_NtOpenThreadToken(void); extern void func_NtProtectVirtualMemory(void); extern void func_NtQueryInformationFile(void); extern void func_NtQueryInformationProcess(void); +extern void func_NtQueryInformationThread(void); extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQuerySystemInformation(void); @@ -96,6 +97,7 @@ const struct test winetest_testlist[] = { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, { "NtQueryInformationFile", func_NtQueryInformationFile }, { "NtQueryInformationProcess", func_NtQueryInformationProcess }, + { "NtQueryInformationThread", func_NtQueryInformationThread }, { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQuerySystemInformation", func_NtQuerySystemInformation },

1 0

[reactos] 01/01: [NDK][XDK] Add 3 CM_RESOURCE_INTERRUPT_* defines (#2755)
by Serge Gautherie 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa6e11b5491b541637533… commit aa6e11b5491b541637533f5dc2d02ee664cc14ae Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu May 14 14:31:53 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:31:53 2020 +0200 [NDK][XDK] Add 3 CM_RESOURCE_INTERRUPT_* defines (#2755) --- sdk/include/ndk/cmtypes.h | 7 +++++++ sdk/include/xdk/cmtypes.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/sdk/include/ndk/cmtypes.h b/sdk/include/ndk/cmtypes.h index 6446f4efec2..d5cbced0aea 100644 --- a/sdk/include/ndk/cmtypes.h +++ b/sdk/include/ndk/cmtypes.h @@ -144,6 +144,13 @@ typedef enum _CM_SHARE_DISPOSITION #define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 #define CM_RESOURCE_INTERRUPT_MESSAGE 0x0002 #define CM_RESOURCE_INTERRUPT_POLICY_INCLUDED 0x0004 +#define CM_RESOURCE_INTERRUPT_ALLOW_RESERVED_IDT 0x0008 +#define CM_RESOURCE_INTERRUPT_SECONDARY_INTERRUPT 0x0010 +#define CM_RESOURCE_INTERRUPT_WAKE_HINT 0x0020 + +#define CM_RESOURCE_INTERRUPT_LEVEL_LATCHED_BITS 0x0001 + +#define CM_RESOURCE_INTERRUPT_MESSAGE_TOKEN ((ULONG)-2) // // NtInitializeRegistry Flags diff --git a/sdk/include/xdk/cmtypes.h b/sdk/include/xdk/cmtypes.h index d84acdc4b06..a84e464eb20 100644 --- a/sdk/include/xdk/cmtypes.h +++ b/sdk/include/xdk/cmtypes.h @@ -259,6 +259,8 @@ typedef enum _CM_SHARE_DISPOSITION { #define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 #define CM_RESOURCE_INTERRUPT_MESSAGE 0x0002 #define CM_RESOURCE_INTERRUPT_POLICY_INCLUDED 0x0004 +#define CM_RESOURCE_INTERRUPT_SECONDARY_INTERRUPT 0x0010 +#define CM_RESOURCE_INTERRUPT_WAKE_HINT 0x0020 #define CM_RESOURCE_INTERRUPT_LEVEL_LATCHED_BITS 0x0001

1 0

[reactos] 01/01: [SERVMAN] Use the ShellAboutW API routine to display the about dialog (#2752)
by Kyle Katarn 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b479d19e6f7ba4bb9baa… commit 4b479d19e6f7ba4bb9baad5121807097a96e8c18 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu May 14 14:30:35 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:30:35 2020 +0200 [SERVMAN] Use the ShellAboutW API routine to display the about dialog (#2752) --- base/applications/mscutils/servman/CMakeLists.txt | 1 - base/applications/mscutils/servman/about.c | 54 ----------------------- base/applications/mscutils/servman/lang/bg-BG.rc | 13 +----- base/applications/mscutils/servman/lang/cs-CZ.rc | 13 +----- base/applications/mscutils/servman/lang/de-DE.rc | 13 +----- base/applications/mscutils/servman/lang/el-GR.rc | 13 +----- base/applications/mscutils/servman/lang/en-US.rc | 13 +----- base/applications/mscutils/servman/lang/es-ES.rc | 13 +----- base/applications/mscutils/servman/lang/fr-FR.rc | 13 +----- base/applications/mscutils/servman/lang/he-IL.rc | 13 +----- base/applications/mscutils/servman/lang/id-ID.rc | 13 +----- base/applications/mscutils/servman/lang/it-IT.rc | 13 +----- base/applications/mscutils/servman/lang/ja-JP.rc | 13 +----- base/applications/mscutils/servman/lang/ko-KR.rc | 13 +----- base/applications/mscutils/servman/lang/no-NO.rc | 13 +----- base/applications/mscutils/servman/lang/pl-PL.rc | 13 +----- base/applications/mscutils/servman/lang/ro-RO.rc | 13 +----- base/applications/mscutils/servman/lang/ru-RU.rc | 13 +----- base/applications/mscutils/servman/lang/sk-SK.rc | 13 +----- base/applications/mscutils/servman/lang/sq-AL.rc | 13 +----- base/applications/mscutils/servman/lang/sv-SE.rc | 13 +----- base/applications/mscutils/servman/lang/th-TH.rc | 13 +----- base/applications/mscutils/servman/lang/tr-TR.rc | 13 +----- base/applications/mscutils/servman/lang/uk-UA.rc | 13 +----- base/applications/mscutils/servman/lang/zh-CN.rc | 13 +----- base/applications/mscutils/servman/lang/zh-TW.rc | 13 +----- base/applications/mscutils/servman/mainwnd.c | 19 +++++--- base/applications/mscutils/servman/resource.h | 6 +-- 28 files changed, 38 insertions(+), 354 deletions(-) diff --git a/base/applications/mscutils/servman/CMakeLists.txt b/base/applications/mscutils/servman/CMakeLists.txt index 1f96e0677df..24fbe8b4fa0 100644 --- a/base/applications/mscutils/servman/CMakeLists.txt +++ b/base/applications/mscutils/servman/CMakeLists.txt @@ -1,6 +1,5 @@ list(APPEND SOURCE - about.c control.c create.c delete.c diff --git a/base/applications/mscutils/servman/about.c b/base/applications/mscutils/servman/about.c deleted file mode 100644 index 2f23db343f3..00000000000 --- a/base/applications/mscutils/servman/about.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/about.c - * PURPOSE: About dialog box message handler - * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "precomp.h" - -INT_PTR CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_INITDIALOG: - { - HWND hLicenseEditWnd; - - hLicenseEditWnd = GetDlgItem(hDlg, - IDC_LICENSE_EDIT); - if (hLicenseEditWnd) - { - LPWSTR lpString; - - if (AllocAndLoadString(&lpString, - hInstance, - IDS_LICENSE)) - { - SetWindowTextW(hLicenseEditWnd, - lpString); - - LocalFree(lpString); - } - } - - return TRUE; - } - - case WM_COMMAND: - - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg, - LOWORD(wParam)); - return TRUE; - } - - break; - } - - return FALSE; -} diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc b/base/applications/mscutils/servman/lang/bg-BG.rc index c19437e1089..daa9d7fc6de 100644 --- a/base/applications/mscutils/servman/lang/bg-BG.rc +++ b/base/applications/mscutils/servman/lang/bg-BG.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "За управителя на устройствата" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 300, 225 CAPTION "Общи" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Брой услуги: %d" IDS_STOP_DEPENDS "При спирането на %s, ще спрат и следните услуги" IDS_NO_DEPENDS "<Без зависимости>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Управление на услугите на РеактОС" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/cs-CZ.rc b/base/applications/mscutils/servman/lang/cs-CZ.rc index 8632cf698f0..d91887f80c7 100644 --- a/base/applications/mscutils/servman/lang/cs-CZ.rc +++ b/base/applications/mscutils/servman/lang/cs-CZ.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "O správci služeb" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Správce služeb v0.8\nCopyright (C) 2005-2007\nGed Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Zavřít", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Počet služeb: %d" IDS_STOP_DEPENDS "Zastavením %s dojde také k zastavení" IDS_NO_DEPENDS "<Žádné závislosti>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Správce služeb" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/de-DE.rc b/base/applications/mscutils/servman/lang/de-DE.rc index bb941ebd70f..e68d930600c 100644 --- a/base/applications/mscutils/servman/lang/de-DE.rc +++ b/base/applications/mscutils/servman/lang/de-DE.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Info über Dienst-Manager" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Anzahl der Dienste: %d" IDS_STOP_DEPENDS "Wenn %s beendet wird, werden diese Dienste ebenfalls beendet" IDS_NO_DEPENDS "<Keine Abhängigkeiten>" - IDS_LICENSE "Dieses Programm ist Freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation, Version 2.1 der Lizenz oder (nach Ihrer Wahl) jeder neueren veröffentlichten Version, weiterverbreiten und/oder modifizieren.\r\n\r\nDieses Programm wird in der Hoffnung, dass es nützlich sein wird, aber OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTI [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Dienst-Manager" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/el-GR.rc b/base/applications/mscutils/servman/lang/el-GR.rc index 4eb8a250bec..c45e164f657 100644 --- a/base/applications/mscutils/servman/lang/el-GR.rc +++ b/base/applications/mscutils/servman/lang/el-GR.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Σχετικά με το Διαχειριστή Υπηρεσιών" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Διαχειριστής Υπηρεσιών v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Κλείσιμο", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Γενικά" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Num Services: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Διαχειριστής Υπηρεσιών του ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/en-US.rc b/base/applications/mscutils/servman/lang/en-US.rc index 272a73eb9f5..a2c75480908 100644 --- a/base/applications/mscutils/servman/lang/en-US.rc +++ b/base/applications/mscutils/servman/lang/en-US.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "About Service Manager" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Num Services: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Service Manager" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/es-ES.rc b/base/applications/mscutils/servman/lang/es-ES.rc index 1bf14df0b79..891be8a07b0 100644 --- a/base/applications/mscutils/servman/lang/es-ES.rc +++ b/base/applications/mscutils/servman/lang/es-ES.rc @@ -71,17 +71,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Acerca del Administrador de servicios" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Administrador de servicios v0.8\nCopyright (C) 2005-2007\ncreado por Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0 @@ -265,7 +254,6 @@ BEGIN IDS_NUM_SERVICES "Número de servicios: %d" IDS_STOP_DEPENDS "Cuando %s se detenga, estos otros servicios también se detendrán" IDS_NO_DEPENDS "<Sin dependencias>" - IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para m [...] END STRINGTABLE @@ -334,6 +322,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Administrador de servicios de ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 creado por Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/fr-FR.rc b/base/applications/mscutils/servman/lang/fr-FR.rc index 38cd92cfad9..91240f99ab6 100644 --- a/base/applications/mscutils/servman/lang/fr-FR.rc +++ b/base/applications/mscutils/servman/lang/fr-FR.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "À Propos du gestionnaire de services" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Services : %d" IDS_STOP_DEPENDS "Quand %s s'arrêtera, les services suivants s'arrêteront également :" IDS_NO_DEPENDS "<Pas de dépendances>" - IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ A UNE UTILISATION PARTICULIÈRE. \r\n [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Gestionnaire de Services ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/he-IL.rc b/base/applications/mscutils/servman/lang/he-IL.rc index af1c191532b..c20be705069 100644 --- a/base/applications/mscutils/servman/lang/he-IL.rc +++ b/base/applications/mscutils/servman/lang/he-IL.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "אודות מנהל השירותים" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "כללי" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "מספר השירותים: %d" IDS_STOP_DEPENDS "מתי ש %s יעצור, השירותים הללו גם יעצרו." IDS_NO_DEPENDS "<אין יחסי תלות>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "מנהל השירותים של ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/id-ID.rc b/base/applications/mscutils/servman/lang/id-ID.rc index 22e9b39807f..53455e72512 100644 --- a/base/applications/mscutils/servman/lang/id-ID.rc +++ b/base/applications/mscutils/servman/lang/id-ID.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Tentang Manajer Layanan" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Jumlah Layanan: %d" IDS_STOP_DEPENDS "Ketika %s berhenti, layanan lain terkait juga akan berhenti" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License un [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Service Manager" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/it-IT.rc b/base/applications/mscutils/servman/lang/it-IT.rc index 8e6b295f31f..a3a611e32df 100644 --- a/base/applications/mscutils/servman/lang/it-IT.rc +++ b/base/applications/mscutils/servman/lang/it-IT.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Informazioni su Gestione Servizi" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Numero Servizi: %d" IDS_STOP_DEPENDS "Quando %s si ferma, Questi altri sevizi si fermeranno" IDS_NO_DEPENDS "<Nessuna dipendenza>" - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Gestione dei servizi di ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/ja-JP.rc b/base/applications/mscutils/servman/lang/ja-JP.rc index e21d46bdaab..03e57c14208 100644 --- a/base/applications/mscutils/servman/lang/ja-JP.rc +++ b/base/applications/mscutils/servman/lang/ja-JP.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "サービスマネージャについて" -FONT 9, "MS UI Gothic", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "サービスマネージャ v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "閉じる", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "サービスの数: %d" IDS_STOP_DEPENDS "%s を停止する場合、これらのサービスも停止します" IDS_NO_DEPENDS "<依存関係なし>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS サービスマネージャ" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/ko-KR.rc b/base/applications/mscutils/servman/lang/ko-KR.rc index 84036c6fe01..ec78f2ca640 100644 --- a/base/applications/mscutils/servman/lang/ko-KR.rc +++ b/base/applications/mscutils/servman/lang/ko-KR.rc @@ -70,17 +70,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "서비스 매니저에 대하여" -FONT 9, "굴림", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "닫기", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "General" FONT 9, "굴림", 0, 0 @@ -264,7 +253,6 @@ BEGIN IDS_NUM_SERVICES "모든 서비스: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -333,6 +321,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS 서비스 관리자" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/no-NO.rc b/base/applications/mscutils/servman/lang/no-NO.rc index 851e88b05b1..3ccd4005f05 100644 --- a/base/applications/mscutils/servman/lang/no-NO.rc +++ b/base/applications/mscutils/servman/lang/no-NO.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Om Tjenestebehandler" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Tjenestebehandler v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Num tjeneste: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Tjenestebehandler" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/pl-PL.rc b/base/applications/mscutils/servman/lang/pl-PL.rc index b96cce7d94a..eb33eecb4aa 100644 --- a/base/applications/mscutils/servman/lang/pl-PL.rc +++ b/base/applications/mscutils/servman/lang/pl-PL.rc @@ -78,17 +78,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Menedżer usług - informacje" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Menedżer usług v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 225 CAPTION "Ogólny" FONT 8, "MS Shell Dlg", 0, 0 @@ -272,7 +261,6 @@ BEGIN IDS_NUM_SERVICES "Numer usługi: %d" IDS_STOP_DEPENDS "Kiedy %s się zatrzyma, inne usługi od niej zależne również się zatrzymają" IDS_NO_DEPENDS "<Brak zależności>" - IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚ [...] END STRINGTABLE @@ -341,6 +329,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Menedżer usług ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc b/base/applications/mscutils/servman/lang/ro-RO.rc index 6740bedbb66..0e90694b289 100644 --- a/base/applications/mscutils/servman/lang/ro-RO.rc +++ b/base/applications/mscutils/servman/lang/ro-RO.rc @@ -73,17 +73,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Despre Gestionar de servicii" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Gestionar de servicii v0.8\nDrept de autor (C) 2005-2007\nde Ged Murphy (gedmurphy(a)reactos.org)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Î&nchide", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 54, 174, 97, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0 @@ -267,7 +256,6 @@ BEGIN IDS_NUM_SERVICES "Nr. servicii: %d" IDS_STOP_DEPENDS "Dacă %s se oprește aceste procese se vor opri de asemenea." IDS_NO_DEPENDS "<Fără dependențe>" - IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența P [...] END STRINGTABLE @@ -336,6 +324,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Gestionar de servicii" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/ru-RU.rc b/base/applications/mscutils/servman/lang/ru-RU.rc index 8f504b4d404..588e7866433 100644 --- a/base/applications/mscutils/servman/lang/ru-RU.rc +++ b/base/applications/mscutils/servman/lang/ru-RU.rc @@ -68,17 +68,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "О Диспетчере служб" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Диспетчер служб v0.8\nАвторское право (C) 2005-2007\nГед Мерфи (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 32 - PUSHBUTTON "&Закрыть", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Общие" FONT 8, "MS Shell Dlg", 0, 0 @@ -262,7 +251,6 @@ BEGIN IDS_NUM_SERVICES "Всего служб: %d" IDS_STOP_DEPENDS "После остановки %s, следующие службы тоже будут остановлены" IDS_NO_DEPENDS "<Нет зависимостей>" - IDS_LICENSE "Эта программа является свободным программным обеспечением; Вы можете распространять и/или изменять ее в соответствии с лицензией GNU General Public License версии 2 или более поздней, опубликованной Free Software Foundation.\r\n\r\nЭта программа распространяется с надеждой, что она может быть полезна, но БЕЗ ВСЯКОЙ ГАРАНТИИ; не подразумевается даже РАБОТОСПОСОБНОСТЬ или ПРИГОДНОСТЬ ДЛЯ ВЫПОЛНЕНИЯ НЕОБХОДИМЫХ ЗАДАЧ. См. GNU General Public License для получения дополнитель [...] END STRINGTABLE @@ -331,6 +319,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Диспетчер служб ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/sk-SK.rc b/base/applications/mscutils/servman/lang/sk-SK.rc index f5c88129fcf..c65f787b65a 100644 --- a/base/applications/mscutils/servman/lang/sk-SK.rc +++ b/base/applications/mscutils/servman/lang/sk-SK.rc @@ -73,17 +73,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Čo je Manažér služieb" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Manažér služieb v0.8\nAutorské práva (C) 2005-2007\nod Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Zavrieť", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Všeobecné" FONT 8, "MS Shell Dlg", 0, 0 @@ -267,7 +256,6 @@ BEGIN IDS_NUM_SERVICES "Počet služieb: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<Žiadne závislosti>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -336,6 +324,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Manažér služieb systému ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/sq-AL.rc b/base/applications/mscutils/servman/lang/sq-AL.rc index 4f9c936ed2e..6273d510ac8 100644 --- a/base/applications/mscutils/servman/lang/sq-AL.rc +++ b/base/applications/mscutils/servman/lang/sq-AL.rc @@ -73,17 +73,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Rreth Menaxherit të Shërbimeve" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Menaxher Shërbimesh v0.8\nCopyright (C) 2005-2007\nnga Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Mbyll", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg", 0, 0 @@ -267,7 +256,6 @@ BEGIN IDS_NUM_SERVICES "Num Shërbimit: %d" IDS_STOP_DEPENDS "Kur %s ndalon, keto shërbime te tjera do të ndalojnë gjithashtu" IDS_NO_DEPENDS "<Ska varës>" - IDS_LICENSE "Ky program është software falas; ju mund ta shpërndani dhe / ose modifikoni sipas kushteve të GNU General Public License të publikuar nga Fondacioni Free Software; sipas versionit 2 të Liçencës, ose (sipas opinionit tuaj) çdo versioni të mëvonshëm.\r\n\r\nKy program shpërndahet me shpresën që do t'ju jetë i dobishëm, por PA ASNJË GARANCI; madje edhe pa garancinë preçize të SHITJES apo PËRDORIMIT PËR NJË QËLLIM TË CAKTUAR. Shiko Liçencën Publike të Përgjithshme GNU për më [...] END STRINGTABLE @@ -336,6 +324,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Menaxhues i shërbimeve të ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/sv-SE.rc b/base/applications/mscutils/servman/lang/sv-SE.rc index 2cb32144080..a553372ec22 100644 --- a/base/applications/mscutils/servman/lang/sv-SE.rc +++ b/base/applications/mscutils/servman/lang/sv-SE.rc @@ -75,17 +75,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Om Tjänster" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Tjänster v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Stäng", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Allmännt" FONT 8, "MS Shell Dlg", 0, 0 @@ -269,7 +258,6 @@ BEGIN IDS_NUM_SERVICES "Num tjänster: %d" IDS_STOP_DEPENDS "När %s stoppas, kommer också dessa tjänster att stanna" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det och/eller ändra det under villkoren enligt GNU General Public License som är utgivet av Free Software Foundation; version 2, eller (om du så önskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se på GNU General Public Licensen för mer detaljer [...] END STRINGTABLE @@ -338,6 +326,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS tjänster" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/th-TH.rc b/base/applications/mscutils/servman/lang/th-TH.rc index 23706f70e6a..19fe4578963 100644 --- a/base/applications/mscutils/servman/lang/th-TH.rc +++ b/base/applications/mscutils/servman/lang/th-TH.rc @@ -76,17 +76,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "เกี่ยวกับการบริการจัดการ" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "โปรแกรมการบริการจัดการ รุ่น 0.8\nลิขสิทธิ์ (C) 2005-2007\nโดย เก้ด เมอร์ฟี่ (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "ปิด", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "ทั่วไป" FONT 8, "MS Shell Dlg", 0, 0 @@ -270,7 +259,6 @@ BEGIN IDS_NUM_SERVICES "Num Services: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] END STRINGTABLE @@ -339,6 +327,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS Service Manager" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/tr-TR.rc b/base/applications/mscutils/servman/lang/tr-TR.rc index fad8766630b..3c4d5b2dcfa 100644 --- a/base/applications/mscutils/servman/lang/tr-TR.rc +++ b/base/applications/mscutils/servman/lang/tr-TR.rc @@ -70,17 +70,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Himet Yöneticisi Üzerine" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Hizmet Yöneticisi - Sürüm: 0.8\nTelif Hakkı: 2005-2007\nGed Murphy (gedmurphy(a)reactos.org) ile.", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Umûmî" FONT 8, "MS Shell Dlg", 0, 0 @@ -264,7 +253,6 @@ BEGIN IDS_NUM_SERVICES "Hizmet Sayısı: %d" IDS_STOP_DEPENDS "%s durduğunda bu hizmetler de duracaktır:" IDS_NO_DEPENDS "<Bağımlılık Yok>" - IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır [...] END STRINGTABLE @@ -333,6 +321,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Hizmet Yöneticisi" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/uk-UA.rc b/base/applications/mscutils/servman/lang/uk-UA.rc index a4fe3d509f7..48626e4f20b 100644 --- a/base/applications/mscutils/servman/lang/uk-UA.rc +++ b/base/applications/mscutils/servman/lang/uk-UA.rc @@ -76,17 +76,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "Про програму ""Диспетчер керування службами""" -FONT 8, "MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Диспетчер керування службами v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Закрити", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "Загальні" FONT 8, "MS Shell Dlg", 0, 0 @@ -270,7 +259,6 @@ BEGIN IDS_NUM_SERVICES "Hомер служби: %d" IDS_STOP_DEPENDS "Коли %s зупинеться, наступні служби також буде зупинено" IDS_NO_DEPENDS "<No Dependencies>" - IDS_LICENSE "Це вільне програмне забезпечення; Ви можете розповсюджувати її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці містяться у Відкритій ліцензійній угоді [...] END STRINGTABLE @@ -339,6 +327,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "Диспетчер керування службами ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/zh-CN.rc b/base/applications/mscutils/servman/lang/zh-CN.rc index df562a2a091..c910aea0ae5 100644 --- a/base/applications/mscutils/servman/lang/zh-CN.rc +++ b/base/applications/mscutils/servman/lang/zh-CN.rc @@ -70,17 +70,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "关于服务管理器" -FONT 9, "宋体", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "服务管理器 v0.8\n版权所有 (C) 2005-2007\n作者 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "关闭(&C)", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "常规" FONT 9, "宋体", 0, 0 @@ -264,7 +253,6 @@ BEGIN IDS_NUM_SERVICES "服务总数: %d" IDS_STOP_DEPENDS "当 %s 停止时，这些服务也将被停止" IDS_NO_DEPENDS "<无依赖>" - IDS_LICENSE "这个程序是自由软件；你可以在自由软件基金会(FSF)的 GNU LGPL 协议下重新发布或修改它；也适用于这个协议的版本 2，或(在您看来)任何更新的版本。\r\n\r\n这个程序在希望其有用的愿望中发布，但没有任何保证；也不意味着性能保证或对某特定用途的适用性。请查看 GNU GPL 许可协议以了解更多细节。\r\n\r\n您应该已经收到了一份和这个程序一起的 GNU GPL 协议的副本；如果没有，请写信给自由软件基金会(FSF)：51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE @@ -333,6 +321,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS 服务管理器" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/lang/zh-TW.rc b/base/applications/mscutils/servman/lang/zh-TW.rc index 27ca6c40bd5..abf56cc0e21 100644 --- a/base/applications/mscutils/servman/lang/zh-TW.rc +++ b/base/applications/mscutils/servman/lang/zh-TW.rc @@ -70,17 +70,6 @@ BEGIN VK_F5, ID_REFRESH, VIRTKEY END -IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 -CAPTION "關於服務管理員" -FONT 9, "新細明體", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "服務管理員 v0.8\n版權所有 (C) 2005-2007\n作者 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "關閉", IDOK, 75, 162, 44, 15 - ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "普通" FONT 9, "新細明體", 0, 0 @@ -264,7 +253,6 @@ BEGIN IDS_NUM_SERVICES "服務總數: %d" IDS_STOP_DEPENDS "當 %s 停止時，這些服務也將被停止" IDS_NO_DEPENDS "<沒有依賴>" - IDS_LICENSE "這個程式是自由軟體；你可以在自由軟體基金會(FSF)的 GNU LGPL 協定下重新發佈或修改它；也適用于這個協定的版本 2，或(在您看來)任何更新的版本。\r\n\r\n這個程式在希望其有用的願望中發佈，但沒有任何保證；也不意味著性能保證或對某特定用途的適用性。請查看 GNU GPL 授權合約以瞭解更多細節。\r\n\r\n您應該已經收到了一份和這個程式一起的 GNU GPL 協定的副本；如果沒有，請寫信給自由軟體基金會(FSF)：51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE @@ -333,6 +321,7 @@ END STRINGTABLE BEGIN IDS_APPNAME "ReactOS 服務管理員" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c index 9358bd4c14f..02d4ff55232 100644 --- a/base/applications/mscutils/servman/mainwnd.c +++ b/base/applications/mscutils/servman/mainwnd.c @@ -10,6 +10,7 @@ #include "precomp.h" #include <windowsx.h> +#include <shellapi.h> static const WCHAR szMainWndClass[] = L"ServManWndClass"; @@ -23,7 +24,7 @@ static const TBBUTTON Buttons [] = /* Note: First item for a separator is its width in pixels */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_CREATE, ID_CREATE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* create */ + {TBICON_CREATE, ID_CREATE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* create */ {TBICON_DELETE, ID_DELETE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* delete */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -374,7 +375,6 @@ InitMainWnd(PMAIN_WND_INFO Info) return TRUE; } - static VOID MainWndCommand(PMAIN_WND_INFO Info, WORD CmdId, @@ -382,6 +382,10 @@ MainWndCommand(PMAIN_WND_INFO Info, { UNREFERENCED_PARAMETER(hControl); + WCHAR szAppName[256]; + WCHAR szAppAuthors[256]; + HICON hIcon; + switch (CmdId) { case ID_PROP: @@ -590,11 +594,12 @@ MainWndCommand(PMAIN_WND_INFO Info, break; case ID_ABOUT: - DialogBox(hInstance, - MAKEINTRESOURCE(IDD_ABOUTBOX), - Info->hMainWnd, - AboutDialogProc); - SetFocus(Info->hListView); + LoadStringW(hInstance, IDS_APPNAME, szAppName, _countof(szAppName)); + LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, _countof(szAppAuthors)); + + hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON)); + ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon); + DestroyIcon(hIcon); break; } diff --git a/base/applications/mscutils/servman/resource.h b/base/applications/mscutils/servman/resource.h index 76f0e1e0e73..3277200005f 100644 --- a/base/applications/mscutils/servman/resource.h +++ b/base/applications/mscutils/servman/resource.h @@ -5,10 +5,8 @@ #define IDA_SERVMAN 20 /* about box info */ -#define IDD_ABOUTBOX 200 -#define IDC_LICENSE_EDIT 201 -#define IDS_APPNAME 202 -#define IDS_LICENSE 203 +#define IDS_APPAUTHORS 200 +#define IDS_APPNAME 201 #define IDC_SERVLIST 1000 #define IDC_STATUSBAR 1001

1 0

[reactos] 01/01: [SHORTCUTS] Addition of Wine IE Shortcuts in Start Menu (#2726)
by Kyle Katarn 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6ab64e0f2eeebb97cdf9… commit c6ab64e0f2eeebb97cdf9116703ddde52ca8f250 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu May 14 14:24:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:24:59 2020 +0200 [SHORTCUTS] Addition of Wine IE Shortcuts in Start Menu (#2726) CORE-11257 --- media/inf/shortcuts.inf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 58493c61d75..076fa0db147 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -22,6 +22,7 @@ QuickLaunchShortcuts=26, Microsoft\Internet Explorer\Quick Launch [ProgramShortcuts] %SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 +%16422%\Internet Explorer\iexplore.exe, %IEXPLORE_TITLE%, %IEXPLORE_DESC%, 0 [AdminToolsShortcuts] %SystemRoot%\system32\servman.exe, %SERVMAN_TITLE%, %SERVMAN_DESC%, 0 @@ -136,6 +137,8 @@ SPIDER_TITLE=Spider Solitaire SPIDER_DESC=Spider Solitaire UTILMAN_TITLE=Accessibility Utility Manager UTILMAN_DESC=Launch Accessibility Utility Manager +IEXPLORE_TITLE=Wine Internet Explorer +IEXPLORE_DESC=Wine Web Browser ; Bulgarian [Strings.0402] @@ -585,6 +588,8 @@ SPIDER_TITLE=Spider Solitaire SPIDER_DESC=Spider Solitaire UTILMAN_TITLE=Gestionnaire d'utilitaires d'accessibilité UTILMAN_DESC=Lance le gestionnaire d'utilitaires d'accessibilité +IEXPLORE_TITLE=Wine Internet Explorer +IEXPLORE_DESC=Lance le navigateur Wine Internet Explorer ; Hebrew [Strings.040D]

1 0

[reactos] 01/01: [REGAPI] Import regapi.dll from Wine Staging 5.7 CORE-16458 (#2723)
by Oleg Dubinskiy 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90aff2947bd5e829dd64a… commit 90aff2947bd5e829dd64ab797806109bdf712198 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu May 14 15:21:16 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 14:21:16 2020 +0200 [REGAPI] Import regapi.dll from Wine Staging 5.7 CORE-16458 (#2723) - Comment some other missing exports Windows regapi.dll has them, but Wine's one doesn't. Required by MS winlogon with Win32SS replaced. I double-rechecked: now it doesn't fail due to missing regapi.dll in system32 or separate missing functions in this dll, exactly the same as with MS regapi. In pair with my profmap.dll (which was merged recently), now it fails due to InitializeUserProfile() stub in our userenv.dll (if to replace msgina too). Also I compared the exports of MS regapi.dll and Wine's one. Win2k3 version has all exports that Wine version has and some others (which looks like were dropped in NT6). But those exports which already exist, are enough to allow MS winlogon no longer fail. CORE-16458 --- dll/win32/CMakeLists.txt | 1 + dll/win32/regapi/CMakeLists.txt | 15 ++++++++ dll/win32/regapi/main.c | 44 +++++++++++++++++++++ dll/win32/regapi/regapi.spec | 84 +++++++++++++++++++++++++++++++++++++++++ media/doc/README.WINE | 1 + 5 files changed, 145 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 476aaec6fcb..533d1dcf243 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -168,6 +168,7 @@ add_subdirectory(rasadhlp) add_subdirectory(rasapi32) add_subdirectory(rasdlg) add_subdirectory(rasman) +add_subdirectory(regapi) add_subdirectory(resutils) add_subdirectory(riched20) add_subdirectory(riched32) diff --git a/dll/win32/regapi/CMakeLists.txt b/dll/win32/regapi/CMakeLists.txt new file mode 100644 index 00000000000..c5d45a10bb5 --- /dev/null +++ b/dll/win32/regapi/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(regapi.dll regapi.spec) + +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/regapi_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/regapi.def) + +add_library(regapi MODULE ${SOURCE}) +set_module_type(regapi win32dll) +target_link_libraries(regapi wine) +add_importlibs(regapi advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET regapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/regapi/main.c b/dll/win32/regapi/main.c new file mode 100644 index 00000000000..1164e92102a --- /dev/null +++ b/dll/win32/regapi/main.c @@ -0,0 +1,44 @@ +/* + * regapi implementation + * + * Copyright 2011 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regapi); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dll/win32/regapi/regapi.spec b/dll/win32/regapi/regapi.spec new file mode 100644 index 00000000000..717939e124a --- /dev/null +++ b/dll/win32/regapi/regapi.spec @@ -0,0 +1,84 @@ +# GetDomainName +# QueryUserProperty +@ stub RegBuildNumberQuery +@ stub RegCdCreateA +@ stub RegCdCreateW +@ stub RegCdDeleteA +@ stub RegCdDeleteW +@ stub RegCdEnumerateA +@ stub RegCdEnumerateW +@ stub RegCdQueryA +@ stub RegCdQueryW +@ stub RegCloseServer +@ stub RegConsoleShadowQueryA +@ stub RegConsoleShadowQueryW +# RegCreateUserConfigW +@ stub RegDefaultUserConfigQueryA +@ stub RegDefaultUserConfigQueryW +@ stub RegDenyTSConnectionsPolicy +@ stub RegFreeUtilityCommandList +# RegGetLicensingModePolicy +@ stub RegGetMachinePolicy +@ stub RegGetMachinePolicyEx +# RegGetMachinePolicyNew +@ stub RegGetTServerVersion +@ stub RegGetUserConfigFromUserParameters +@ stub RegGetUserPolicy +@ stub RegIsMachineInHelpMode +@ stub RegIsMachinePolicyAllowHelp +# RegIsTimeZoneRedirectionEnabled +@ stub RegIsTServer +@ stub RegMergeUserConfigWithUserParameters +@ stub RegOpenServerA +@ stub RegOpenServerW +@ stub RegPdCreateA +@ stub RegPdCreateW +@ stub RegPdDeleteA +@ stub RegPdDeleteW +@ stub RegPdEnumerateA +@ stub RegPdEnumerateW +@ stub RegPdQueryA +@ stub RegPdQueryW +@ stub RegQueryOEMId +@ stub RegQueryUtilityCommandList +@ stub RegSAMUserConfig +@ stub RegUserConfigDelete +@ stub RegUserConfigQuery +@ stub RegUserConfigRename +@ stub RegUserConfigSet +@ stub RegWdCreateA +@ stub RegWdCreateW +@ stub RegWdDeleteA +@ stub RegWdDeleteW +@ stub RegWdEnumerateA +@ stub RegWdEnumerateW +@ stub RegWdQueryA +@ stub RegWdQueryW +@ stub RegWinStationAccessCheck +@ stub RegWinStationCreateA +@ stub RegWinStationCreateW +@ stub RegWinStationDeleteA +@ stub RegWinStationDeleteW +@ stub RegWinStationEnumerateA +@ stub RegWinStationEnumerateW +@ stub RegWinStationQueryA +@ stub RegWinStationQueryDefaultSecurity +@ stub RegWinStationQueryEx +# RegWinStationQueryExNew +@ stub RegWinStationQueryNumValueW +@ stub RegWinStationQuerySecurityA +# RegWinstationQuerySecurityConfig_Machine +# RegWinstationQuerySecurityConfig_Merged +@ stub RegWinStationQuerySecurityW +@ stub RegWinStationQueryValueW +@ stub RegWinStationQueryW +@ stub RegWinStationSetNumValueW +@ stub RegWinStationSetSecurityA +# RegWinstationSetSecurityConfig +@ stub RegWinStationSetSecurityW +# SetUserProperty +# UsrPropGetString +# UsrPropGetValue +# UsrPropSetString +# UsrPropSetValue +@ stub WaitForTSConnectionsPolicyChanges diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 718ba2425d9..b174c23d3cf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -158,6 +158,7 @@ dll/win32/qmgr # Synced to WineStaging-4.18 dll/win32/qmgrprxy # Synced to WineStaging-2.9 dll/win32/query # Synced to WineStaging-4.18 dll/win32/rasapi32 # Synced to WineStaging-3.3 +dll/win32/regapi # Synced to WineStaging-5.7 dll/win32/resutils # Synced to WineStaging-3.3 dll/win32/riched20 # Synced to WineStaging-4.18 dll/win32/riched32 # Synced to WineStaging-3.3

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