Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[mjansen] 73453: [APPSHIM_APITEST] Update display mode shim tests to show some difference in versions + add extra tests. CORE-11927
by mjansen＠svn.reactos.org 14 Dec '16

14 Dec '16

Author: mjansen Date: Wed Dec 14 19:19:57 2016 New Revision: 73453 URL: http://svn.reactos.org/svn/reactos?rev=73453&view=rev Log: [APPSHIM_APITEST] Update display mode shim tests to show some difference in versions + add extra tests. CORE-11927 Modified: trunk/rostests/apitests/appshim/CMakeLists.txt trunk/rostests/apitests/appshim/dispmode.c Modified: trunk/rostests/apitests/appshim/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/CMakeLis… ============================================================================== --- trunk/rostests/apitests/appshim/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/CMakeLists.txt [iso-8859-1] Wed Dec 14 19:19:57 2016 @@ -8,5 +8,5 @@ add_executable(appshim_apitest ${SOURCE}) set_module_type(appshim_apitest win32cui) -add_importlibs(appshim_apitest msvcrt kernel32 ntdll) +add_importlibs(appshim_apitest version msvcrt kernel32 ntdll) add_cd_file(TARGET appshim_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/appshim/dispmode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/dispmode… ============================================================================== --- trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] Wed Dec 14 19:19:57 2016 @@ -28,33 +28,99 @@ #include <strsafe.h> #include "wine/test.h" -extern DWORD get_host_winver(void); -static DWORD g_WinVersion; +static DWORD g_Version; #define WINVER_ANY 0 -#define WINVER_VISTA 0x0600 /* apphelp.dll */ static BOOL(WINAPI* pSdbGetAppPatchDir)(PVOID, LPWSTR, DWORD); -/* aclayers.dll */ +/* aclayers.dll / acgenral.dll */ static PVOID(WINAPI* pGetHookAPIs)(LPCSTR, LPCWSTR, PDWORD); static BOOL(WINAPI* pNotifyShims)(DWORD fdwReason, PVOID ptr); - -static LONG g_Count; +DWORD get_module_version(HMODULE mod) +{ + DWORD dwVersion = 0; + HRSRC hResInfo = FindResource(mod, MAKEINTRESOURCE(VS_VERSION_INFO), RT_VERSION); + DWORD dwSize = SizeofResource(mod, hResInfo); + if (hResInfo && dwSize) + { + VS_FIXEDFILEINFO *lpFfi; + UINT uLen; + + HGLOBAL hResData = LoadResource(mod, hResInfo); + LPVOID pRes = LockResource(hResData); + HLOCAL pResCopy = LocalAlloc(LMEM_FIXED, dwSize); + + CopyMemory(pResCopy, pRes, dwSize); + FreeResource(hResData); + + if (VerQueryValueW(pResCopy, L"\\", (LPVOID*)&lpFfi, &uLen)) + { + dwVersion = (HIWORD(lpFfi->dwProductVersionMS) << 8) | LOWORD(lpFfi->dwProductVersionMS); + if (!dwVersion) + dwVersion = (HIWORD(lpFfi->dwFileVersionMS) << 8) | LOWORD(lpFfi->dwFileVersionMS); + } + + LocalFree(pResCopy); + } + + return dwVersion; +} + +static LONG g_ChangeCount; static DEVMODEA g_LastDevmode; static DWORD g_LastFlags; static LONG (WINAPI *pChangeDisplaySettingsA)(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags); LONG WINAPI mChangeDisplaySettingsA(_In_opt_ PDEVMODEA lpDevMode, _In_ DWORD dwflags) { - g_Count++; + g_ChangeCount++; g_LastDevmode = *lpDevMode; g_LastFlags = dwflags; return DISP_CHANGE_FAILED; } + +static LONG g_EnumCount; +static BOOL bFix = TRUE; + +static BOOL (WINAPI *pEnumDisplaySettingsA)(_In_opt_ LPCSTR lpszDeviceName, _In_ DWORD iModeNum, _Inout_ PDEVMODEA lpDevMode); +BOOL WINAPI mEnumDisplaySettingsA(_In_opt_ LPCSTR lpszDeviceName, _In_ DWORD iModeNum, _Inout_ PDEVMODEA lpDevMode) +{ + g_EnumCount++; + if (pEnumDisplaySettingsA(lpszDeviceName, iModeNum, lpDevMode)) + { + if (bFix) + { + if (lpDevMode && lpDevMode->dmBitsPerPel == 8) + { + trace("Running at 8bpp, faking 16\n"); + lpDevMode->dmBitsPerPel = 16; + } + if (lpDevMode && lpDevMode->dmPelsWidth == 640 && lpDevMode->dmPelsHeight == 480) + { + trace("Running at 640x480, faking 800x600\n"); + lpDevMode->dmPelsWidth = 800; + lpDevMode->dmPelsHeight = 600; + } + } + else + { + if (lpDevMode) + { + lpDevMode->dmBitsPerPel = 8; + lpDevMode->dmPelsWidth = 640; + lpDevMode->dmPelsHeight = 480; + } + } + return TRUE; + } + return FALSE; +} + + static LONG g_ThemeCount; static DWORD g_LastThemeFlags; @@ -77,33 +143,146 @@ static void pre_8bit(void) { - g_Count = 0; + g_ChangeCount = 0; memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); g_LastFlags = 0xffffffff; + g_EnumCount = 0; +} + +static void pre_8bit_2(void) +{ + bFix = FALSE; + + pre_8bit(); } static void post_8bit(void) { - ok_int(g_Count, 1); + ok_int(g_ChangeCount, 1); ok_hex(g_LastDevmode.dmFields & DM_BITSPERPEL, DM_BITSPERPEL); ok_int(g_LastDevmode.dmBitsPerPel, 8); ok_hex(g_LastFlags, CDS_FULLSCREEN); + ok_int(g_EnumCount, 1); +} + +static void post_8bit_2(void) +{ + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 1); + + bFix = TRUE; +} + +static void post_8bit_no(void) +{ + if (g_Version == _WIN32_WINNT_WS03) + { + ok_int(g_ChangeCount, 1); + ok_hex(g_LastDevmode.dmFields & DM_BITSPERPEL, DM_BITSPERPEL); + ok_int(g_LastDevmode.dmBitsPerPel, 8); + ok_hex(g_LastFlags, CDS_FULLSCREEN); + ok_int(g_EnumCount, 1); + } + else + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 0); + } + + bFix = TRUE; +} + +static void post_8bit_2_no(void) +{ + if (g_Version == _WIN32_WINNT_WS03) + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 1); + } + else + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 0); + } + + bFix = TRUE; } static void pre_640(void) { - g_Count = 0; + g_ChangeCount = 0; memset(&g_LastDevmode, 0, sizeof(g_LastDevmode)); g_LastFlags = 0xffffffff; + g_EnumCount = 0; +} + +static void pre_640_2(void) +{ + bFix = FALSE; + + pre_640(); } static void post_640(void) { - ok_int(g_Count, 1); + ok_int(g_ChangeCount, 1); ok_hex(g_LastDevmode.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT), (DM_PELSWIDTH | DM_PELSHEIGHT)); ok_int(g_LastDevmode.dmPelsWidth, 640); ok_int(g_LastDevmode.dmPelsHeight, 480); ok_hex(g_LastFlags, CDS_FULLSCREEN); + ok_int(g_EnumCount, 1); +} + +static void post_640_2(void) +{ + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 1); + + bFix = TRUE; +} + +static void post_640_no(void) +{ + if (g_Version == _WIN32_WINNT_WS03) + { + ok_int(g_ChangeCount, 1); + ok_hex(g_LastDevmode.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT), (DM_PELSWIDTH | DM_PELSHEIGHT)); + ok_int(g_LastDevmode.dmPelsWidth, 640); + ok_int(g_LastDevmode.dmPelsHeight, 480); + ok_hex(g_LastFlags, CDS_FULLSCREEN); + ok_int(g_EnumCount, 1); + } + else + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 0); + } + + bFix = TRUE; +} + +static void post_640_2_no(void) +{ + if (g_Version == _WIN32_WINNT_WS03) + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 1); + } + else + { + ok_int(g_ChangeCount, 0); + ok_hex(g_LastFlags, 0xffffffff); + ok_int(g_EnumCount, 0); + } + + bFix = TRUE; } static void pre_theme(void) @@ -116,6 +295,20 @@ { ok_int(g_ThemeCount, 1); ok_hex(g_LastThemeFlags, 0); +} + +static void post_theme_no(void) +{ + if (g_Version == _WIN32_WINNT_WS03) + { + ok_int(g_ThemeCount, 1); + ok_hex(g_LastThemeFlags, 0); + } + else + { + ok_int(g_ThemeCount, 0); + ok_hex(g_LastThemeFlags, 0xffffffff); + } } static PIMAGE_IMPORT_DESCRIPTOR FindImportDescriptor(PBYTE DllBase, PCSTR DllName) @@ -173,7 +366,8 @@ static BOOL hook_disp(HMODULE dll) { - return RedirectIat(dll, "user32.dll", "ChangeDisplaySettingsA", (ULONG_PTR)mChangeDisplaySettingsA, (ULONG_PTR*)&pChangeDisplaySettingsA); + return RedirectIat(dll, "user32.dll", "ChangeDisplaySettingsA", (ULONG_PTR)mChangeDisplaySettingsA, (ULONG_PTR*)&pChangeDisplaySettingsA) && + RedirectIat(dll, "user32.dll", "EnumDisplaySettingsA", (ULONG_PTR)mEnumDisplaySettingsA, (ULONG_PTR*)&pEnumDisplaySettingsA); } static BOOL hook_theme(HMODULE dll) @@ -182,7 +376,7 @@ } -static void test_one(LPCSTR shim, DWORD dwReason, void(*pre)(), void(*post)()) +static void test_one(LPCSTR shim, DWORD dwReason, void(*pre)(), void(*post)(), void(*second)(void)) { DWORD num_shims = 0; WCHAR wide_shim[50] = { 0 }; @@ -196,7 +390,7 @@ hook = pGetHookAPIs("", wide_shim, &num_shims); if (hook == NULL) { - skip("Skipping tests for layers (%s) not present in this os (0x%x)\n", shim, g_WinVersion); + skip("Skipping tests for layers (%s) not present in this os (0x%x)\n", shim, g_Version); return; } ok(hook != NULL, "Expected hook to be a valid pointer for %s\n", shim); @@ -209,8 +403,20 @@ if (post) post(); -} - + + /* Invoking it a second time does not call the init functions again! */ + if (pre && second) + { + pre(); + + ret = pNotifyShims(dwReason, NULL); + ok(ret != 0, "Expected pNotifyShims to succeed (%i)\n", ret); + + second(); + } +} + +/* In 2k3 0, 2, 4, 6, 8 are not guarded against re-initializations! */ static struct test_info { const char* name; @@ -220,14 +426,22 @@ BOOL(*hook)(HMODULE); void(*pre)(void); void(*post)(void); + void(*second)(void); } tests[] = { - { "Force8BitColor", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_8bit, post_8bit }, - { "Force8BitColor", L"\\aclayers.dll", WINVER_VISTA, 100, hook_disp, pre_8bit, post_8bit }, - { "Force640x480", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_640, post_640 }, - { "Force640x480", L"\\aclayers.dll", WINVER_VISTA, 100, hook_disp, pre_640, post_640 }, - { "DisableThemes", L"\\acgenral.dll", WINVER_ANY, 1, hook_theme, pre_theme, post_theme }, - { "DisableThemes", L"\\acgenral.dll", WINVER_VISTA, 100, hook_theme, pre_theme, post_theme }, + /* Success */ + { "Force8BitColor", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_8bit, post_8bit, post_8bit_no }, + { "Force8BitColor", L"\\aclayers.dll", _WIN32_WINNT_VISTA, 100, hook_disp, pre_8bit, post_8bit, post_8bit_no }, + { "Force640x480", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_640, post_640, post_640_no }, + { "Force640x480", L"\\aclayers.dll", _WIN32_WINNT_VISTA, 100, hook_disp, pre_640, post_640, post_640_no }, + { "DisableThemes", L"\\acgenral.dll", WINVER_ANY, 1, hook_theme, pre_theme, post_theme, post_theme_no }, + { "DisableThemes", L"\\acgenral.dll", _WIN32_WINNT_VISTA, 100, hook_theme, pre_theme, post_theme, post_theme_no }, + + /* No need to change anything */ + { "Force8BitColor", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_8bit_2, post_8bit_2, post_8bit_2_no }, + { "Force8BitColor", L"\\aclayers.dll", _WIN32_WINNT_VISTA, 100, hook_disp, pre_8bit_2, post_8bit_2, post_8bit_2_no }, + { "Force640x480", L"\\aclayers.dll", WINVER_ANY, 1, hook_disp, pre_640_2, post_640_2, post_640_2_no }, + { "Force640x480", L"\\aclayers.dll", _WIN32_WINNT_VISTA, 100, hook_disp, pre_640_2, post_640_2, post_640_2_no }, }; @@ -248,14 +462,25 @@ return; } - ret = tests[n].hook(dll); - if (ret) - { - test_one(tests[n].name, tests[n].reason, tests[n].pre, tests[n].post); - } - else - { - ok(0, "Unable to redirect functions!\n"); + g_Version = get_module_version(dll); + + if (!g_Version) + { + g_Version = _WIN32_WINNT_WS03; + trace("Module %s has no version, faking 2k3\n", wine_dbgstr_w(tests[n].dll)); + } + + if (g_Version >= tests[n].winver) + { + ret = tests[n].hook(dll); + if (ret) + { + test_one(tests[n].name, tests[n].reason, tests[n].pre, tests[n].post, tests[n].second); + } + else + { + ok(0, "Unable to redirect functions!\n"); + } } FreeLibrary(dll); if (unload) @@ -279,8 +504,6 @@ skip("apphelp.dll not loaded, or does not export SdbGetAppPatchDir\n"); return; } - - g_WinVersion = get_host_winver(); argc = winetest_get_mainargs(&argv); if (argc < 3) @@ -296,9 +519,6 @@ for (n = 0; n < _countof(tests); ++n) { LONG failures = winetest_get_failures(); - - if (g_WinVersion < tests[n].winver) - continue; if (dll == NULL) { @@ -322,10 +542,8 @@ } } - if (failures != winetest_get_failures()) - { - trace("Failures from %d (%s)\n", n, tests[n].name); - } + ok(failures == winetest_get_failures(), "Last %u failures are from %d (%s)\n", + winetest_get_failures() - failures, n, tests[n].name); } } else

