Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[dquintana] 71527: [SHELL32] Sorry, I'm still half asleep. I did need functional changes.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Jun 5 09:06:33 2016 New Revision: 71527 URL: http://svn.reactos.org/svn/reactos?rev=71527&view=rev Log: [SHELL32] Sorry, I'm still half asleep. I did need functional changes. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sun Jun 5 09:06:33 2016 @@ -584,7 +584,7 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) { HWND hWndDesk; - DWORD x, y, cx, cy; + int x, y, cx, cy; if (ShellDesk == NULL) { @@ -603,9 +603,9 @@ cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); - if (IsRectEmpty(&rcDesk)) - { - x = rcDesk.top = 0; + if (!cx || !cy) + { + x = y = 0; cx = GetSystemMetrics(SM_CXSCREEN); cy = GetSystemMetrics(SM_CYSCREEN); }

8 years, 5 months

[dquintana] 71526: [SHELL32] Replace confusing usage of RECT with some actual variables. No functional changes.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Jun 5 08:56:57 2016 New Revision: 71526 URL: http://svn.reactos.org/svn/reactos?rev=71526&view=rev Log: [SHELL32] Replace confusing usage of RECT with some actual variables. No functional changes. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sun Jun 5 08:56:57 2016 @@ -584,7 +584,7 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) { HWND hWndDesk; - RECT rcDesk; + DWORD x, y, cx, cy; if (ShellDesk == NULL) { @@ -598,21 +598,21 @@ return NULL; } - rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesk.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesk.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); + x = GetSystemMetrics(SM_XVIRTUALSCREEN); + y = GetSystemMetrics(SM_YVIRTUALSCREEN); + cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); + cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); if (IsRectEmpty(&rcDesk)) { - rcDesk.left = rcDesk.top = 0; - rcDesk.right = GetSystemMetrics(SM_CXSCREEN); - rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); + x = rcDesk.top = 0; + cx = GetSystemMetrics(SM_CXSCREEN); + cy = GetSystemMetrics(SM_CYSCREEN); } hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, + x, y, cx, cy, NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); if (hWndDesk != NULL) return (HANDLE)GetWindowLongPtrW(hWndDesk, 0);

8 years, 5 months

[hbelusca] 71525: [SHELL32] - Pass indistinctly WM_SYSCOLORCHANGE and WM_SETTINGCHANGE messages sent to the shell progman window, down to its children windows (SHELLDLL_DefView and its associated L...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 23:34:46 2016 New Revision: 71525 URL: http://svn.reactos.org/svn/reactos?rev=71525&view=rev Log: [SHELL32] - Pass indistinctly WM_SYSCOLORCHANGE and WM_SETTINGCHANGE messages sent to the shell progman window, down to its children windows (SHELLDLL_DefView and its associated ListView), as shown by tracking windows messages on Win2k3. - If we receive a WM_SETTINGCHANGE with wParam == SPI_SETWORKAREA, i.e. the desktop working area was modified, we need to resize the underlying DefView, as shown by tracking windows messages on Win2k3. For the moment we implement support for only the primary monitor. CORE-11375 #resolve CORE-5618 #resolve CORE-5620 Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sat Jun 4 23:34:46 2016 @@ -476,16 +476,29 @@ case WM_SYSCOLORCHANGE: case WM_SETTINGCHANGE: { - if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0) + if (pThis->hWndShellView != NULL) { - if (pThis->hWndShellView != NULL) - { - /* Forward the message */ - SendMessageW(pThis->hWndShellView, - uMsg, - wParam, - lParam); - } + /* Forward the message */ + SendMessageW(pThis->hWndShellView, + uMsg, + wParam, + lParam); + } + + if (uMsg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA && + pThis->hWndShellView != NULL) + { + RECT rcWorkArea; + + // FIXME: Add support for multi-monitor! + SystemParametersInfoW(SPI_GETWORKAREA, + 0, &rcWorkArea, 0); + + SetWindowPos(pThis->hWndShellView, NULL, + rcWorkArea.left, rcWorkArea.top, + rcWorkArea.right - rcWorkArea.left, + rcWorkArea.bottom - rcWorkArea.top, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER); } break; }

8 years, 5 months

[hbelusca] 71524: [SHELL32] - Minor stylistic whitespace changes. - Use 'IDA_DESKBROWSER' instead of hardcoding its value. - The shell progman window uses the COLOR_DESKTOP as its hbrBackground: pa...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 23:29:34 2016 New Revision: 71524 URL: http://svn.reactos.org/svn/reactos?rev=71524&view=rev Log: [SHELL32] - Minor stylistic whitespace changes. - Use 'IDA_DESKBROWSER' instead of hardcoding its value. - The shell progman window uses the COLOR_DESKTOP as its hbrBackground: partly revert r66271. - Correctly initialize rcDesk structure before using it for a CreateWindowEx call. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sat Jun 4 23:29:34 2016 @@ -24,8 +24,8 @@ #define SHDESK_TAG 'KSED' -static const WCHAR szProgmanClassName [] = L"Progman"; -static const WCHAR szProgmanWindowName [] = L"Program Manager"; +static const WCHAR szProgmanClassName[] = L"Progman"; +static const WCHAR szProgmanWindowName[] = L"Program Manager"; class CDesktopBrowser : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -39,10 +39,10 @@ private: HWND hWnd; HWND hWndShellView; - HWND hWndDesktopListView; - CComPtr<IShellDesktopTray> ShellDesk; - CComPtr<IShellView> DesktopView; - CComPtr<IShellBrowser> DefaultShellBrowser; + HWND hWndDesktopListView; // FIXME: Unused + CComPtr<IShellDesktopTray> ShellDesk; + CComPtr<IShellView> DesktopView; + CComPtr<IShellBrowser> DefaultShellBrowser; LPITEMIDLIST pidlDesktopDirectory; LPITEMIDLIST pidlDesktop; @@ -52,7 +52,7 @@ CDesktopBrowser(); ~CDesktopBrowser(); HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx); - HWND FindDesktopListView (); + HWND FindDesktopListView(); BOOL CreateDeskWnd(); HWND DesktopGetWindowControl(IN UINT id); LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -186,7 +186,7 @@ return pThis; } -HWND CDesktopBrowser::FindDesktopListView () +HWND CDesktopBrowser::FindDesktopListView() { return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL); } @@ -203,7 +203,7 @@ } fs.ViewMode = FVM_ICON; - fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; + fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcClient, &hWndShellView); if (!SUCCEEDED(hRet)) return FALSE; @@ -452,25 +452,26 @@ break; case WM_SIZE: + { if (wParam == SIZE_MINIMIZED) { /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, - SW_RESTORE); + ShowWindow(hwnd, SW_RESTORE); } else { RECT rcDesktop; - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); /* FIXME: Update work area */ DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop); } break; + } case WM_SYSCOLORCHANGE: case WM_SETTINGCHANGE: @@ -496,7 +497,7 @@ if (!pThis->CreateDeskWnd()) WARN("Could not create the desktop view control!\n"); - pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(3)); + pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_DESKBROWSER)); break; } @@ -511,9 +512,7 @@ break; } - SetWindowLongPtrW(hwnd, - 0, - (LONG_PTR)pThis); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pThis); Ret = TRUE; break; } @@ -557,7 +556,7 @@ wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = NULL; + wcProgman.hbrBackground = (HBRUSH)(COLOR_DESKTOP + 1); wcProgman.lpszMenuName = NULL; wcProgman.lpszClassName = szProgmanClassName; @@ -586,15 +585,15 @@ return NULL; } - rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesk.right = rcDesk.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesk.bottom = rcDesk.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rcDesk.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcDesk.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); if (IsRectEmpty(&rcDesk)) { rcDesk.left = rcDesk.top = 0; - rcDesk.right = GetSystemMetrics(SM_CXSCREEN); + rcDesk.right = GetSystemMetrics(SM_CXSCREEN); rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); }

8 years, 5 months

[hbelusca] 71523: [SHELL32] - Whitespace fix. - SHSetShellWindowEx really directly redirects to user32.SetShellWindowEx.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 22:58:53 2016 New Revision: 71523 URL: http://svn.reactos.org/svn/reactos?rev=71523&view=rev Log: [SHELL32] - Whitespace fix. - SHSetShellWindowEx really directly redirects to user32.SetShellWindowEx. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat Jun 4 22:58:53 2016 @@ -1325,15 +1325,14 @@ */ LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - WORD wWidth; - WORD wHeight; - - wWidth = LOWORD(lParam); + WORD wWidth, wHeight; + + wWidth = LOWORD(lParam); wHeight = HIWORD(lParam); TRACE("%p width=%u height=%u\n", this, wWidth, wHeight); - /*resize the ListView to fit our window*/ + /* Resize the ListView to fit our window */ if (m_ListView) { ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sat Jun 4 22:58:53 2016 @@ -239,7 +239,7 @@ 240 stdcall PathIsSlowA(str long) 241 stdcall -noname SHGetUserDisplayName(wstr ptr) 242 stdcall -noname SHGetProcessDword(long long) -243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx # FIXME: Inspect +243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx 244 stdcall -noname SHSettingsChanged(ptr ptr) 245 stdcall SHTestTokenMembership(ptr ptr) 246 stub -noname SHInvokePrivilegedFunctionW

8 years, 5 months

[hbelusca] 71522: [EXPLORER]: Minor stylistic formatting changes; add a notice about a SystemParametersInfoW(SPI_SETWORKAREA) call, concerning its action when explorer's taskbar size is changed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 22:57:12 2016 New Revision: 71522 URL: http://svn.reactos.org/svn/reactos?rev=71522&view=rev Log: [EXPLORER]: Minor stylistic formatting changes; add a notice about a SystemParametersInfoW(SPI_SETWORKAREA) call, concerning its action when explorer's taskbar size is changed. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Jun 4 22:57:12 2016 @@ -511,8 +511,7 @@ mi.cbSize = sizeof(mi); hMon = MonitorFromRect(pRect, dwFlags); if (hMon != NULL && - GetMonitorInfo(hMon, - &mi)) + GetMonitorInfo(hMon, &mi)) { *pRect = mi.rcMonitor; } @@ -539,8 +538,7 @@ now), minimize the risk that we determine a wrong monitor by using the center point of the tray window if we can't determine it using the rectangle. */ - hMon = MonitorFromRect(pRect, - MONITOR_DEFAULTTONULL); + hMon = MonitorFromRect(pRect, MONITOR_DEFAULTTONULL); if (hMon == NULL) { POINT pt; @@ -549,8 +547,7 @@ pt.y = pRect->top + ((pRect->bottom - pRect->top) / 2); /* be less error-prone, find the nearest monitor */ - hMon = MonitorFromPoint(pt, - MONITOR_DEFAULTTONEAREST); + hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); } return hMon; @@ -571,11 +568,9 @@ { /* Hm, the monitor is gone? Try to find a monitor where it could be located now */ - hMon = GetMonitorFromRect( - pRect); + hMon = GetMonitorFromRect(pRect); if (hMon == NULL || - !GetMonitorInfo(hMon, - &mi)) + !GetMonitorInfo(hMon, &mi)) { hMon = NULL; goto GetPrimaryRect; @@ -674,11 +669,10 @@ /* FIXME - calculate */ - GetTrayRectFromScreenRect( - Position, - &rcScreen, - &szWnd, - pRect); + GetTrayRectFromScreenRect(Position, + &rcScreen, + &szWnd, + pRect); return hMon; } @@ -716,9 +710,7 @@ rcScreen.top = 0; /* Determine the screen rectangle */ - hMon = MonitorFromPoint(pt, - MONITOR_DEFAULTTONULL); - + hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); if (hMon != NULL) { MONITORINFO mi; @@ -868,9 +860,8 @@ //m_TrayRects[DraggingPosition] = rcTray; } - //Monitor = CalculateValidSize( - // DraggingPosition, - // &rcTray); + //Monitor = CalculateValidSize(DraggingPosition, + // &rcTray); m_Monitor = m_DraggingMonitor; m_Position = m_DraggingPosition; @@ -991,9 +982,9 @@ { GetScreenRect(m_PreviousMonitor, &rcWorkArea); SystemParametersInfoW(SPI_SETWORKAREA, - 1, - &rcWorkArea, - SPIF_SENDCHANGE); + 1, + &rcWorkArea, + SPIF_SENDCHANGE); } rcTray = m_TrayRects[m_Position]; @@ -1001,8 +992,8 @@ GetScreenRect(m_Monitor, &rcWorkArea); m_PreviousMonitor = m_Monitor; - /* If AutoHide is false then change the workarea to exclude the area that - the taskbar covers. */ + /* If AutoHide is false then change the workarea to exclude + the area that the taskbar covers. */ if (!AutoHide) { switch (m_Position) @@ -1022,10 +1013,14 @@ } } + /* + * Resize the current monitor work area. Win32k will also send + * a WM_SIZE message to automatically resize the desktop. + */ SystemParametersInfoW(SPI_SETWORKAREA, - 1, - &rcWorkArea, - SPIF_SENDCHANGE); + 1, + &rcWorkArea, + SPIF_SENDCHANGE); #endif } @@ -1167,12 +1162,11 @@ usable results */ for (Pos = ABE_LEFT; Pos <= ABE_BOTTOM; Pos++) { - GetTrayRectFromScreenRect( - Pos, - &rcScreen, - &m_TraySize, - &m_TrayRects[Pos]); - // TRACE("m_TrayRects[%d(%d)]: %d,%d,%d,%d\n", Pos, Position, m_TrayRects[Pos].left, m_TrayRects[Pos].top, m_TrayRects[Pos].right, m_TrayRects[Pos].bottom); + GetTrayRectFromScreenRect(Pos, + &rcScreen, + &m_TraySize, + &m_TrayRects[Pos]); + // TRACE("m_TrayRects[%d(%d)]: %d,%d,%d,%d\n", Pos, Position, m_TrayRects[Pos].left, m_TrayRects[Pos].top, m_TrayRects[Pos].right, m_TrayRects[Pos].bottom); } /* Determine which monitor we are on. It shouldn't matter which docked

8 years, 5 months

[hbelusca] 71521: [EXPLORER]: Use _countof where needed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 22:51:19 2016 New Revision: 71521 URL: http://svn.reactos.org/svn/reactos?rev=71521&view=rev Log: [EXPLORER]: Use _countof where needed. Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] Sat Jun 4 22:51:19 2016 @@ -28,7 +28,7 @@ if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) { WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere "; - if (SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath))) + if (SUCCEEDED(StringCchCatW(szCommand, _countof(szCommand), szPath))) ShellExecuteW(hDlg, L"open", L"rundll32.exe", szCommand, NULL, SW_SHOWNORMAL); } } @@ -51,11 +51,11 @@ if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath))) { - StringCchPrintfW(szFile,MAX_PATH, L"%s\\*.*", szPath); + StringCchPrintfW(szFile, _countof(szFile), L"%s\\*.*", szPath); hPath = FindFirstFileW(szFile, &info); do { - StringCchPrintfW(szFile,MAX_PATH, L"%s\\%s", szPath, info.cFileName); + StringCchPrintfW(szFile, _countof(szFile), L"%s\\%s", szPath, info.cFileName); DeleteFileW(szFile); } while (FindNextFileW(hPath, &info));

8 years, 5 months

[hbelusca] 71520: [RSHELL]: When rshell is compiled and used on Windows (as a testing replacement for shell32), it should correctly initialize the shell32_instance handle so that the rest of shell3...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 4 22:50:33 2016 New Revision: 71520 URL: http://svn.reactos.org/svn/reactos?rev=71520&view=rev Log: [RSHELL]: When rshell is compiled and used on Windows (as a testing replacement for shell32), it should correctly initialize the shell32_instance handle so that the rest of shell32 code can use something valid! Modified: trunk/reactos/base/shell/rshell/misc.cpp Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Sat Jun 4 22:50:33 2016 @@ -20,8 +20,6 @@ #include "shellmenu.h" -HINSTANCE shell32_hInstance = NULL; - DWORD WINAPI WinList_Init(void) { /* do something here (perhaps we may want to add our own implementation fo win8) */ @@ -38,10 +36,10 @@ public: }; -CRShellModule gModule; -CAtlWinModule gWinModule; - -HINSTANCE g_hRShell; +CRShellModule gModule; +CAtlWinModule gWinModule; + +HINSTANCE shell32_hInstance = NULL; static LSTATUS inline _RegSetStringValueW(HKEY hKey, LPCWSTR lpValueName, LPCWSTR lpStringData) { @@ -59,7 +57,7 @@ if (!StringFromGUID2(clsid, szClsid, _countof(szClsid))) return E_FAIL; - if (!GetModuleFileNameW(g_hRShell, szFilename, _countof(szFilename))) + if (!GetModuleFileNameW(shell32_hInstance, szFilename, _countof(szFilename))) return E_FAIL; HRESULT hr = StringCchPrintfW(szRoot, 0x104u, L"CLSID\\%s", szClsid); @@ -117,13 +115,14 @@ { if (dwReason == DLL_PROCESS_ATTACH) { - g_hRShell = hInstance; + shell32_hInstance = hInstance; gModule.Init(NULL, hInstance, NULL); DisableThreadLibraryCalls(hInstance); } else if (dwReason == DLL_PROCESS_DETACH) { + shell32_hInstance = NULL; gModule.Term(); } return TRUE;

8 years, 5 months

[akhaldi] 71519: [WMIC] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 4 18:04:03 2016 New Revision: 71519 URL: http://svn.reactos.org/svn/reactos?rev=71519&view=rev Log: [WMIC] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc trunk/reactos/base/applications/cmdutils/wmic/main.c trunk/reactos/base/applications/cmdutils/wmic/wmic.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -5,4 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Fehler: Befehlszeile nicht unterstÃ¼tzt\n" STRING_ALIAS_NOT_FOUND, "Fehler: Alias nicht gefunden\n" STRING_INVALID_QUERY, "Fehler: UngÃ¼ltige Abfrage\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -5,4 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Error: Command line not supported\n" STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n" STRING_INVALID_QUERY, "Error: Invalid query\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -7,4 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Eroare: ComandÄ nerecunoscutÄ.\n" STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate gÄsi alias.\n" STRING_INVALID_QUERY, "Eroare: Cerere nevalidÄ.\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -5,4 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ\n" STRING_ALIAS_NOT_FOUND, "ÐÑÐ¸Ð±ÐºÐ°: ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½\n" STRING_INVALID_QUERY, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð·Ð°Ð¿ÑÐ¾Ñ\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -9,4 +9,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Gabim: Linja e komandave jo e mbÃ«shtetur\n" STRING_ALIAS_NOT_FOUND, "Gabim: Pseudonimi nuk u gjend\n" STRING_INVALID_QUERY, "Gabim: KÃ«rkim pa vlere\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -7,4 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "YanlÄ±ÅlÄ±k: Komut yatacÄ± desteklenmiyor\n" STRING_ALIAS_NOT_FOUND, "YanlÄ±ÅlÄ±k: BaÅka ad bulunamadÄ±\n" STRING_INVALID_QUERY, "YanlÄ±ÅlÄ±k: GeÃ§ersiz sorgu\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -7,4 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "éè¯¯: ä¸æ¯æçå½ä»¤è¡\n" STRING_ALIAS_NOT_FOUND, "éè¯¯: å«åæªæ¾å°\n" STRING_INVALID_QUERY, "éè¯¯: æ æçæ¥è¯¢\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -7,4 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "é¯èª¤: ä¸æ¯æ´çå½ä»¤å\n" STRING_ALIAS_NOT_FOUND, "é¯èª¤: å¥åæªæ¾å°\n" STRING_INVALID_QUERY, "é¯èª¤: ç¡æçæ¥è©¢\n" + STRING_INVALID_PATH, "Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/main.c [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -162,7 +162,7 @@ return output_string( fmtW, buffer ); } -static int query_prop( const WCHAR *alias, const WCHAR *propname ) +static int query_prop( const WCHAR *class, const WCHAR *propname ) { static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -175,18 +175,12 @@ IEnumWbemClassObject *result = NULL; LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; BSTR path = NULL, wql = NULL, query = NULL; - const WCHAR *class; WCHAR *prop = NULL; BOOL first = TRUE; int len, ret = -1; - WINE_TRACE("%s, %s\n", debugstr_w(alias), debugstr_w(propname)); - - if (!(class = find_class( alias ))) - { - output_message( STRING_ALIAS_NOT_FOUND ); - return -1; - } + WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname)); + CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); @@ -253,11 +247,67 @@ int wmain(int argc, WCHAR *argv[]) { static const WCHAR getW[] = {'g','e','t',0}; - - if (argc != 4 || strcmpiW( argv[2], getW )) - { - output_message( STRING_CMDLINE_NOT_SUPPORTED ); - return -1; - } - return query_prop( argv[1], argv[3] ); -} + static const WCHAR quitW[] = {'q','u','i','t',0}; + static const WCHAR exitW[] = {'e','x','i','t',0}; + static const WCHAR pathW[] = {'p','a','t','h',0}; + static const WCHAR classW[] = {'c','l','a','s','s',0}; + static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0}; + + const WCHAR *class; + const WCHAR *value; + int i; + + if (argc == 1) + goto not_supported; + + for (i = 1; i < argc && argv[i][0] == '/'; i++) + WINE_FIXME("command line switch %s not supported\n", debugstr_w(argv[i])); + + if (i >= argc) + goto not_supported; + + if (!strcmpiW( argv[i], quitW ) || + !strcmpiW( argv[i], exitW )) + { + return 0; + } + else if (!strcmpiW( argv[i], classW) || + !strcmpiW( argv[i], contextW)) + { + WINE_FIXME("command %s not supported\n", debugstr_w(argv[i])); + goto not_supported; + } + else if (!strcmpiW( argv[i], pathW)) + { + if (++i >= argc) + { + output_message( STRING_INVALID_PATH ); + return 1; + } + class = argv[i]; + } + else + { + class = find_class( argv[i] ); + if (!class) + { + output_message( STRING_ALIAS_NOT_FOUND ); + return 1; + } + } + + if (++i >= argc) + goto not_supported; + + if (!strcmpiW( argv[i], getW)) + { + if (++i >= argc) + goto not_supported; + value = argv[i]; + return query_prop( class, value ); + } + +not_supported: + output_message( STRING_CMDLINE_NOT_SUPPORTED ); + return 1; +} Modified: trunk/reactos/base/applications/cmdutils/wmic/wmic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.h [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -21,3 +21,4 @@ #define STRING_CMDLINE_NOT_SUPPORTED 101 #define STRING_ALIAS_NOT_FOUND 102 #define STRING_INVALID_QUERY 103 +#define STRING_INVALID_PATH 104 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 4 18:04:03 2016 @@ -231,7 +231,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.4 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.4 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.4 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.4 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.4 with our own resources.

8 years, 5 months

[akhaldi] 71518: [CMD_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 4 18:00:50 2016 New Revision: 71518 URL: http://svn.reactos.org/svn/reactos?rev=71518&view=rev Log: [CMD_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/cmd/test_builtins.cmd trunk/rostests/winetests/cmd/test_builtins.cmd.exp Modified: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] Sat Jun 4 18:00:50 2016 @@ -1072,16 +1072,16 @@ echo for /R passed echo --- Complex wildcards unix and windows slash cd .. -echo Windows slashs, valid path +echo Windows slashes, valid path for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f for %%f in (foobar\baz\*) do echo WC : %%f -echo Windows slashs, invalid path +echo Windows slashes, invalid path for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f for %%f in (foobar\jim\*) do echo WC : %%f -echo Unix slashs, valid path +echo Unix slashes, valid path for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f for %%f in (foobar/baz/*) do echo WC : %%f -echo Unix slashs, invalid path +echo Unix slashes, invalid path for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f for %%f in (foobar/jim/*) do echo WC : %%f echo Done Modified: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] Sat Jun 4 18:00:50 2016 @@ -714,15 +714,15 @@ Strip missing wildcards, keep unwildcarded names for /R passed --- Complex wildcards unix and windows slash -Windows slashs, valid path +Windows slashes, valid path ASIS: foobar\baz\bazbaz WC : foobar\baz\bazbaz -Windows slashs, invalid path +Windows slashes, invalid path ASIS: foobar\jim\bazbaz -Unix slashs, valid path +Unix slashes, valid path ASIS: foobar/baz/bazbaz WC : bazbaz -Unix slashs, invalid path +Unix slashes, invalid path ASIS: foobar/jim/bazbaz Done --- for /L

8 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016