Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[tfaber] 63630: [RTL] - Apply Wine commit 5b0fcb06 (ntdll: Avoid crashing on an empty resource directory.) by Alexandre Julliard

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 22 18:44:21 2014 New Revision: 63630 URL: http://svn.reactos.org/svn/reactos?rev=63630&view=rev Log: [RTL] - Apply Wine commit 5b0fcb06 (ntdll: Avoid crashing on an empty resource directory.) by Alexandre Julliard Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Sun Jun 22 18:44:21 2014 @@ -430,6 +430,7 @@ root = RtlImageDirectoryEntryToData( BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size ); if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND; + if (size < sizeof(*resdirptr)) return STATUS_RESOURCE_DATA_NOT_FOUND; resdirptr = root; if (!level--) goto done; Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sun Jun 22 18:44:21 2014 @@ -695,6 +695,7 @@ root = RtlImageDirectoryEntryToData( BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size ); if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND; + if (size < sizeof(*resdirptr)) return STATUS_RESOURCE_DATA_NOT_FOUND; resdirptr = root; if (!level--) goto done;

10 years, 6 months

[tfaber] 63629: [NTDLL:LDR] - Fix buffer size calculation in LdrpSearchPath

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 22 18:40:21 2014 New Revision: 63629 URL: http://svn.reactos.org/svn/reactos?rev=63629&view=rev Log: [NTDLL:LDR] - Fix buffer size calculation in LdrpSearchPath Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jun 22 18:40:21 2014 @@ -1820,7 +1820,7 @@ /* FIXME: Handle relative case semicolon-lookup here */ /* Calculate length */ - Length += (ULONG)wcslen(DllName) + sizeof(UNICODE_NULL); + Length += (ULONG)wcslen(DllName) + 1; if (Length > UNICODE_STRING_MAX_CHARS) { /* Too long, fail */

10 years, 6 months

[tfaber] 63628: [CMAKE] - Correctly include the license for CMakeParseArguments.cmake

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 22 18:35:17 2014 New Revision: 63628 URL: http://svn.reactos.org/svn/reactos?rev=63628&view=rev Log: [CMAKE] - Correctly include the license for CMakeParseArguments.cmake Modified: trunk/reactos/cmake/CMakeParseArguments.cmake Modified: trunk/reactos/cmake/CMakeParseArguments.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeParseArguments.… ============================================================================== --- trunk/reactos/cmake/CMakeParseArguments.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeParseArguments.cmake [iso-8859-1] Sun Jun 22 18:35:17 2014 @@ -63,15 +63,34 @@ #============================================================================= # Copyright 2010 Alexander Neundorf <neundorf(a)kde.org> # -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: # -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)

10 years, 6 months

[tfaber] 63627: [APPLICATIONS][NEWDEV] - Remove broken function pointer casts

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 22 18:33:18 2014 New Revision: 63627 URL: http://svn.reactos.org/svn/reactos?rev=63627&view=rev Log: [APPLICATIONS][NEWDEV] - Remove broken function pointer casts Modified: trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/mspaint/dialogs.c trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Jun 22 18:33:18 2014 @@ -1626,7 +1626,7 @@ if (IsWindow(calc.hStatWnd)) break; calc.hStatWnd = CreateDialog(calc.hInstance, - MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, (DLGPROC)DlgStatProc); + MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, DlgStatProc); if (calc.hStatWnd != NULL) { enable_allowed_controls(hWnd, calc.base); SendMessage(calc.hStatWnd, WM_SETFOCUS, 0, 0); @@ -1722,7 +1722,7 @@ dwLayout = IDD_DIALOG_STANDARD; /* This call will always fail if UNICODE for Win9x */ - if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc)) + if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, DlgMainProc)) break; while (GetMessage(&msg, NULL, 0, 0)) { Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Jun 22 18:33:18 2014 @@ -166,7 +166,7 @@ if (bShowWarning) { - DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, (DLGPROC)WarningProc); + DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); } return TRUE; @@ -375,10 +375,10 @@ switch (wmId) { case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, (DLGPROC)OptionsProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); break; case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)AboutProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); break; case IDM_EXIT: DestroyWindow(hWnd); Modified: trunk/reactos/base/applications/mspaint/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dialogs.c [iso-8859-1] Sun Jun 22 18:33:18 2014 @@ -14,7 +14,7 @@ /* FUNCTIONS ********************************************************/ -LRESULT CALLBACK +INT_PTR CALLBACK MRDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -66,10 +66,10 @@ int mirrorRotateDlg() { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), hMainWnd, (DLGPROC) MRDlgWinProc); -} - -LRESULT CALLBACK + return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), hMainWnd, MRDlgWinProc); +} + +INT_PTR CALLBACK ATTDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -203,10 +203,10 @@ int attributesDlg() { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), hMainWnd, (DLGPROC) ATTDlgWinProc); -} - -LRESULT CALLBACK + return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), hMainWnd, ATTDlgWinProc); +} + +INT_PTR CALLBACK CHSIZEDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -266,5 +266,5 @@ int changeSizeDlg() { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), hMainWnd, (DLGPROC) CHSIZEDlgWinProc); -} + return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), hMainWnd, CHSIZEDlgWinProc); +} Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Sun Jun 22 18:33:18 2014 @@ -1255,49 +1255,49 @@ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hDllInstance; psp.lParam = (LPARAM)DevInstData; - psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc; + psp.pfnDlgProc = WelcomeDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp); /* Create the Select Source page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc; + psp.pfnDlgProc = CHSourceDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE); ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp); /* Create the Search driver page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc; + psp.pfnDlgProc = SearchDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV); ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp); /* Create the Install driver page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc; + psp.pfnDlgProc = InstallDrvDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV); ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp); /* Create the No driver page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc; + psp.pfnDlgProc = NoDriverDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER); ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp); /* Create the Install failed page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc; + psp.pfnDlgProc = InstallFailedDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); /* Create the Need reboot page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc; + psp.pfnDlgProc = NeedRebootDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT); ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp); /* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.pfnDlgProc = (DLGPROC) FinishDlgProc; + psp.pfnDlgProc = FinishDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);