1 0

[mjansen] 73452: [REGEDIT] Make the UpdateStatusBar function actually update the statusbar, instead of sending garbage to the treeview. CORE-10803
by mjansen＠svn.reactos.org 13 Dec '16

13 Dec '16

Author: mjansen Date: Tue Dec 13 21:47:22 2016 New Revision: 73452 URL: http://svn.reactos.org/svn/reactos?rev=73452&view=rev Log: [REGEDIT] Make the UpdateStatusBar function actually update the statusbar, instead of sending garbage to the treeview. CORE-10803 Modified: trunk/reactos/base/applications/regedit/framewnd.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Tue Dec 13 21:47:22 2016 @@ -178,10 +178,10 @@ void UpdateStatusBar(void) { - NMHDR nmhdr; - ZeroMemory(&nmhdr, sizeof(NMHDR)); - nmhdr.code = TVN_SELCHANGED; - SendMessageW(g_pChildWnd->hWnd, WM_NOTIFY, (WPARAM)TREE_WINDOW, (LPARAM)&nmhdr); + HKEY hKeyRoot; + LPCWSTR pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)pszKeyPath); } static void toggle_child(HWND hWnd, UINT cmd, HWND hchild)

1 0

[jimtabor] 73451: [User32] - Patch by Katayama Hirofumi MZ : DrawFrameControl draws bad. See CORE-12573.
by jimtabor＠svn.reactos.org 13 Dec '16

