Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[janderwald] 37071: - Launch Network Connections ShellFolder when clicking Network Places' properties - Dedicated to gabriel_it

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 12:49:00 2008 New Revision: 37071 URL: http://svn.reactos.org/svn/reactos?rev=37071&view=rev Log: - Launch Network Connections ShellFolder when clicking Network Places' properties - Dedicated to gabriel_it Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Wed Oct 29 12:49:00 2008 @@ -1404,10 +1404,10 @@ } else if (_ILIsNetHood(This->dcm.apidl[0])) { - /* FIXME - * implement nethood properties - */ - FIXME("implement network connection shell folder\n"); + //FIXME path! + ShellExecuteW(NULL, L"open", L"explorer.exe", + L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, SW_SHOWDEFAULT); return S_OK; } else if (_ILIsBitBucket(This->dcm.apidl[0]))

16 years, 1 month

[cfinck] 37070: Don't decide whether to preprocess .spec files based on Kernel-Mode vs. User-Mode, but on the file extension. .pspec files are preprocessed now, while .spec files aren't. A change like this was already done in the amd64 branch before KJK rewrote the .spec stuff in rbuild. - Renamed currently preprocessed .spec files to .pspec and changed that in the .rbuild files appropriately - Renamed "IsWineModule" to "IsSpecDefinitionFile", the new name is more appropriate - Removed some chec

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 11:42:03 2008 New Revision: 37070 URL: http://svn.reactos.org/svn/reactos?rev=37070&view=rev Log: Don't decide whether to preprocess .spec files based on Kernel-Mode vs. User-Mode, but on the file extension. .pspec files are preprocessed now, while .spec files aren't. A change like this was already done in the amd64 branch before KJK rewrote the .spec stuff in rbuild. - Renamed currently preprocessed .spec files to .pspec and changed that in the .rbuild files appropriately - Renamed "IsWineModule" to "IsSpecDefinitionFile", the new name is more appropriate - Removed some checks for uppercased file extensions, we neither use them in our tree nor it will totally work as we only support them in a few places Commit dedicated to Timo ;-) Added: trunk/reactos/hal/hal/hal.pspec - copied unchanged from r37031, trunk/reactos/hal/hal/hal.spec trunk/reactos/ntoskrnl/ntoskrnl.pspec - copied unchanged from r37031, trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/subsystems/win32/win32k/win32k.pspec - copied unchanged from r37031, trunk/reactos/subsystems/win32/win32k/win32k.spec Removed: trunk/reactos/hal/hal/hal.spec trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/subsystems/win32/win32k/win32k.spec Modified: trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halarm/up/halup.rbuild trunk/reactos/hal/halx86/halmp.rbuild trunk/reactos/hal/halx86/halup.rbuild trunk/reactos/hal/halx86/halxbox.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/compilationunit.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=370… Removed: trunk/reactos/hal/hal/hal.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.spec?rev=37069… Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… Modified: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… Modified: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Removed: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Removed: trunk/reactos/subsystems/win32/win32k/win32k.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun…

16 years, 1 month

[cfinck] 37069: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 11:31:50 2008 New Revision: 37069 URL: http://svn.reactos.org/svn/reactos?rev=37069&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Wed Oct 29 11:31:50 2008 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - (DLGPROC)GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - (DLGPROC)DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

16 years, 1 month

[sginsberg] 37068: - KeSetTimerEx: When canceling the insertion of an expired timer, don't forget to exit the dispatcher and return. Fixes crashes exposed by kernel32 Winetest "timer", caused by KiTimerTableListHead suddenly having broken entries. - Also fix a comment -- KiExitDispatcher doesn't release the dispatcher lock, it is done in KxInsertTimer

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Oct 29 11:24:36 2008 New Revision: 37068 URL: http://svn.reactos.org/svn/reactos?rev=37068&view=rev Log: - KeSetTimerEx: When canceling the insertion of an expired timer, don't forget to exit the dispatcher and return. Fixes crashes exposed by kernel32 Winetest "timer", caused by KiTimerTableListHead suddenly having broken entries. - Also fix a comment -- KiExitDispatcher doesn't release the dispatcher lock, it is done in KxInsertTimer Modified: trunk/reactos/ntoskrnl/ke/timerobj.c Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Wed Oct 29 11:24:36 2008 @@ -398,6 +398,10 @@ /* Check if we need to do an interrupt */ if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Exit the dispatcher and return the old state */ + KiExitDispatcher(OldIrql); + return Inserted; } /* Set the time as Absolute */ @@ -419,7 +423,7 @@ Timer->Header.SignalState = FALSE; KxInsertTimer(Timer, Hand); - /* Release Dispatcher Lock */ + /* Exit the dispatcher */ KiExitDispatcher(OldIrql); /* Return old state */

16 years, 1 month