10 years, 6 months

[hbelusca] 63626: [ODBCCP32]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 22 09:37:55 2014 New Revision: 63626 URL: http://svn.reactos.org/svn/reactos?rev=63626&view=rev Log: [ODBCCP32]: Whitespace fixes only. Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] Sun Jun 22 09:37:55 2014 @@ -15,9 +15,9 @@ LONG CALLBACK CPlApplet(HWND hwndCpl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { switch (uMsg) { @@ -66,24 +66,25 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpReserved) + DWORD dwReason, + LPVOID lpReserved) { - INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(lpReserved); + INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + { + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; + InitCommonControlsEx(&InitControls); - InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; - InitCommonControlsEx(&InitControls); + hApplet = hinstDLL; + break; + } + } - hApplet = hinstDLL; - break; - } - - return TRUE; + return TRUE; }

10 years, 6 months

[hbelusca] 63625: [ODBCCP32] The control panel automatically runs this applet without clicking on it, fix this wrong behaviour. Patch by Lee Schröder CORE-8323 #resolve #comment Thanks :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 22 09:33:46 2014 New Revision: 63625 URL: http://svn.reactos.org/svn/reactos?rev=63625&view=rev Log: [ODBCCP32] The control panel automatically runs this applet without clicking on it, fix this wrong behaviour. Patch by Lee Schröder CORE-8323 #resolve #comment Thanks :) Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] Sun Jun 22 09:33:46 2014 @@ -19,36 +19,47 @@ LPARAM lParam1, LPARAM lParam2) { - if (ODBCProc == NULL) - { - TCHAR szBuffer[MAX_PATH]; + switch (uMsg) + { + case CPL_INIT: + return TRUE; - if (ExpandEnvironmentStrings(_T("%systemroot%\\system32\\odbccp32.dll"), - szBuffer, - sizeof(szBuffer) / sizeof(TCHAR)) > 0) - { - hLibrary = LoadLibrary(szBuffer); - if (hLibrary) - { - ODBCProc = (APPLET_PROC)GetProcAddress(hLibrary, "ODBCCPlApplet"); - } - } - } + case CPL_DBLCLK: + { + if (ODBCProc == NULL) + { + TCHAR szBuffer[MAX_PATH]; - if (ODBCProc) - { - return ODBCProc(hwndCpl, uMsg, lParam1, lParam2); - } - else - { - if(hLibrary) - { - FreeLibrary(hLibrary); - } + if (ExpandEnvironmentStrings(_T("%systemroot%\\system32\\odbccp32.dll"), + szBuffer, + sizeof(szBuffer) / sizeof(TCHAR)) > 0) + { + hLibrary = LoadLibrary(szBuffer); + if (hLibrary) + { + ODBCProc = (APPLET_PROC)GetProcAddress(hLibrary, "ODBCCPlApplet"); + } + } + } - TerminateProcess(GetCurrentProcess(), -1); - return (LONG)-1; - } + if (ODBCProc) + { + return ODBCProc(hwndCpl, uMsg, lParam1, lParam2); + } + else + { + if (hLibrary) + { + FreeLibrary(hLibrary); + } + + TerminateProcess(GetCurrentProcess(), -1); + return (LONG)-1; + } + } + } + + return FALSE; }