13 Dec '16

Author: jimtabor Date: Tue Dec 13 17:49:34 2016 New Revision: 73451 URL: http://svn.reactos.org/svn/reactos?rev=73451&view=rev Log: [User32] - Patch by Katayama Hirofumi MZ : DrawFrameControl draws bad. See CORE-12573. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Tue Dec 13 17:49:34 2016 @@ -663,6 +663,8 @@ HFONT hFont, hOldFont; int i; TCHAR OutRight, OutLeft, InRight, InLeft, Center; + INT BkMode = GetBkMode(dc); + COLORREF TextColor = GetTextColor(dc); if (Radio) { @@ -671,7 +673,8 @@ InRight = 'l'; // inner left InLeft = 'm'; // inner right Center = 'n'; // center - } else + } + else { OutRight = 'c'; // Outer right OutLeft = 'd'; // Outer left @@ -682,34 +685,53 @@ ZeroMemory(&lf, sizeof(LOGFONTW)); lf.lfHeight = r->top - r->bottom; - lf.lfWidth = 0; - lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); + if (Radio && ((uFlags & 0xFF) == DFCS_BUTTONRADIOMASK)) + { + lf.lfQuality = NONANTIALIASED_QUALITY; + } hFont = CreateFontIndirect(&lf); hOldFont = SelectObject(dc, hFont); - if(Radio && ((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)) - { + if (Radio && ((uFlags & 0xFF) == DFCS_BUTTONRADIOMASK)) + { +#if 1 + RECT Rect; + HGDIOBJ hbrOld, hpenOld; + FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); + Rect = *r; + InflateRect(&Rect, -1, -1); + hbrOld = SelectObject(dc, GetStockObject(BLACK_BRUSH)); + hpenOld = SelectObject(dc, GetStockObject(NULL_PEN)); + Ellipse(dc, Rect.left, Rect.top, Rect.right, Rect.bottom); + SelectObject(dc, hbrOld); + SelectObject(dc, hpenOld); +#else SetBkMode(dc, OPAQUE); - SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + SetBkColor(dc, RGB(255, 255, 255)); + SetTextColor(dc, RGB(0, 0, 0)); TextOut(dc, r->left, r->top, &Center, 1); SetBkMode(dc, TRANSPARENT); - SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); TextOut(dc, r->left, r->top, &OutRight, 1); - SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); TextOut(dc, r->left, r->top, &OutLeft, 1); + TextOut(dc, r->left, r->top, &InRight, 1); + TextOut(dc, r->left, r->top, &InLeft, 1); +#endif } else { SetBkMode(dc, TRANSPARENT); /* Center section, white for active, grey for inactive */ - i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; + if ((uFlags & (DFCS_INACTIVE | DFCS_PUSHED))) + i = COLOR_BTNFACE; + else + i = COLOR_WINDOW; SetTextColor(dc, GetSysColor(i)); TextOut(dc, r->left, r->top, &Center, 1); - if(uFlags & (DFCS_FLAT | DFCS_MONO)) + if (uFlags & (DFCS_FLAT | DFCS_MONO)) { SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); TextOut(dc, r->left, r->top, &OutRight, 1); @@ -728,19 +750,21 @@ SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); TextOut(dc, r->left, r->top, &InLeft, 1); } - } - - if(uFlags & DFCS_CHECKED) - { - TCHAR Check = (Radio) ? 'i' : 'b'; - - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - TextOut(dc, r->left, r->top, &Check, 1); - } - - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + + if (uFlags & DFCS_CHECKED) + { + TCHAR Check = (Radio) ? 'i' : 'b'; + + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + TextOut(dc, r->left, r->top, &Check, 1); + } + } + SelectObject(dc, hOldFont); DeleteObject(hFont); + + SetTextColor(dc, TextColor); + SetBkMode(dc, BkMode); return TRUE; }

1 0

[jimtabor] 73450: [User32] - Sync/Port wine UI code for drawing.
by jimtabor＠svn.reactos.org 13 Dec '16

13 Dec '16