[janderwald] 37067: - Improve error checking - Remove extensions which should be hidden (*.lnk) - CID 82

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 11:19:09 2008 New Revision: 37067 URL: http://svn.reactos.org/svn/reactos?rev=37067&view=rev Log: - Improve error checking - Remove extensions which should be hidden (*.lnk) - CID 82 Modified: trunk/reactos/dll/win32/shell32/shfldr_admintools.c Modified: trunk/reactos/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] Wed Oct 29 11:19:09 2008 @@ -424,8 +424,8 @@ if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) wcscpy(pszPath, This->szTarget); - else - HCR_GetClassNameW(&CLSID_AdminFolderShortcut, pszPath, MAX_PATH); + else if (!HCR_GetClassNameW(&CLSID_AdminFolderShortcut, pszPath, MAX_PATH)) + hr = E_FAIL; } else if (_ILIsPidlSimple(pidl)) { @@ -436,12 +436,23 @@ wcscpy(pszPath, This->szTarget); pOffset = PathAddBackslashW(pszPath); if (pOffset) - _ILSimpleGetTextW(pidl, pOffset, MAX_PATH + 1 - (pOffset - pszPath)); + { + if (!_ILSimpleGetTextW(pidl, pOffset, MAX_PATH + 1 - (pOffset - pszPath))) + hr = E_FAIL; + } + else + hr = E_FAIL; } else - { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH + 1); - } + { + if (_ILSimpleGetTextW(pidl, pszPath, MAX_PATH + 1)) + { + if (SHELL_FS_HideExtension(pszPath)) + PathRemoveExtensionW(pszPath); + } + else + hr = E_FAIL; + } } else if (_ILIsSpecialFolder(pidl)) { @@ -449,10 +460,10 @@ if (bSimplePidl) { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); - } - - if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) + if (!_ILSimpleGetTextW(pidl, pszPath, MAX_PATH)) + hr = E_FAIL; + } + else if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) { int len = 0; @@ -473,11 +484,11 @@ { strRet->uType = STRRET_WSTR; strRet->u.pOleStr = pszPath; + TRACE ("-- (%p)->(%s,0x%08x)\n", This, debugstr_w(strRet->u.pOleStr), hr); } else CoTaskMemFree(pszPath); - TRACE ("-- (%p)->(%s,0x%08x)\n", This, debugstr_w(strRet->u.pOleStr), hr); return hr; }

16 years, 1 month

[cfinck] 37066: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 11:17:20 2008 New Revision: 37066 URL: http://svn.reactos.org/svn/reactos?rev=37066&view=rev Log: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 29 11:17:20 2008 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" Modified: branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed Oct 29 11:17:20 2008 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);

16 years, 1 month

[cfinck] 37065: Change the version to 0.3.7 (also in the Explorer start menu bitmap)

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 11:15:19 2008 New Revision: 37065 URL: http://svn.reactos.org/svn/reactos?rev=37065&view=rev Log: Change the version to 0.3.7 (also in the Explorer start menu bitmap) Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_7/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_7/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] Wed Oct 29 11:15:19 2008 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 7 #define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

16 years, 1 month

[sginsberg] 37064: - MmMapViewOfSection: Don't forget to unlock the address space before returning -- fixes a bugcheck revealed by kernel32 Winetest "virtual"

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Oct 29 11:10:20 2008 New Revision: 37064 URL: http://svn.reactos.org/svn/reactos?rev=37064&view=rev Log: - MmMapViewOfSection: Don't forget to unlock the address space before returning -- fixes a bugcheck revealed by kernel32 Winetest "virtual" Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Oct 29 11:10:20 2008 @@ -4642,18 +4642,21 @@ if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && !(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for read access */ if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for execute access */ if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; }

16 years, 1 month

[janderwald] 37063: * Try to invoke items by executing the default context menu action * Fixes executing of items like network connections folder whose items are no file system objects * Colin's wish list (1/2) :)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 11:00:28 2008 New Revision: 37063 URL: http://svn.reactos.org/svn/reactos?rev=37063&view=rev Log: * Try to invoke items by executing the default context menu action * Fixes executing of items like network connections folder whose items are no file system objects * Colin's wish list (1/2) :) Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed Oct 29 11:00:28 2008 @@ -835,6 +835,8 @@ static UINT CF_IDLIST = 0; HRESULT hr; IDataObject* selection; + IContextMenu * cm; + HMENU hmenu; FORMATETC fetc; STGMEDIUM stgm; LPIDA pIDList; @@ -843,14 +845,68 @@ LPCWSTR parent_dir = NULL; SFGAOF attribs; int i; + CMINVOKECOMMANDINFOEX ici; + MENUITEMINFOW info; if (0 == ShellView_GetSelections(This)) { return S_OK; } + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, + (LPCITEMIDLIST*)This->apidl, &IID_IContextMenu, + 0, (LPVOID *)&cm); + + if (SUCCEEDED(hr)) + { + hmenu = CreatePopupMenu(); + if (hmenu) + { + if (SUCCEEDED(IContextMenu_QueryContextMenu( cm, hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY))) + { + INT def = -1, n = GetMenuItemCount(hmenu); + + for ( i = 0; i < n; i++ ) + { + memset( &info, 0, sizeof info ); + info.cbSize = sizeof info; + info.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; + if (GetMenuItemInfoW( hmenu, i, TRUE, &info)) + { + if (info.fState & MFS_DEFAULT) + { + def = info.wID; + break; + } + } + } + if (def != -1) + { + memset( &ici, 0, sizeof ici ); + ici.cbSize = sizeof ici; + ici.lpVerb = MAKEINTRESOURCEA( def ); + ici.hwnd = This->hWnd; + + IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } + + } + DestroyMenu( hmenu ); + } + IContextMenu_Release(cm); + } + + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (LPVOID *)&selection); + + + if (FAILED(hr)) return hr;

16 years, 1 month

[cfinck] 37062: Rebranch 0.3.7 from trunk

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 10:45:08 2008 New Revision: 37062 URL: http://svn.reactos.org/svn/reactos?rev=37062&view=rev Log: Rebranch 0.3.7 from trunk Added: branches/ros-branch-0_3_7/ - copied from r37061, trunk/

16 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
52
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 October 2008