10 years, 6 months

[tfaber] 63624: [WIN32K] - Pass a boolean argument to RtlEqualUnicodeString

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 21 11:07:51 2014 New Revision: 63624 URL: http://svn.reactos.org/svn/reactos?rev=63624&view=rev Log: [WIN32K] - Pass a boolean argument to RtlEqualUnicodeString Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Sat Jun 21 11:07:51 2014 @@ -382,7 +382,7 @@ if (pldev->pGdiDriverInfo) { /* Check for match (case insensative) */ - if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, 1)) + if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, TRUE)) { /* Image found in LDEV list */ break; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Jun 21 11:07:51 2014 @@ -72,7 +72,7 @@ /* Compare the name */ if (RtlEqualUnicodeString(RemainingName, &DesktopName, - (Attributes & OBJ_CASE_INSENSITIVE))) + (Attributes & OBJ_CASE_INSENSITIVE) != 0)) { /* We found a match. Did this come from a create? */ if (Context)

10 years, 6 months

[dquintana] 63623: [EXPLORER-NEW] * Use a struct like the comment suggested. May not fix anything, but it's one FIXME less in ReactOS.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Jun 19 23:38:39 2014 New Revision: 63623 URL: http://svn.reactos.org/svn/reactos?rev=63623&view=rev Log: [EXPLORER-NEW] * Use a struct like the comment suggested. May not fix anything, but it's one FIXME less in ReactOS. Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Thu Jun 19 23:38:39 2014 @@ -44,6 +44,13 @@ INT VisibleButtonCount; } SYS_PAGER_WND_DATA, *PSYS_PAGER_WND_DATA; +// Data comes from shell32/systray.cpp -> TrayNotifyCDS_Dummy +typedef struct _SYS_PAGER_COPY_DATA +{ + DWORD cookie; + DWORD notify_code; + NOTIFYICONDATA nicon_data; +} SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; static PNOTIFY_ITEM SysPagerWnd_CreateNotifyItemData(IN OUT PSYS_PAGER_WND_DATA This) @@ -418,7 +425,7 @@ PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; if (cpData->dwData == 1) { - DWORD trayCommand; + SYS_PAGER_COPY_DATA data; NOTIFYICONDATA *iconData; HWND parentHWND; RECT windowRect; @@ -426,15 +433,21 @@ parentHWND = GetParent(parentHWND); GetClientRect(parentHWND, &windowRect); - /* FIXME: ever heard of "struct"? */ - trayCommand = *(DWORD *) (((BYTE *)cpData->lpData) + 4); - iconData = (NOTIFYICONDATA *) (((BYTE *)cpData->lpData) + 8); - - switch (trayCommand) + ZeroMemory(&data, sizeof(data)); + CopyMemory( + &data, + (PSYS_PAGER_COPY_DATA) cpData->lpData, + cpData->dwData); + iconData = &data.nicon_data; + + switch (data.notify_code) { case NIM_ADD: { PPNOTIFY_ITEM NotifyPointer; + + DbgPrint("NotifyMessage received with NIM_ADD\n"); + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); if (!NotifyPointer) @@ -446,6 +459,9 @@ case NIM_MODIFY: { PPNOTIFY_ITEM NotifyPointer; + + DbgPrint("NotifyMessage received with NIM_MODIFY\n"); + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); if (!NotifyPointer) @@ -460,9 +476,14 @@ } case NIM_DELETE: { + DbgPrint("NotifyMessage received with NIM_DELETE\n"); + SysPagerWnd_RemoveButton(This, iconData); break; } + default: + DbgPrint("NotifyMessage received with unknown code %d.\n", data.notify_code); + break; } SendMessage(parentHWND, WM_SIZE,

10 years, 6 months