Author: jimtabor Date: Tue Dec 13 17:27:37 2016 New Revision: 73450 URL: http://svn.reactos.org/svn/reactos?rev=73450&view=rev Log: [User32] - Sync/Port wine UI code for drawing. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Tue Dec 13 17:27:37 2016 @@ -136,7 +136,7 @@ || (uType & BDR_OUTER) == BDR_OUTER) && !(uFlags & (BF_FLAT|BF_MONO)) ); int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); /* Init some vars */ OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN); @@ -181,10 +181,8 @@ } } - if(InnerI != -1) - InnerPen = GetStockObject(DC_PEN); - if(OuterI != -1) - OuterPen = GetStockObject(DC_PEN); + if(InnerI != -1) InnerPen = GetStockObject(DC_PEN); + if(OuterI != -1) OuterPen = GetStockObject(DC_PEN); MoveToEx(hdc, 0, 0, &SavePoint); @@ -246,9 +244,9 @@ { case BF_DIAGONAL_ENDBOTTOMLEFT: case (BF_DIAGONAL|BF_BOTTOM): - case BF_DIAGONAL: - case (BF_DIAGONAL|BF_LEFT): - MoveToEx(hdc, spx-1, spy, NULL); + case BF_DIAGONAL: + case (BF_DIAGONAL|BF_LEFT): + MoveToEx(hdc, spx-1, spy, NULL); LineTo(hdc, epx, epy-1); Points[0].x = spx-add; Points[0].y = spy; @@ -272,10 +270,10 @@ break; case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT): - case BF_DIAGONAL_ENDTOPRIGHT: - case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT): - MoveToEx(hdc, spx+1, spy, NULL); + case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT): + case BF_DIAGONAL_ENDTOPRIGHT: + case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT): + MoveToEx(hdc, spx+1, spy, NULL); LineTo(hdc, epx, epy+1); Points[0].x = epx-1; Points[0].y = epy+1+add; @@ -301,9 +299,9 @@ break; case (BF_DIAGONAL|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT): - MoveToEx(hdc, spx+1, spy-1, NULL); + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT): + MoveToEx(hdc, spx+1, spy-1, NULL); LineTo(hdc, epx, epy); Points[0].x = epx-1; Points[0].y = epy+1; @@ -316,9 +314,9 @@ break; case (BF_DIAGONAL|BF_RIGHT): - case (BF_DIAGONAL|BF_RIGHT|BF_LEFT): - case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM): - MoveToEx(hdc, spx, spy, NULL); + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT): + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM): + MoveToEx(hdc, spx, spy, NULL); LineTo(hdc, epx-1, epy+1); Points[0].x = spx; Points[0].y = spy; @@ -347,14 +345,10 @@ /* Adjust rectangle if asked */ if(uFlags & BF_ADJUST) { - if(uFlags & BF_LEFT) - rc->left += add; - if(uFlags & BF_RIGHT) - rc->right -= add; - if(uFlags & BF_TOP) - rc->top += add; - if(uFlags & BF_BOTTOM) - rc->bottom -= add; + if(uFlags & BF_LEFT) rc->left += add; + if(uFlags & BF_RIGHT) rc->right -= add; + if(uFlags & BF_TOP) rc->top += add; + if(uFlags & BF_BOTTOM) rc->bottom -= add; } /* Cleanup */ @@ -368,6 +362,7 @@ /* Same as DrawEdge invoked without BF_DIAGONAL * * 23-Nov-1997: Changed by Bertho Stultiens + * The width parameter sets the width of each outer and inner edge. * * Well, I started testing this and found out that there are a few things * that weren't quite as win95. The following rewrite should reproduce @@ -434,25 +429,18 @@ * 21 = COLOR_3DDKSHADOW * 22 = COLOR_3DLIGHT */ -static BOOL IntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags) +static BOOL IntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags, UINT width) { signed char LTInnerI, LTOuterI; signed char RBInnerI, RBOuterI; - HPEN LTInnerPen, LTOuterPen; - HPEN RBInnerPen, RBOuterPen; - RECT InnerRect = *rc; - POINT SavePoint; - HPEN SavePen; - int LBpenplus = 0; - int LTpenplus = 0; - int RTpenplus = 0; - int RBpenplus = 0; + HBRUSH lti_brush, lto_brush, rbi_brush, rbo_brush; + RECT InnerRect = *rc, fill_rect; + int lbi_offset = 0, lti_offset = 0, rti_offset = 0, rbi_offset = 0; BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER - || (uType & BDR_OUTER) == BDR_OUTER) - && !(uFlags & (BF_FLAT|BF_MONO)) ); - /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, LTInnerPen); + || (uType & BDR_OUTER) == BDR_OUTER) + && !(uFlags & (BF_FLAT|BF_MONO)) ); + + lti_brush = lto_brush = rbi_brush = rbo_brush = GetStockObject(NULL_BRUSH); /* Determine the colors of the edges */ if(uFlags & BF_MONO) @@ -472,8 +460,7 @@ * otherwise. * Dennis BjÃ¶rklund, 10 June, 99 */ - if( LTInnerI != -1 ) - LTInnerI = RBInnerI = COLOR_BTNFACE; + if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE; } else if(uFlags & BF_SOFT) { @@ -490,103 +477,88 @@ RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; } - if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) - LBpenplus = 1; - if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) - RTpenplus = 1; - if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) - RBpenplus = 1; - if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) - LTpenplus = 1; - - if(LTInnerI != -1) - LTInnerPen = GetStockObject(DC_PEN); - if(LTOuterI != -1) - LTOuterPen = GetStockObject(DC_PEN); - if(RBInnerI != -1) - RBInnerPen = GetStockObject(DC_PEN); - if(RBOuterI != -1) - RBOuterPen = GetStockObject(DC_PEN); - if((uFlags & BF_MIDDLE) && retval) - { - FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? - COLOR_WINDOW : COLOR_BTNFACE)); - } - MoveToEx(hdc, 0, 0, &SavePoint); + if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) lbi_offset = width; + if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) rti_offset = width; + if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) rbi_offset = width; + if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) lti_offset = width; + + if(LTInnerI != -1) lti_brush = GetSysColorBrush(LTInnerI); + if(LTOuterI != -1) lto_brush = GetSysColorBrush(LTOuterI); + if(RBInnerI != -1) rbi_brush = GetSysColorBrush(RBInnerI); + if(RBOuterI != -1) rbo_brush = GetSysColorBrush(RBOuterI); /* Draw the outer edge */ - SelectObject(hdc, LTOuterPen); - SetDCPenColor(hdc, GetSysColor(LTOuterI)); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right, InnerRect.top); + fill_rect = InnerRect; + fill_rect.bottom = fill_rect.top + width; + FillRect( hdc, &fill_rect, lto_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); - LineTo(hdc, InnerRect.left, InnerRect.bottom); - } - SelectObject(hdc, RBOuterPen); - SetDCPenColor(hdc, GetSysColor(RBOuterI)); + fill_rect = InnerRect; + fill_rect.right = fill_rect.left + width; + FillRect( hdc, &fill_rect, lto_brush ); + } if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right, InnerRect.bottom-1); + fill_rect = InnerRect; + fill_rect.top = fill_rect.bottom - width; + FillRect( hdc, &fill_rect, rbo_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.bottom); + fill_rect = InnerRect; + fill_rect.left = fill_rect.right - width; + FillRect( hdc, &fill_rect, rbo_brush ); } /* Draw the inner edge */ - SelectObject(hdc, LTInnerPen); - SetDCPenColor(hdc, GetSysColor(LTInnerI)); if(uFlags & BF_TOP) { - MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); - LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1); + SetRect( &fill_rect, InnerRect.left + lti_offset, InnerRect.top + width, + InnerRect.right - rti_offset, InnerRect.top + 2 * width ); + FillRect( hdc, &fill_rect, lti_brush ); } if(uFlags & BF_LEFT) { - MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL); - LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); - } - SelectObject(hdc, RBInnerPen); - SetDCPenColor(hdc, GetSysColor(RBInnerI)); + SetRect( &fill_rect, InnerRect.left + width, InnerRect.top + lti_offset, + InnerRect.left + 2 * width, InnerRect.bottom - lbi_offset ); + FillRect( hdc, &fill_rect, lti_brush ); + } if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); + SetRect( &fill_rect, InnerRect.left + lbi_offset, InnerRect.bottom - 2 * width, + InnerRect.right - rbi_offset, InnerRect.bottom - width ); + FillRect( hdc, &fill_rect, rbi_brush ); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); + SetRect( &fill_rect, InnerRect.right - 2 * width, InnerRect.top + rti_offset, + InnerRect.right - width, InnerRect.bottom - rbi_offset ); + FillRect( hdc, &fill_rect, rbi_brush ); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) { - int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); - - if(uFlags & BF_LEFT) - InnerRect.left += add; - if(uFlags & BF_RIGHT) - InnerRect.right -= add; - if(uFlags & BF_TOP) - InnerRect.top += add; - if(uFlags & BF_BOTTOM) - InnerRect.bottom -= add; - - if(uFlags & BF_ADJUST) - *rc = InnerRect; - } - - /* Cleanup */ - SelectObject(hdc, SavePen); - MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL); + int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0) + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? width : 0); + + if(uFlags & BF_LEFT) InnerRect.left += add; + if(uFlags & BF_RIGHT) InnerRect.right -= add; + if(uFlags & BF_TOP) InnerRect.top += add; + if(uFlags & BF_BOTTOM) InnerRect.bottom -= add; + + if((uFlags & BF_MIDDLE) && retval) + { + FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? + COLOR_WINDOW : COLOR_BTNFACE)); + } + + if(uFlags & BF_ADJUST) + *rc = InnerRect; + } + return retval; } @@ -659,9 +631,9 @@ if(uFlags & DFCS_CHECKED) { if(uFlags & DFCS_MONO) - IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); else - IntDrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST); + IntDrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST, 1); UITOOLS_DrawCheckedRect( dc, &myr ); } @@ -669,23 +641,18 @@ { if(uFlags & DFCS_MONO) { - IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST, 1); FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE)); } else { - IntDrawRectEdge(dc, r, edge, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT | BF_SOFT); + IntDrawRectEdge(dc, r, edge, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT | BF_SOFT, 1); } } /* Adjust rectangle if asked */ if(uFlags & DFCS_ADJUSTRECT) - { - r->left += 2; - r->right -= 2; - r->top += 2; - r->bottom -= 2; - } + InflateRect(r, -2, -2); return TRUE; } @@ -830,9 +797,10 @@ Symbol = '2'; break; default: + WARN("Invalid caption; flags=0x%04x\n", uFlags); return FALSE; } - IntDrawRectEdge(dc,r,(uFlags&DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT); + IntDrawRectEdge(dc,r,(uFlags&DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT, 1); ZeroMemory(&lf, sizeof(LOGFONTW)); UITOOLS_MakeSquareRect(r, &myr); myr.left += 1; @@ -932,9 +900,10 @@ DeleteObject(hFont); return TRUE; default: + WARN("Invalid scroll; flags=0x%04x\n", uFlags); return FALSE; } - IntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT); + IntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT, 1); ZeroMemory(&lf, sizeof(LOGFONTW)); UITOOLS_MakeSquareRect(r, &myr); myr.left += 1; @@ -1004,9 +973,7 @@ break; default: -/* - DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); -*/ + WARN("Invalid menu; flags=0x%04x\n", uFlags); return FALSE; } /* acquire ressources only if valid menu */ @@ -1290,16 +1257,11 @@ return FALSE; } - if(!cx) - cx = s.cx; - if(!cy) - cy = s.cy; - } - - rc.left = x; - rc.top = y; - rc.right = x + cx; - rc.bottom = y + cy; + if(!cx) cx = s.cx; + if(!cy) cy = s.cy; + } + + SetRect(&rc, x, y, x + cx, y + cy); if(flags & DSS_RIGHT) /* This one is not documented in the win32.hlp file */ dtflags |= DT_RIGHT; @@ -1329,33 +1291,25 @@ /* From here on we must use "goto cleanup" when something goes wrong */ hbm = CreateBitmap(cx, cy, 1, 1, NULL); - if(!hbm) - goto cleanup; + if(!hbm) goto cleanup; memdc = CreateCompatibleDC(hdc); - if(!memdc) - goto cleanup; + if(!memdc) goto cleanup; hbmsave = (HBITMAP)SelectObject(memdc, hbm); - if(!hbmsave) - goto cleanup; - rc.left = rc.top = 0; - rc.right = cx; - rc.bottom = cy; - if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) - goto cleanup; + if(!hbmsave) goto cleanup; + SetRect(&rc, 0, 0, cx, cy); + if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); + SetLayout( memdc, GetLayout( hdc )); /* DST_COMPLEX may draw text as well, * so we must be sure that correct font is selected */ - if(!hfsave && (opcode <= DST_PREFIXTEXT)) - goto cleanup; + if(!hfsave && (opcode <= DST_PREFIXTEXT)) goto cleanup; tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode); - if(hfsave) - SelectObject(memdc, hfsave); - if(!tmp) - goto cleanup; + if(hfsave) SelectObject(memdc, hfsave); + if(!tmp) goto cleanup; /* This state cause the image to be dithered */ if(flags & DSS_UNION) @@ -1375,21 +1329,17 @@ /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) { - if(!hbrtmp) - goto cleanup; + if(!hbrtmp) goto cleanup; hbsave = (HBRUSH)SelectObject(hdc, hbrtmp); - if(!hbsave) - goto cleanup; - if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) - goto cleanup; + if(!hbsave) goto cleanup; + if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; SelectObject(hdc, hbsave); } if (flags & DSS_DISABLED) { hbr = hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); - if(!hbrtmp) - goto cleanup; + if(!hbrtmp) goto cleanup; } else if (!hbr) { @@ -1398,8 +1348,7 @@ hbsave = (HBRUSH)SelectObject(hdc, hbr); - if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) - goto cleanup; + if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; retval = TRUE; /* We succeeded */ @@ -1407,14 +1356,10 @@ SetTextColor(hdc, fg); SetBkColor(hdc, bg); - if(hbsave) - SelectObject(hdc, hbsave); - if(hbmsave) - SelectObject(memdc, hbmsave); - if(hbm) - DeleteObject(hbm); - if(memdc) - DeleteDC(memdc); + if(hbsave) SelectObject(hdc, hbsave); + if(hbmsave) SelectObject(memdc, hbmsave); + if(hbm) DeleteObject(hbm); + if(memdc) DeleteDC(memdc); return retval; } @@ -1482,7 +1427,7 @@ if (flags & BF_DIAGONAL) return IntDrawDiagEdge(hDC, rc, edge, flags); else - return IntDrawRectEdge(hDC, rc, edge, flags); + return IntDrawRectEdge(hDC, rc, edge, flags, 1); } /* @@ -1524,7 +1469,7 @@ HBRUSH oldbrush; RECT r = *lprc; - if ((r.right <= r.left) || (r.bottom <= r.top)) return 0; + if (IsRectEmpty(&r)) return 0; if (!(oldbrush = SelectObject(hDC, hbr))) return 0; PatBlt(hDC, r.left, r.top, 1, r.bottom - r.top, PATCOPY);

