Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: Revert "Disable some C++ code, which doesn't compile for me"
by Hervé Poussineau 15 Feb '21

15 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=796a536a22305ea3158c9… commit 796a536a22305ea3158c905c7e2d1d43157f3fc9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Feb 16 00:13:18 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Feb 16 00:13:18 2021 +0100 Revert "Disable some C++ code, which doesn't compile for me" This reverts commit 83d9920cb9a1ff0fb7dca07402b2aaba2f9cc644. --- base/applications/CMakeLists.txt | 2 +- base/applications/network/CMakeLists.txt | 2 +- dll/shellext/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 5d88d1ed543..082b2121b35 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) -#add_subdirectory(drwtsn32) +add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index eca45a3e316..46246108408 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) if(NOT USE_CLANG_CL) - #add_subdirectory(telnet) + add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 6eb0717474d..8d005319c4c 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -10,6 +10,6 @@ add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(sendmail) -#add_subdirectory(shellbtrfs) +add_subdirectory(shellbtrfs) add_subdirectory(stobject) add_subdirectory(zipfldr)

1 0

[reactos] 02/02: Disable some C++ code, which doesn't compile for me
by Hervé Poussineau 15 Feb '21

15 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d9920cb9a1ff0fb7dca… commit 83d9920cb9a1ff0fb7dca07402b2aaba2f9cc644 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jun 3 21:46:52 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Feb 16 00:12:25 2021 +0100 Disable some C++ code, which doesn't compile for me --- base/applications/CMakeLists.txt | 2 +- base/applications/network/CMakeLists.txt | 2 +- dll/shellext/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 082b2121b35..5d88d1ed543 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) -add_subdirectory(drwtsn32) +#add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index 46246108408..eca45a3e316 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) if(NOT USE_CLANG_CL) - add_subdirectory(telnet) + #add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 8d005319c4c..6eb0717474d 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -10,6 +10,6 @@ add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(sendmail) -add_subdirectory(shellbtrfs) +#add_subdirectory(shellbtrfs) add_subdirectory(stobject) add_subdirectory(zipfldr)

1 0

[reactos] 01/02: [NTOS:KD] Merge initialization phases 1 and 2, and fix log file debugging
by Hervé Poussineau 15 Feb '21

15 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58332b076c7ae20fd3286… commit 58332b076c7ae20fd328690dc7631b78786ba12b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Feb 15 23:20:15 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Feb 16 00:12:25 2021 +0100 [NTOS:KD] Merge initialization phases 1 and 2, and fix log file debugging Phase 2 and 3 were not done anymore since 777a2d94da285f9ab612680ebb9f5d412b74fb68. Fix that, by merging phases 1 and 2, and by calling phase 3 later for log file debugging, when ExpInitializationPhase = 3 CORE-17470 --- ntoskrnl/kd/kdio.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index c1b01dec20b..288977bebbc 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -19,6 +19,7 @@ #define KdpBufferSize (1024 * 512) static BOOLEAN KdpLoggingEnabled = FALSE; +static BOOLEAN KdpLoggingStarting = FALSE; static PCHAR KdpDebugBuffer = NULL; static volatile ULONG KdpCurrentPosition = 0; static volatile ULONG KdpFreeBytes = 0; @@ -26,6 +27,7 @@ static KSPIN_LOCK KdpDebugLogSpinLock; static KEVENT KdpLoggerThreadEvent; static HANDLE KdpLogFileHandle; ANSI_STRING KdpLogFileName = RTL_CONSTANT_STRING("\\SystemRoot\\debug.log"); +extern ULONG ExpInitializationPhase; static KSPIN_LOCK KdpSerialSpinLock; ULONG SerialPortNumber = DEFAULT_DEBUG_PORT; @@ -155,6 +157,7 @@ KdpPrintToLogFile(PCHAR String, { KIRQL OldIrql; ULONG beg, end, num; + BOOLEAN DoReinit = FALSE; if (KdpDebugBuffer == NULL) return; @@ -184,8 +187,18 @@ KdpPrintToLogFile(PCHAR String, } /* Release the spinlock */ + if (OldIrql == PASSIVE_LEVEL && !KdpLoggingStarting && !KdpLoggingEnabled && ExpInitializationPhase >= 2) + { + DoReinit = TRUE; + } KdpReleaseLock(&KdpDebugLogSpinLock, OldIrql); + if (DoReinit) + { + KdpLoggingStarting = TRUE; + KdpDebugLogInit(NULL, 3); + } + /* Signal the logger thread */ if (OldIrql <= DISPATCH_LEVEL && KdpLoggingEnabled) KeSetEvent(&KdpLoggerThreadEvent, IO_NO_INCREMENT, FALSE); @@ -224,9 +237,7 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, /* Initialize spinlock */ KeInitializeSpinLock(&KdpDebugLogSpinLock); - } - else if (BootPhase == 2) - { + HalDisplayString("\r\n File log debugging enabled\r\n\r\n"); } else if (BootPhase == 3) @@ -338,7 +349,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } - else if (BootPhase == 2) + else if (BootPhase == 1) { HalDisplayString("\r\n Serial debugging enabled\r\n\r\n"); } @@ -508,9 +519,7 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, /* Initialize spinlock */ KeInitializeSpinLock(&KdpDmesgLogSpinLock); - } - else if (BootPhase == 2) - { + HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } }

1 0

[reactos] 01/01: [SHIMGVW] Refactoring (#3461)
by Katayama Hirofumi MZ 15 Feb '21

15 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99a9e7e49384c586e9b04… commit 99a9e7e49384c586e9b0408dc0d7816f2abf0cda Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 15 19:21:55 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 15 19:21:55 2021 +0900 [SHIMGVW] Refactoring (#3461) - Make the calls of CallWindowProc and DefWindowProc Wide (Unicode). - Delete needless type casts. - Add const to function arguments. - Improve ImageView_LoadSettings function. - Insert OFN_EXPLORER flag. --- dll/win32/shimgvw/shimgvw.c | 47 ++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 40723c2883f..a70ef51cc41 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -337,7 +337,7 @@ static void ResetZoom(void) } } -static void pLoadImage(LPWSTR szOpenFileName) +static void pLoadImage(LPCWSTR szOpenFileName) { /* check file presence */ if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) @@ -420,7 +420,7 @@ static void pSaveImageAs(HWND hwnd) sfn.lpstrFile = szSaveFileName; sfn.lpstrFilter = szFilterMask; sfn.nMaxFile = MAX_PATH; - sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; + sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; c = szFilterMask; @@ -798,24 +798,21 @@ ImageView_DrawImage(HWND hwnd) } static BOOL -ImageView_LoadSettings() +ImageView_LoadSettings(VOID) { HKEY hKey; DWORD dwSize; + LONG nError; - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - dwSize = sizeof(SHIMGVW_SETTINGS); - if (RegQueryValueEx(hKey, _T("Settings"), NULL, NULL, (LPBYTE)&shiSettings, &dwSize) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - return TRUE; - } + nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey); + if (nError) + return FALSE; - RegCloseKey(hKey); - } + dwSize = sizeof(shiSettings); + nError = RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&shiSettings, &dwSize); + RegCloseKey(hKey); - return FALSE; + return !nError; } static VOID @@ -845,13 +842,11 @@ ImageView_SaveSettings(HWND hwnd) static BOOL ImageView_CreateToolBar(HWND hwnd) { - int n; - hToolBar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, 0, 0, 0, 0, hwnd, 0, hInstance, NULL); - if(hToolBar != NULL) + if (hToolBar != NULL) { HIMAGELIST hImageList; @@ -864,7 +859,7 @@ ImageView_CreateToolBar(HWND hwnd) hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); if (hImageList == NULL) return FALSE; - for (n = 0; n < _countof(BtnConfig); n++) + for (INT n = 0; n < _countof(BtnConfig); n++) { ImageList_AddMasked(hImageList, LoadImageW(hInstance, MAKEINTRESOURCEW(BtnConfig[n].idb), IMAGE_BITMAP, TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); @@ -914,7 +909,7 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) break; } } - return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); + return CallWindowProcW(PrevProc, hwnd, Message, wParam, lParam); } static VOID @@ -1085,11 +1080,11 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) } } - return DefWindowProc(hwnd, Message, wParam, lParam); + return DefWindowProcW(hwnd, Message, wParam, lParam); } LONG WINAPI -ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) +ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) { struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; @@ -1132,7 +1127,7 @@ ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) if (!RegisterClassW(&WndClass)) return -1; - LoadStringW(hInstance, IDS_APPTITLE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + LoadStringW(hInstance, IDS_APPTITLE, szBuf, ARRAYSIZE(szBuf)); hMainWnd = CreateWindowExW(0, L"shimgvw_window", szBuf, WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CAPTION, CW_USEDEFAULT, CW_USEDEFAULT, @@ -1188,13 +1183,13 @@ ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) VOID WINAPI ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { - ImageView_CreateWindow(hwnd, (LPWSTR)path); + ImageView_CreateWindow(hwnd, path); } VOID WINAPI ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { - ImageView_CreateWindow(hwnd, (LPWSTR)path); + ImageView_CreateWindow(hwnd, path); } VOID WINAPI @@ -1202,9 +1197,9 @@ ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) { WCHAR szFile[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, (char*)path, strlen((char*)path)+1, szFile, MAX_PATH)) + if (MultiByteToWideChar(CP_ACP, 0, path, -1, szFile, ARRAYSIZE(szFile))) { - ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + ImageView_CreateWindow(hwnd, szFile); } }

1 0

[reactos] 01/01: [MMSYS] Add the OFN_EXPLORER flag to the Browse for sound dialog. (#3460)
by Jared Smudde 14 Feb '21

14 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b6e5e87c3a94192f0915… commit 8b6e5e87c3a94192f09156cf7d82936e41f7e31c Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Sun Feb 14 14:40:30 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 14 21:40:30 2021 +0100 [MMSYS] Add the OFN_EXPLORER flag to the Browse for sound dialog. (#3460) --- dll/cpl/mmsys/sounds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 8b6b7d296a9..89df8727728 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -1151,7 +1151,7 @@ SoundsDlgProc(HWND hwndDlg, LoadStringW(hApplet, IDS_BROWSE_FOR_SOUND, szTitle, _countof(szTitle)); ofn.lpstrTitle = szTitle; ofn.lpstrInitialDir = L"%SystemRoot%\\Media"; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; if (GetOpenFileNameW(&ofn) != FALSE) {

1 0

[reactos] 01/01: [SHIMGVW] Fix wrong text into the title bar. (#3459)
by Carlo Bramini 14 Feb '21

14 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac4b506eaba6f6cc81b87… commit ac4b506eaba6f6cc81b87fb6b12bdc824a601f87 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Sun Feb 14 18:38:36 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 15 02:38:36 2021 +0900 [SHIMGVW] Fix wrong text into the title bar. (#3459) Unicode/ANSI conversion problem happened by some wrong ANSI function calls. This PR fixes them by modifying CMakeLists.txt. --- dll/win32/shimgvw/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index fefd3d1ca02..43e9f10c839 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) add_library(shimgvw MODULE ${SOURCE}) -set_module_type(shimgvw win32dll) +set_module_type(shimgvw win32dll UNICODE) target_link_libraries(shimgvw wine) add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 shell32 gdiplus comdlg32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET shimgvw DESTINATION reactos/system32 FOR all)

1 0

[reactos] 01/01: [NETAPI32] Use our implementation of NetWkstaUserEnum instead of the Wine stub
by Eric Kohl 14 Feb '21

14 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a3c94e3016a4689d0376… commit 2a3c94e3016a4689d0376899cbfb9ed4b0c97a77 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 14 11:26:54 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 14 11:26:54 2021 +0100 [NETAPI32] Use our implementation of NetWkstaUserEnum instead of the Wine stub --- dll/win32/netapi32/wksta.c | 13 ------------- dll/win32/netapi32/wksta_new.c | 2 ++ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dll/win32/netapi32/wksta.c b/dll/win32/netapi32/wksta.c index af835f20f3a..8890d7ce7e5 100644 --- a/dll/win32/netapi32/wksta.c +++ b/dll/win32/netapi32/wksta.c @@ -419,19 +419,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, return NERR_Success; } -/************************************************************ - * NetWkstaUserEnum (NETAPI32.@) - */ -NET_API_STATUS WINAPI -NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, - LPDWORD totalentries, LPDWORD resumehandle) -{ - FIXME("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), - level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); - return ERROR_INVALID_PARAMETER; -} - /************************************************************ * NetpGetComputerName (NETAPI32.@) */ diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index 0c84a23f20f..29441bb52bc 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -1035,6 +1035,7 @@ NetWkstaTransportEnum( return status; } +#endif NET_API_STATUS @@ -1108,6 +1109,7 @@ NetWkstaUserEnum( } +#if 0 NET_API_STATUS WINAPI NetWkstaUserGetInfo(

1 0

[reactos] 01/01: [WKSSVC][NETAPI32] Implement NetrWkstaGetInfo and get rid of the old NetWkstaGetInfo implementation
by Eric Kohl 13 Feb '21

13 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87a4624e20b21d310b2f9… commit 87a4624e20b21d310b2f9adcdb94970eea914676 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 13 23:19:29 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 13 23:19:29 2021 +0100 [WKSSVC][NETAPI32] Implement NetrWkstaGetInfo and get rid of the old NetWkstaGetInfo implementation --- base/services/wkssvc/rpcserver.c | 140 ++++++++++++++++++++++++++++++++++++- dll/win32/netapi32/wksta.c | 84 ---------------------- dll/win32/netapi32/wksta_new.c | 4 +- sdk/include/reactos/idl/wkssvc.idl | 16 ++++- 4 files changed, 153 insertions(+), 91 deletions(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index 79a062c8ecc..f80461c0608 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -83,11 +83,145 @@ __stdcall NetrWkstaGetInfo( WKSSVC_IDENTIFY_HANDLE ServerName, unsigned long Level, - LPWKSTA_INFO WkstaInfo) -{ + LPWKSTA_INFO *WkstaInfo) +{ + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD dwComputerNameLength; + LPCWSTR pszLanRoot = L""; + PWKSTA_INFO pWkstaInfo = NULL; + OSVERSIONINFOW VersionInfo; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; + PPOLICY_PRIMARY_DOMAIN_INFO DomainInfo = NULL; + NTSTATUS NtStatus; + DWORD dwResult = NERR_Success; + TRACE("NetrWkstaGetInfo level %lu\n", Level); - return 0; + dwComputerNameLength = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(szComputerName, &dwComputerNameLength); + dwComputerNameLength++; /* include NULL terminator */ + + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + GetVersionExW(&VersionInfo); + + ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); + NtStatus = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle); + if (NtStatus != STATUS_SUCCESS) + { + WARN("LsaOpenPolicy() failed (Status 0x%08lx)\n", NtStatus); + return LsaNtStatusToWinError(NtStatus); + } + + NtStatus = LsaQueryInformationPolicy(PolicyHandle, + PolicyPrimaryDomainInformation, + (PVOID*)&DomainInfo); + + LsaClose(PolicyHandle); + + if (NtStatus != STATUS_SUCCESS) + { + WARN("LsaQueryInformationPolicy() failed (Status 0x%08lx)\n", NtStatus); + return LsaNtStatusToWinError(NtStatus); + } + + switch (Level) + { + case 100: + pWkstaInfo = midl_user_allocate(sizeof(WKSTA_INFO_100)); + if (pWkstaInfo == NULL) + { + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + pWkstaInfo->WkstaInfo100.wki100_platform_id = PLATFORM_ID_NT; + + pWkstaInfo->WkstaInfo100.wki100_computername = midl_user_allocate(dwComputerNameLength * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo100.wki100_computername != NULL) + wcscpy(pWkstaInfo->WkstaInfo100.wki100_computername, szComputerName); + + pWkstaInfo->WkstaInfo100.wki100_langroup = midl_user_allocate((wcslen(DomainInfo->Name.Buffer) + 1) * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo100.wki100_langroup != NULL) + wcscpy(pWkstaInfo->WkstaInfo100.wki100_langroup, DomainInfo->Name.Buffer); + + pWkstaInfo->WkstaInfo100.wki100_ver_major = VersionInfo.dwMajorVersion; + pWkstaInfo->WkstaInfo100.wki100_ver_minor = VersionInfo.dwMinorVersion; + + *WkstaInfo = pWkstaInfo; + break; + + case 101: + pWkstaInfo = midl_user_allocate(sizeof(WKSTA_INFO_101)); + if (pWkstaInfo == NULL) + { + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + pWkstaInfo->WkstaInfo101.wki101_platform_id = PLATFORM_ID_NT; + + pWkstaInfo->WkstaInfo101.wki101_computername = midl_user_allocate(dwComputerNameLength * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo101.wki101_computername != NULL) + wcscpy(pWkstaInfo->WkstaInfo101.wki101_computername, szComputerName); + + pWkstaInfo->WkstaInfo101.wki101_langroup = midl_user_allocate((wcslen(DomainInfo->Name.Buffer) + 1) * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo101.wki101_langroup != NULL) + wcscpy(pWkstaInfo->WkstaInfo101.wki101_langroup, DomainInfo->Name.Buffer); + + pWkstaInfo->WkstaInfo101.wki101_ver_major = VersionInfo.dwMajorVersion; + pWkstaInfo->WkstaInfo101.wki101_ver_minor = VersionInfo.dwMinorVersion; + + pWkstaInfo->WkstaInfo101.wki101_lanroot = midl_user_allocate((wcslen(pszLanRoot) + 1) * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo101.wki101_lanroot != NULL) + wcscpy(pWkstaInfo->WkstaInfo101.wki101_lanroot, pszLanRoot); + + *WkstaInfo = pWkstaInfo; + break; + + case 102: + pWkstaInfo = midl_user_allocate(sizeof(WKSTA_INFO_102)); + if (pWkstaInfo == NULL) + { + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + pWkstaInfo->WkstaInfo102.wki102_platform_id = PLATFORM_ID_NT; + + pWkstaInfo->WkstaInfo102.wki102_computername = midl_user_allocate(dwComputerNameLength * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo102.wki102_computername != NULL) + wcscpy(pWkstaInfo->WkstaInfo102.wki102_computername, szComputerName); + + pWkstaInfo->WkstaInfo102.wki102_langroup = midl_user_allocate((wcslen(DomainInfo->Name.Buffer) + 1) * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo102.wki102_langroup != NULL) + wcscpy(pWkstaInfo->WkstaInfo102.wki102_langroup, DomainInfo->Name.Buffer); + + pWkstaInfo->WkstaInfo102.wki102_ver_major = VersionInfo.dwMajorVersion; + pWkstaInfo->WkstaInfo102.wki102_ver_minor = VersionInfo.dwMinorVersion; + + pWkstaInfo->WkstaInfo102.wki102_lanroot = midl_user_allocate((wcslen(pszLanRoot) + 1) * sizeof(WCHAR)); + if (pWkstaInfo->WkstaInfo102.wki102_lanroot != NULL) + wcscpy(pWkstaInfo->WkstaInfo102.wki102_lanroot, pszLanRoot); + + pWkstaInfo->WkstaInfo102.wki102_logged_on_users = 1; /* FIXME */ + + *WkstaInfo = pWkstaInfo; + break; + + default: + FIXME("Level %d unimplemented\n", Level); + dwResult = ERROR_INVALID_LEVEL; + break; + } + + if (DomainInfo != NULL) + LsaFreeMemory(DomainInfo); + + return dwResult; } diff --git a/dll/win32/netapi32/wksta.c b/dll/win32/netapi32/wksta.c index 9200b17aaa0..af835f20f3a 100644 --- a/dll/win32/netapi32/wksta.c +++ b/dll/win32/netapi32/wksta.c @@ -468,87 +468,3 @@ NET_API_STATUS WINAPI I_NetNameValidate(LPVOID p1, LPWSTR wkgrp, LPVOID p3, FIXME("(%p %s %p %p): stub\n", p1, debugstr_w(wkgrp), p3, p4); return ERROR_INVALID_PARAMETER; } - -NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, - LPBYTE* bufptr) -{ - NET_API_STATUS ret; - - TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); - if (servername) - { - if (!NETAPI_IsLocalComputer(servername)) - { - FIXME("remote computers not supported\n"); - return ERROR_INVALID_LEVEL; - } - } - if (!bufptr) return ERROR_INVALID_PARAMETER; - - switch (level) - { - case 100: - case 101: - case 102: - { - static const WCHAR lanroot[] = {'c',':','\\','l','a','n','m','a','n',0}; /* FIXME */ - DWORD computerNameLen, domainNameLen, size; - WCHAR computerName[MAX_COMPUTERNAME_LENGTH + 1]; - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle; - NTSTATUS NtStatus; - - computerNameLen = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(computerName, &computerNameLen); - computerNameLen++; /* include NULL terminator */ - - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); - NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); - if (NtStatus != STATUS_SUCCESS) - ret = LsaNtStatusToWinError(NtStatus); - else - { - PPOLICY_PRIMARY_DOMAIN_INFO DomainInfo; - - LsaQueryInformationPolicy(PolicyHandle, - PolicyPrimaryDomainInformation, (PVOID*)&DomainInfo); - domainNameLen = lstrlenW(DomainInfo->Name.Buffer) + 1; - size = sizeof(WKSTA_INFO_102) + computerNameLen * sizeof(WCHAR) - + domainNameLen * sizeof(WCHAR) + sizeof(lanroot); - ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); - if (ret == NERR_Success) - { - /* INFO_100 and INFO_101 structures are subsets of INFO_102 */ - PWKSTA_INFO_102 info = (PWKSTA_INFO_102)*bufptr; - OSVERSIONINFOW verInfo; - - info->wki102_platform_id = PLATFORM_ID_NT; - info->wki102_computername = (LMSTR)(*bufptr + - sizeof(WKSTA_INFO_102)); - memcpy(info->wki102_computername, computerName, - computerNameLen * sizeof(WCHAR)); - info->wki102_langroup = info->wki102_computername + computerNameLen; - memcpy(info->wki102_langroup, DomainInfo->Name.Buffer, - domainNameLen * sizeof(WCHAR)); - info->wki102_lanroot = info->wki102_langroup + domainNameLen; - memcpy(info->wki102_lanroot, lanroot, sizeof(lanroot)); - memset(&verInfo, 0, sizeof(verInfo)); - verInfo.dwOSVersionInfoSize = sizeof(verInfo); - GetVersionExW(&verInfo); - info->wki102_ver_major = verInfo.dwMajorVersion; - info->wki102_ver_minor = verInfo.dwMinorVersion; - info->wki102_logged_on_users = 1; - } - LsaFreeMemory(DomainInfo); - LsaClose(PolicyHandle); - } - break; - } - - default: - FIXME("level %d unimplemented\n", level); - ret = ERROR_INVALID_LEVEL; - } - return ret; -} diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index 4bc96d01dbd..0c84a23f20f 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -856,7 +856,6 @@ NetValidateName( } -#if 0 NET_API_STATUS WINAPI NetWkstaGetInfo( @@ -878,7 +877,7 @@ NetWkstaGetInfo( { status = NetrWkstaGetInfo(servername, level, - (LPWKSTA_INFO)bufptr); + (LPWKSTA_INFO*)bufptr); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -888,7 +887,6 @@ NetWkstaGetInfo( return status; } -#endif NET_API_STATUS diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index 3f960f63725..b4cac96edd3 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -198,6 +198,7 @@ typedef struct _WKSTA_TRANSPORT_INFO_0 unsigned long wkti0_wan_ish; } WKSTA_TRANSPORT_INFO_0, *PWKSTA_TRANSPORT_INFO_0, *LPWKSTA_TRANSPORT_INFO_0; +/* typedef [switch_type(unsigned long)] union _WKSTA_INFO { [case(100)] LPWKSTA_INFO_100 WkstaInfo100; @@ -209,6 +210,18 @@ typedef [switch_type(unsigned long)] union _WKSTA_INFO [case(1046)] LPWKSTA_INFO_1046 WkstaInfo1046; [default] ; } WKSTA_INFO, *PWKSTA_INFO, *LPWKSTA_INFO; +*/ +typedef [switch_type(unsigned long)] union _WKSTA_INFO +{ + [case(100)] WKSTA_INFO_100 WkstaInfo100; + [case(101)] WKSTA_INFO_101 WkstaInfo101; + [case(102)] WKSTA_INFO_102 WkstaInfo102; + [case(502)] WKSTA_INFO_502 WkstaInfo502; + [case(1013)] WKSTA_INFO_1013 WkstaInfo1013; + [case(1018)] WKSTA_INFO_1018 WkstaInfo1018; + [case(1046)] WKSTA_INFO_1046 WkstaInfo1046; + [default] ; +} WKSTA_INFO, *PWKSTA_INFO, *LPWKSTA_INFO; typedef struct _USE_INFO_0 { @@ -366,7 +379,8 @@ interface wkssvc NetrWkstaGetInfo( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in] unsigned long Level, - [out, switch_is(Level)] LPWKSTA_INFO WkstaInfo); + [out, switch_is(Level)] LPWKSTA_INFO *WkstaInfo); +// [out, switch_is(Level)] LPWKSTA_INFO WkstaInfo); /* Function 1 */ unsigned long

1 0

[reactos] 01/01: [SHIMGVW]Update German translation
by Robert Naumann 13 Feb '21

13 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d1a8045817df8128a2fb… commit 0d1a8045817df8128a2fb357fad24872e264e857 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Sat Feb 13 20:59:38 2021 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Feb 13 20:59:38 2021 +0100 [SHIMGVW]Update German translation --- dll/win32/shimgvw/lang/de-DE.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/shimgvw/lang/de-DE.rc b/dll/win32/shimgvw/lang/de-DE.rc index fb02ee6920c..59215804a46 100644 --- a/dll/win32/shimgvw/lang/de-DE.rc +++ b/dll/win32/shimgvw/lang/de-DE.rc @@ -4,23 +4,23 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS-Bild- und Faxansicht" IDS_SETASDESKBG "Als Desktophintergrund setzen" - IDS_NOPREVIEW "No preview available." + IDS_NOPREVIEW "Keine Vorschau vorhanden." IDS_PREVIEW "Vorschau" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Nächstes Bild" IDS_TOOLTIP_PREV_PIC "Vorheriges Bild" - IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl+B)" - IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl+A)" - IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_BEST_FIT "An Fenster anpassen (Ctrl+B)" + IDS_TOOLTIP_REAL_SIZE "Tatsächliche Größe (Ctrl+A)" + IDS_TOOLTIP_SLIDE_SHOW "Diashow starten (F11)" IDS_TOOLTIP_ZOOM_IN "Vergrößern (+)" IDS_TOOLTIP_ZOOM_OUT "Verkleinern (-)" IDS_TOOLTIP_ROT_CLOCKW "Drehen im Uhrzeigersinn (Strg+K)" IDS_TOOLTIP_ROT_COUNCW "Drehen gegen den Uhrzeigersinn (Strg+L)" - IDS_TOOLTIP_DELETE "Delete (DEL)" + IDS_TOOLTIP_DELETE "Löschen (Entf)" IDS_TOOLTIP_PRINT "Drucken (Strg+P)" IDS_TOOLTIP_SAVEAS "Speichern unter... (Strg+S)" - IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" - IDS_TOOLTIP_HELP_TOC "Help topics (F1)" + IDS_TOOLTIP_MODIFY "Bearbeiten (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "Hilfethemen (F1)" END STRINGTABLE

1 0

[reactos] 01/01: [SHELL32] Update German translation
by Robert Naumann 13 Feb '21

13 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4058ee520df53b07c995… commit e4058ee520df53b07c995339eeb9ed0f9bc5778f Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Sat Feb 13 20:14:05 2021 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Feb 13 20:14:05 2021 +0100 [SHELL32] Update German translation -change "Meine Musik" to "Eigene Musik" to get a consistent naming. Same for "Meine Videos". --- dll/win32/shell32/lang/de-DE.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 65bcdb4b1d2..0dfa9dd9700 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -841,8 +841,8 @@ BEGIN IDS_RECENT "Dokumente" IDS_SENDTO "Senden an" IDS_STARTMENU "Startmenü" - IDS_MYMUSIC "Meine Musik" - IDS_MYVIDEO "Meine Videos" + IDS_MYMUSIC "Eigene Musik" + IDS_MYVIDEO "Eigene Videos" IDS_DESKTOPDIRECTORY "Desktop" IDS_NETHOOD "Netzwerkumgebung" IDS_TEMPLATES "Vorlagen"

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