[dquintana] 63622: [FILEBROWSER] * Copy basic path parsing from explorer-new, so filebrowser.exe can load with a different folder active.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Jun 19 23:24:09 2014 New Revision: 63622 URL: http://svn.reactos.org/svn/reactos?rev=63622&view=rev Log: [FILEBROWSER] * Copy basic path parsing from explorer-new, so filebrowser.exe can load with a different folder active. Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Thu Jun 19 23:24:09 2014 @@ -28,18 +28,110 @@ int _tmain(int argc, _TCHAR* argv[]) { + WCHAR root[MAX_PATH]; + HRESULT hr; + LPSHELLFOLDER pDesktopFolder = NULL; + LPITEMIDLIST pidlRoot = NULL; + typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); + SH_OPEN_NEW_FRAME SHOpenNewFrame; + HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); - if (hBrowseui) + + if (!hBrowseui) + return 1; + + + if (argc < 2) { - SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); + SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); LPITEMIDLIST pidlDrives; SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); - SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0); + SHOpenNewFrame((LPITEMIDLIST) pidlDrives, NULL, 0, 0); + } + else + { + /* A shell is already loaded. Parse the command line arguments + and unless we need to do something specific simply display + the desktop in a separate explorer window */ + /* FIXME */ + + /* Commandline switches: + * + * /n Open a new window, even if an existing one still exists. + * /e Start with the explorer sidebar shown. + * /root,<object> Open a window for the given object path. + * /select,<object> Open a window with the given object selected. + */ + + /* FIXME: Do it right */ + WCHAR* tmp = wcsstr(argv[1], L"/root,"); + if (tmp) + { + WCHAR* tmp2; + + tmp += 6; // skip to beginning of path + tmp2 = wcschr(tmp, L','); + + if (tmp2) + { + wcsncpy(root, tmp, tmp2 - tmp); + } + else + { + wcscpy(root, tmp); + } + } + else + { + wcscpy(root, argv[1]); + } + + if (root[0] == L'"') + { + int len = wcslen(root) - 2; + wcsncpy(root, root + 1, len); + root[len] = 0; + } + + if (wcslen(root) > 0) + { + LPITEMIDLIST pidl; + ULONG chEaten; + ULONG dwAttributes; + + if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder))) + { + hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder, + NULL, + NULL, + root, + &chEaten, + &pidl, + &dwAttributes); + if (SUCCEEDED(hr)) + { + pidlRoot = pidl; + } + } + } + + if (!pidlRoot) + { + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot); + if (FAILED(hr)) + return 0; + } + + SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); + + hr = SHOpenNewFrame(pidlRoot, (IUnknown*) pDesktopFolder, 0, 0); + if (FAILED(hr)) + return 0; } - /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process */ + /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ + Sleep(1000); + ExitThread(0); - - return 0; }

10 years, 6 months

[dquintana] 63621: [BROWSEUI] * Process ParseNow on the CBEN_ENDEDIT notification. * Call SHAutoComplete to ask the edit control to have autocomplete functionality. I need to figure out the flag or...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Jun 19 23:23:04 2014 New Revision: 63621 URL: http://svn.reactos.org/svn/reactos?rev=63621&view=rev Log: [BROWSEUI] * Process ParseNow on the CBEN_ENDEDIT notification. * Call SHAutoComplete to ask the edit control to have autocomplete functionality. I need to figure out the flag or whatever is needed to make it show "Search 'string'" when entering something that's not a valid path. Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Thu Jun 19 23:23:04 2014 @@ -347,6 +347,8 @@ CComPtr<IWinEventHandler> winEventHandler; HRESULT hResult; + *theResult = 0; + switch (uMsg) { case WM_WININICHANGE: @@ -544,7 +546,6 @@ { if (notifyHeader->hwndFrom == fGoButton) { - fAddressEditBox->ParseNow(0); fAddressEditBox->Execute(0); } return 0; Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Thu Jun 19 23:23:04 2014 @@ -74,6 +74,8 @@ fEditWindow.SubclassWindow(editControl); fSite = param18; + SHAutoComplete(fEditWindow.m_hWnd, SHACF_FILESYSTEM | SHACF_URLALL | SHACF_USETAB); + // take advice to watch events HRESULT hResult = IUnknown_QueryService(param18, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); if (SUCCEEDED(hResult)) @@ -98,8 +100,12 @@ CComPtr<IShellBrowser> pisb; hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); - - IUnknown_GetWindow(pisb, &topLevelWindow); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = IUnknown_GetWindow(pisb, &topLevelWindow); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; LPWSTR input; int inputLength = GetWindowTextLength(fCombobox.m_hWnd) + 2; @@ -118,12 +124,19 @@ { addressLength += 2; address = new WCHAR[addressLength]; - ExpandEnvironmentStrings(input, address, 0); + if (!ExpandEnvironmentStrings(input, address, addressLength)) + { + delete[] address; + address = input; + } } CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); - hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + if (SUCCEEDED(hr)) + { + hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + } if (address != input) delete [] address; @@ -171,8 +184,21 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - // handle fill of listbox here - return E_NOTIMPL; + LPNMHDR hdr; + + *theResult = 0; + + switch (uMsg) + { + case WM_NOTIFY: + hdr = (LPNMHDR) lParam; + if (hdr->code == CBEN_ENDEDIT) + { + ParseNow(0); + } + break; + } + return S_OK; } HRESULT STDMETHODCALLTYPE CAddressEditBox::IsWindowOwner(HWND hWnd)

10 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
16
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 2014