1 0

[pschweitzer] 73449: [NET/USE] On enumeration, don't print raw status
by pschweitzer＠svn.reactos.org 11 Dec '16

11 Dec '16

Author: pschweitzer Date: Sun Dec 11 10:23:02 2016 New Revision: 73449 URL: http://svn.reactos.org/svn/reactos?rev=73449&view=rev Log: [NET/USE] On enumeration, don't print raw status Modified: trunk/reactos/base/applications/network/net/cmdUse.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/lang/es-ES.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/network/net/lang/tr-TR.rc trunk/reactos/base/applications/network/net/lang/zh-CN.rc trunk/reactos/base/applications/network/net/lang/zh-TW.rc trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -63,6 +63,21 @@ return 0; } +static +VOID +PrintError(DWORD Status) +{ + LPWSTR Buffer; + + ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) + { + ConPrintf(StdErr, L"\n%s", Buffer); + LocalFree(Buffer); + } +} + INT cmdUse( INT argc, @@ -73,7 +88,11 @@ if (argc == 2) { Status = EnumerateConnections(NULL); - ConPrintf(StdOut, L"Status: %lu\n", Status); + if (Status == NO_ERROR) + ConResPrintf(StdOut, IDS_ERROR_NO_ERROR); + else + PrintError(Status); + return 0; } else if (argc == 3) @@ -92,7 +111,11 @@ } Status = EnumerateConnections(argv[2]); - ConPrintf(StdOut, L"Status: %lu\n", Status); + if (Status == NO_ERROR) + ConResPrintf(StdOut, IDS_ERROR_NO_ERROR); + else + PrintError(Status); + return 0; } @@ -100,7 +123,6 @@ if (Len != 1 && Len != 2) { ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"DeviceName"); - ConPrintf(StdOut, L"Len: %lu\n", Len); return 1; } @@ -192,17 +214,7 @@ if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access); else if (Status != NO_ERROR) - { - LPWSTR Buffer; - - ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status); - - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) - { - ConPrintf(StdErr, L"\n%s\n", Buffer); - LocalFree(Buffer); - } - } + PrintError(Status); return Status; } Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -123,4 +123,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -126,4 +126,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "La opciÃ³n %s todavÃa no estÃ¡ disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opciÃ³n %s no es vÃ¡lido.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -129,4 +129,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "OpÅ£iunea %s Ã®ncÄ nu este admisÄ.\n" IDS_ERROR_INVALID_OPTION_VALUE "AÅ£i introdus o valoare nevalidÄ pentru opÅ£iunea %s.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -125,4 +125,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "ÐÐ¿ÑÐ¸Ñ %s Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" IDS_ERROR_INVALID_OPTION_VALUE "ÐÑ Ð²Ð²ÐµÐ»Ð¸ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð¿ÑÐ¸Ð¸ %s.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/tr-TR.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -125,4 +125,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "%s seÃ§eneÄi daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seÃ§eneÄi iÃ§in geÃ§ersiz bir deÄer girdiniz.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/zh-CN.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -125,4 +125,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "å°ä¸æ¯æ %s éé¡¹ã\n" IDS_ERROR_INVALID_OPTION_VALUE "Yæ¨è¾å¥äºæ æçå¼ä¸º %s éé¡¹ã\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/zh-TW.rc [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -125,4 +125,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "å°ä¸æ¯æ´ %s é¸é ã\n" IDS_ERROR_INVALID_OPTION_VALUE "æ¨è¼¸å¥äºç¡æçå¼çº %s é¸é ã\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" + IDS_ERROR_NO_ERROR "The command got executed successfully.\n" END Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sun Dec 11 10:23:02 2016 @@ -103,3 +103,4 @@ #define IDS_ERROR_OPTION_NOT_SUPPORTED 700 #define IDS_ERROR_INVALID_OPTION_VALUE 701 #define IDS_ERROR_SYSTEM_ERROR 702 +#define IDS_ERROR_NO_ERROR 703

1 0

[pschweitzer] 73448: [NET/USE] Get rid of COUNT_OF
by pschweitzer＠svn.reactos.org 11 Dec '16

11 Dec '16

Author: pschweitzer Date: Sun Dec 11 09:15:16 2016 New Revision: 73448 URL: http://svn.reactos.org/svn/reactos?rev=73448&view=rev Log: [NET/USE] Get rid of COUNT_OF Modified: trunk/reactos/base/applications/network/net/cmdUse.c Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Sun Dec 11 09:15:16 2016 @@ -8,8 +8,6 @@ */ #include "net.h" - -#define COUNT_OF(a) (sizeof(a) / sizeof(a[0])) static DWORD @@ -133,7 +131,7 @@ BOOL Persist = FALSE; NETRESOURCE lpNet; WCHAR Access[256]; - DWORD OutFlags = 0, Size = COUNT_OF(Access); + DWORD OutFlags = 0, Size = ARRAYSIZE(Access); Len = wcslen(argv[3]); if (Len < 4)

1 0

[pschweitzer] 73447: [NET/USE] Allow some strings to be translated
by pschweitzer＠svn.reactos.org 11 Dec '16

11 Dec '16

Author: pschweitzer Date: Sun Dec 11 09:01:22 2016 New Revision: 73447 URL: http://svn.reactos.org/svn/reactos?rev=73447&view=rev Log: [NET/USE] Allow some strings to be translated Modified: trunk/reactos/base/applications/network/net/cmdUse.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/lang/es-ES.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/network/net/lang/tr-TR.rc trunk/reactos/base/applications/network/net/lang/zh-CN.rc trunk/reactos/base/applications/network/net/lang/zh-TW.rc trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -192,12 +192,12 @@ Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags); if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) - ConPrintf(StdOut, L"%s is now connected to %s\n", argv[3], Access); + ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access); else if (Status != NO_ERROR) { LPWSTR Buffer; - ConPrintf(StdErr, L"The system error %d happened.\n", Status); + ConResPrintf(StdErr, IDS_ERROR_SYSTEM_ERROR, Status); if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) { Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -111,6 +111,8 @@ IDS_USER_ENTER_PASSWORD2 "Enter the password again: " IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Yes" IDS_GENERIC_NO "No" IDS_GENERIC_NEVER "Never" @@ -120,4 +122,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -114,6 +114,8 @@ IDS_USER_ENTER_PASSWORD2 "Vuelva a escribir la contraseÃ±a: " IDS_USER_NO_PASSWORD_MATCH "Las contraseÃ±as no coinciden." + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "SÃ" IDS_GENERIC_NO "No" IDS_GENERIC_NEVER "Nunca" @@ -123,4 +125,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "La opciÃ³n %s todavÃa no estÃ¡ disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opciÃ³n %s no es vÃ¡lido.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -117,6 +117,8 @@ IDS_USER_ENTER_PASSWORD2 "IntroduceÈi din nou parola: " IDS_USER_NO_PASSWORD_MATCH "Parolele diferÄ!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Da" IDS_GENERIC_NO "Nu" IDS_GENERIC_NEVER "NiciodatÄ" @@ -126,4 +128,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "OpÅ£iunea %s Ã®ncÄ nu este admisÄ.\n" IDS_ERROR_INVALID_OPTION_VALUE "AÅ£i introdus o valoare nevalidÄ pentru opÅ£iunea %s.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -113,6 +113,8 @@ IDS_USER_ENTER_PASSWORD2 "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ: " IDS_USER_NO_PASSWORD_MATCH "ÐÐ°ÑÐ¾Ð»Ð¸ Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "ÐÐ°" IDS_GENERIC_NO "ÐÐµÑ" IDS_GENERIC_NEVER "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°" @@ -122,4 +124,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "ÐÐ¿ÑÐ¸Ñ %s Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" IDS_ERROR_INVALID_OPTION_VALUE "ÐÑ Ð²Ð²ÐµÐ»Ð¸ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð¿ÑÐ¸Ð¸ %s.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/tr-TR.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -113,6 +113,8 @@ IDS_USER_ENTER_PASSWORD2 "Åifreyi yeniden giriniz: " IDS_USER_NO_PASSWORD_MATCH "Åifreler uyuÅmuyor!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "Evet" IDS_GENERIC_NO "HayÄ±r" IDS_GENERIC_NEVER "HiÃ§bir Zaman" @@ -122,4 +124,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "%s seÃ§eneÄi daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seÃ§eneÄi iÃ§in geÃ§ersiz bir deÄer girdiniz.\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/zh-CN.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -113,6 +113,8 @@ IDS_USER_ENTER_PASSWORD2 "åæ¬¡è¾å¥å¯ç : " IDS_USER_NO_PASSWORD_MATCH "å¯ç ä¸å¹é!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "æ¯" IDS_GENERIC_NO "å¦" IDS_GENERIC_NEVER "æ°¸ä¸" @@ -122,4 +124,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "å°ä¸æ¯æ %s éé¡¹ã\n" IDS_ERROR_INVALID_OPTION_VALUE "Yæ¨è¾å¥äºæ æçå¼ä¸º %s éé¡¹ã\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/zh-TW.rc [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -113,6 +113,8 @@ IDS_USER_ENTER_PASSWORD2 "åæ¬¡è¼¸å¥å¯ç¢¼: " IDS_USER_NO_PASSWORD_MATCH "å¯ç¢¼ä¸å¹é!" + IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" + IDS_GENERIC_YES "æ¯" IDS_GENERIC_NO "å¦" IDS_GENERIC_NEVER "æ°¸ä¸" @@ -122,4 +124,5 @@ IDS_ERROR_OPTION_NOT_SUPPORTED "å°ä¸æ¯æ´ %s é¸é ã\n" IDS_ERROR_INVALID_OPTION_VALUE "æ¨è¼¸å¥äºç¡æçå¼çº %s é¸é ã\n" + IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" END Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sun Dec 11 09:01:22 2016 @@ -91,12 +91,15 @@ #define IDS_USER_ENTER_PASSWORD2 491 #define IDS_USER_NO_PASSWORD_MATCH 492 -#define IDS_GENERIC_YES 500 -#define IDS_GENERIC_NO 501 -#define IDS_GENERIC_NEVER 502 -#define IDS_GENERIC_NONE 503 -#define IDS_GENERIC_ALL 504 -#define IDS_GENERIC_LOCKED 505 +#define IDS_USE_NOW_CONNECTED 500 -#define IDS_ERROR_OPTION_NOT_SUPPORTED 600 -#define IDS_ERROR_INVALID_OPTION_VALUE 601 +#define IDS_GENERIC_YES 600 +#define IDS_GENERIC_NO 601 +#define IDS_GENERIC_NEVER 602 +#define IDS_GENERIC_NONE 603 +#define IDS_GENERIC_ALL 604 +#define IDS_GENERIC_LOCKED 605 + +#define IDS_ERROR_OPTION_NOT_SUPPORTED 700 +#define IDS_ERROR_INVALID_OPTION_VALUE 701 +#define IDS_ERROR_SYSTEM_ERROR 702

1 0

[pschweitzer] 73446: [NET/USE] In case of an error, display the error message.
by pschweitzer＠svn.reactos.org 10 Dec '16

10 Dec '16

Author: pschweitzer Date: Sat Dec 10 22:12:53 2016 New Revision: 73446 URL: http://svn.reactos.org/svn/reactos?rev=73446&view=rev Log: [NET/USE] In case of an error, display the error message. Modified: trunk/reactos/base/applications/network/net/cmdUse.c Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Sat Dec 10 22:12:53 2016 @@ -193,6 +193,18 @@ Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags); if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) ConPrintf(StdOut, L"%s is now connected to %s\n", argv[3], Access); + else if (Status != NO_ERROR) + { + LPWSTR Buffer; + + ConPrintf(StdErr, L"The system error %d happened.\n", Status); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, Status, 0, (LPWSTR)&Buffer, 0, NULL)) + { + ConPrintf(StdErr, L"\n%s\n", Buffer); + LocalFree(Buffer); + } + } return Status; }

1 0

[tfaber] 73445: [KMTESTS] - Add a missing newline
by tfaber＠svn.reactos.org 10 Dec '16

10 Dec '16

Author: tfaber Date: Sat Dec 10 11:59:41 2016 New Revision: 73445 URL: http://svn.reactos.org/svn/reactos?rev=73445&view=rev Log: [KMTESTS] - Add a missing newline Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoFilesys… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] Sat Dec 10 11:59:41 2016 @@ -516,7 +516,8 @@ "[%lu] Status = %lx, expected STATUS_SUCCESS\n", i, Status); else if (Tests[i].Status == STATUS_OBJECT_NAME_INVALID && Tests[i].IsDrive) ok(Status == STATUS_OBJECT_NAME_INVALID, - "[%lu] Status = %lx, expected STATUS_OBJECT_NAME_INVALID\n", i, Status);else if (Tests[i].IsDrive) + "[%lu] Status = %lx, expected STATUS_OBJECT_NAME_INVALID\n", i, Status); + else if (Tests[i].IsDrive) ok(Status == STATUS_ACCESS_DENIED, "[%lu] Status = %lx, expected STATUS_ACCESS_DENIED\n", i, Status); else if (Tests[i].Status == STATUS_SUCCESS)

1 0

[gadamopoulos] 73444: [SHELL32] - Add a separate string for the unknown file types and rename the first column to Name from File. - Note to translators: Please update translations based on the chan...
by gadamopoulos＠svn.reactos.org 09 Dec '16

09 Dec '16

Author: gadamopoulos Date: Fri Dec 9 21:31:23 2016 New Revision: 73444 URL: http://svn.reactos.org/svn/reactos?rev=73444&view=rev Log: [SHELL32] - Add a separate string for the unknown file types and rename the first column to Name from File. - Note to translators: Please update translations based on the changes in the English strings. Patch by Amber. CORE-12530 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/wine/pidl.c Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Ð¡Ð¸ÑÑÐµÐ¼ÐµÐ½ ÑÐ°Ð¹Ð»" IDS_VXD_FILE "ÐÐ¾Ð´Ð°Ñ Ð½Ð° Ð¿ÑÐ¸Ð²Ð¸Ð´Ð½Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "ÐÑÐ²Ð°ÑÑÐ½Ðµ" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -806,7 +806,8 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "SystÃ©movÃ½ soubor" IDS_VXD_FILE "VirtuÃ¡lnÃ ovladaÄ zaÅÃzenÃ" - + IDS_ANY_FILE "%s-file" + IDS_OPEN_VERB "OtevÅÃt" IDS_EXPLORE_VERB "Prozkoumat" IDS_RUNAS_VERB "Spustit jako..." Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -806,6 +806,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -801,6 +801,7 @@ IDS_SCR_FILE "Bildschirmschoner" IDS_SYS_FILE "Systemdatei" IDS_VXD_FILE "Virtueller GerÃ¤tetreiber" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ãffnen" IDS_EXPLORE_VERB "Durchsuchen" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -634,7 +634,7 @@ STRINGTABLE BEGIN /* columns in the shellview */ - IDS_SHV_COLUMN1 "File" + IDS_SHV_COLUMN1 "Name" IDS_SHV_COLUMN2 "Size" IDS_SHV_COLUMN3 "Type" IDS_SHV_COLUMN4 "Modified" @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -802,6 +802,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Archivo del sistema" IDS_VXD_FILE "Controlador de dispositivo virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Ãcran de veille" IDS_SYS_FILE "Fichier systÃ¨me" IDS_VXD_FILE "Pilote de pÃ©riphÃ©rique virtuel" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ouvrir" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "File di sistema" IDS_VXD_FILE "Driver di Periferica Virtuale" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Apri" IDS_EXPLORE_VERB "Esplora" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -797,6 +797,7 @@ IDS_SCR_FILE "ã¹ã¯ãªã¼ã³ã»ã¼ãã¼" IDS_SYS_FILE "ã·ã¹ãã ãã¡ã¤ã«" IDS_VXD_FILE "ä»®æ³ ããã¤ã¹ ãã©ã¤ã" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "éã" IDS_EXPLORE_VERB "ã¨ã¯ã¹ããã¼ã©ã§éã" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Systemfil" IDS_VXD_FILE "Virtuell enhetdriver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ãpne" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -804,6 +804,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Plik systemowy" IDS_VXD_FILE "Sterownik urzÄdzenia wirtualnego" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "OtwÃ³rz" IDS_EXPLORE_VERB "Eksploruj" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Arquivo do sistema" IDS_VXD_FILE "Dispositivo de Driver Virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Ficheiro de Sistema" IDS_VXD_FILE "Driver de Dispositivo Virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -802,6 +802,7 @@ IDS_SCR_FILE "AnimaÈie regim de inactivitate" IDS_SYS_FILE "FiÈier de sistem" IDS_VXD_FILE "Pilot dispozitiv virtual" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Deschide" IDS_EXPLORE_VERB "ExploreazÄ" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -802,6 +802,7 @@ IDS_SCR_FILE "ÐÐ°ÑÑÐ°Ð²ÐºÐ°" IDS_SYS_FILE "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹ ÑÐ°Ð¹Ð»" IDS_VXD_FILE "ÐÑÐ°Ð¹Ð²ÐµÑ Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" + IDS_ANY_FILE "%s-ÑÐ°Ð¹Ð»" IDS_OPEN_VERB "ÐÑÐºÑÑÑÑ" IDS_EXPLORE_VERB "ÐÑÐºÑÑÑÑ Ð² Ð´ÐµÑÐµÐ²Ðµ" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "SystÃ©movÃ½ sÃºbor" IDS_VXD_FILE "OvlÃ¡daÄ virtuÃ¡lneho zariadenia" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "OtvoriÅ¥" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -804,6 +804,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Dokumente Sistemi" IDS_VXD_FILE "UdhÃ«zuesi Virtual Pajisjes" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Hap" IDS_EXPLORE_VERB "Eksplorer" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "SkÃ¤rmslÃ¤ckare" IDS_SYS_FILE "Systemfil" IDS_VXD_FILE "Virtuell enhetsdrivruting" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ãppna" IDS_EXPLORE_VERB "Utforska" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -802,6 +802,7 @@ IDS_SCR_FILE "GÃ¶rÃ¼ntÃ¼lÃ¼k Koruyucu" IDS_SYS_FILE "Dizge KÃ¼tÃ¼ÄÃ¼" IDS_VXD_FILE "FarazÃ® AygÄ±t SÃ¼rÃ¼cÃ¼sÃ¼" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "AÃ§" IDS_EXPLORE_VERB "AraÅtÄ±r" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -800,6 +800,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¸Ð¹ ÑÐ°Ð¹Ð»" IDS_VXD_FILE "ÐÑÐ°Ð¹Ð²ÐµÑ Ð²ÑÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸" IDS_EXPLORE_VERB "ÐÑÐ´ÐºÑÐ¸ÑÐ¸ Ð² Ð´ÐµÑÐµÐ²Ñ" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -807,6 +807,7 @@ IDS_SCR_FILE "å±å¹ä¿æ¤ç¨åº" IDS_SYS_FILE "ç³»ç»æä»¶" IDS_VXD_FILE "èæè®¾å¤é©±å¨ç¨åº" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "æå¼" IDS_EXPLORE_VERB "æµè§" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -808,6 +808,7 @@ IDS_SCR_FILE "Screen Saver" IDS_SYS_FILE "System File" IDS_VXD_FILE "Virtual Device Driver" + IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Open" IDS_EXPLORE_VERB "Explore" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -159,6 +159,7 @@ #define IDS_SCR_FILE 217 #define IDS_SYS_FILE 218 #define IDS_VXD_FILE 219 +#define IDS_ANY_FILE 220 #define IDS_EMPTY_BITBUCKET 172 #define IDS_SHLEXEC_NOASSOC 173 Modified: trunk/reactos/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/pid… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] Fri Dec 9 21:31:23 2016 @@ -32,6 +32,7 @@ #include <windef.h> #include <winbase.h> +#include <strsafe.h> #include <shlobj.h> #include <undocshell.h> #include <shlwapi.h> @@ -2491,15 +2492,13 @@ return; } /* display Ext-file as description */ - strcpy(pOut, sType); - _strupr(pOut); + _strupr(sType); /* load localized file string */ sTemp[0] = '\0'; - if(LoadStringA(shell32_hInstance, IDS_SHV_COLUMN1, sTemp, 64)) + if(LoadStringA(shell32_hInstance, IDS_ANY_FILE, sTemp, 64)) { sTemp[63] = '\0'; - strcat(pOut, "-"); - strcat(pOut, sTemp); + StringCchPrintfA(pOut, uOutSize, sTemp, sType); } } #else

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016