Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 59588: [SAMLIB] - Implement SamGetDisplayEnumerationIndex. - Add DOMAIN_DISPLAY_INFORMATION to ntsam.h and update sam.idl.
by ekohl＠svn.reactos.org 27 Jul '13

27 Jul '13

Author: ekohl Date: Sat Jul 27 14:06:53 2013 New Revision: 59588 URL: http://svn.reactos.org/svn/reactos?rev=59588&view=rev Log: [SAMLIB] - Implement SamGetDisplayEnumerationIndex. - Add DOMAIN_DISPLAY_INFORMATION to ntsam.h and update sam.idl. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -872,6 +872,39 @@ NTSTATUS NTAPI +SamGetDisplayEnumerationIndex(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN PUNICODE_STRING Prefix, + OUT PULONG Index) +{ + NTSTATUS Status; + + TRACE("(%p %lu %wZ %p)\n", + DomainHandle, DisplayInformation, Prefix, Index); + + if ((Prefix == NULL) || + (Index == NULL)) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = SamrGetDisplayEnumerationIndex2((SAMPR_HANDLE)DomainHandle, + DisplayInformation, + (PRPC_UNICODE_STRING)Prefix, + Index); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -21,7 +21,7 @@ @ stdcall SamFreeMemory(ptr) @ stdcall SamGetAliasMembership(ptr long ptr ptr ptr) @ stdcall SamGetCompatibilityMode(ptr ptr) -@ stub SamGetDisplayEnumerationIndex +@ stdcall SamGetDisplayEnumerationIndex(ptr long ptr ptr) @ stdcall SamGetGroupsForUser(ptr ptr ptr) @ stdcall SamGetMembersInAlias(ptr ptr ptr) @ stdcall SamGetMembersInGroup(ptr ptr ptr ptr) Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -298,6 +298,15 @@ UNICODE_STRING AdminComment; } ALIAS_ADM_COMMENT_INFORMATION, *PALIAS_ADM_COMMENT_INFORMATION; +typedef enum _DOMAIN_DISPLAY_INFORMATION +{ + DomainDisplayUser = 1, + DomainDisplayMachine, + DomainDisplayGroup, + DomainDisplayOemUser, + DomainDisplayOemGroup, + DomainDisplayServer +} DOMAIN_DISPLAY_INFORMATION, *PDOMAIN_DISPLAY_INFORMATION; typedef enum _DOMAIN_INFORMATION_CLASS { @@ -818,6 +827,13 @@ NTSTATUS NTAPI +SamGetDisplayEnumerationIndex(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN PUNICODE_STRING Prefix, + OUT PULONG Index); + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount); Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sat Jul 27 14:06:53 2013 @@ -275,14 +275,17 @@ [case(DomainModifiedInformation2)] DOMAIN_MODIFIED_INFORMATION2 Modified2; } SAMPR_DOMAIN_INFO_BUFFER, *PSAMPR_DOMAIN_INFO_BUFFER; +cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_DISPLAY_INFORMATION { DomainDisplayUser = 1, DomainDisplayMachine, DomainDisplayGroup, DomainDisplayOemUser, - DomainDisplayOemGroup + DomainDisplayOemGroup, + DomainDisplayServer } DOMAIN_DISPLAY_INFORMATION, *PDOMAIN_DISPLAY_INFORMATION; +cpp_quote("#endif") typedef struct _SAMPR_DOMAIN_DISPLAY_USER {

1 0

[ion] 59587: [NTOSKRNL/BASESRV]: Tiny formatting clean-ups made while debugging.
by ion＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: ion Date: Thu Jul 25 23:56:17 2013 New Revision: 59587 URL: http://svn.reactos.org/svn/reactos?rev=59587&view=rev Log: [NTOSKRNL/BASESRV]: Tiny formatting clean-ups made while debugging. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Thu Jul 25 23:56:17 2013 @@ -3265,7 +3265,7 @@ PreviousMode, (PVOID*)&SourceProcess, NULL); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) return Status; /* Check if got a target handle */ if (TargetProcessHandle) Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Thu Jul 25 23:56:17 2013 @@ -57,7 +57,7 @@ DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to duplicate process handle\n"); + DPRINT1("Failed to duplicate process handle: %lx\n", Status); return Status; } @@ -71,7 +71,7 @@ DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to duplicate process handle\n"); + DPRINT1("Failed to duplicate thread handle: %lx\n", Status); NtClose(ProcessHandle); return Status; }

1 0

[tkreuzer] 59586: [GDI32] Handle CBM_CREATDIB [WIN32K] Make sure compressed DIBs have a bitmap size in the BITMAPINFOHEADER
by tkreuzer＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: tkreuzer Date: Thu Jul 25 21:03:14 2013 New Revision: 59586 URL: http://svn.reactos.org/svn/reactos?rev=59586&view=rev Log: [GDI32] Handle CBM_CREATDIB [WIN32K] Make sure compressed DIBs have a bitmap size in the BITMAPINFOHEADER Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/dibitmap.c [iso-8859-1] Thu Jul 25 21:03:14 2013 @@ -198,6 +198,11 @@ if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { pbmi = ConvertBitmapCoreInfo(pbmi, iUsage); + if (pbmi == NULL) + { + return NULL; + } + bConvertedInfo = TRUE; } @@ -227,21 +232,30 @@ cjInfo = 0; } + /* Check for the undocumented CBM_CREATDIB flag */ if (fdwInit & CBM_CREATDIB) { - if (!pbmi) return NULL; - - //__debugbreak(); - return 0; - } - else - { - if (!pbmih) + /* We need a BITMAPINFO */ + if (pbmi == NULL) + { + /* LastError is not set here! */ + goto cleanup; + } + + /* Get the dimension from the BITMAPINFO */ + cx = pbmi->bmiHeader.biWidth; + cy = abs(pbmi->bmiHeader.biHeight); + } + else + { + /* We need the BITMAPINFOHEADER */ + if (pbmih == NULL) { SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } + /* Check the type of the BITMAPINFOHEADER */ if (pbmih->biSize == sizeof(BITMAPCOREHEADER)) { PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmih; @@ -258,11 +272,13 @@ SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } - - if ((cx == 0) || (cy == 0)) - { - return GetStockObject(DEFAULT_BITMAP); - } + } + + /* Check if either width or height is 0 */ + if ((cx == 0) || (cy == 0)) + { + /* Return the default bitmap */ + return GetStockObject(DEFAULT_BITMAP); } @@ -279,7 +295,10 @@ 0); cleanup: - if (bConvertedInfo && pbmi) HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + if (bConvertedInfo) + { + HeapFree(GetProcessHeap(), 0, (PVOID)pbmi); + } return hbmp; } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Thu Jul 25 21:03:14 2013 @@ -56,14 +56,22 @@ } else { + /* This is a compressed format, no line width. */ pbmf->cjWidthBytes = 0; - } - - /* Check compressed format and top-down */ - if ((pbmf->iFormat > BMF_32BPP) && (pbmf->sizel.cy < 0)) - { - DPRINT1("Compressed bitmaps cannot be top-down.\n"); - return FALSE; + + /* Check if we have a proper image size */ + if (pbmf->cjImageSize == 0) + { + DPRINT1("Invalid format, need biSizeImage != 0\n"); + return FALSE; + } + + /* Check for top-down */ + if (pbmf->sizel.cy < 0) + { + DPRINT1("Compressed bitmaps cannot be top-down.\n"); + return FALSE; + } } // FIXME: check bitmap extensions / size @@ -611,6 +619,7 @@ return NULL; } + /* Get the DC surface */ psurfDC = pdc->dclevel.pSurface; } else @@ -654,8 +663,8 @@ else { ppalBmp = CreateDIBPalette(pbmi, pdc, iUsage); - } - } + } + } else { if (psurfDC) @@ -674,8 +683,8 @@ GDIOBJ_vReferenceObjectByPointer(&ppalBmp->BaseObject); } - /* Allocate a surface for the bitmap */ - psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); + /* Allocate a surface for the bitmap */ + psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); if (psurfBmp) { /* Set new palette for the bitmap */ @@ -1310,7 +1319,7 @@ HANDLE hSecure; ULONG cyDIB; INT yTop, iResult; -__debugbreak(); +//__debugbreak(); /* Check if parameters are valid */ if ((cNumScan == 0) || (cx >= INT_MAX) || (cy >= INT_MAX)) {

1 0

[tfaber] 59585: [NOTEPAD] - Don't assume out parameter initialization on failure. Patch by Samuel Serapión CORE-7292 #resolve
by tfaber＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: tfaber Date: Thu Jul 25 20:29:23 2013 New Revision: 59585 URL: http://svn.reactos.org/svn/reactos?rev=59585&view=rev Log: [NOTEPAD] - Don't assume out parameter initialization on failure. Patch by Samuel Serapión CORE-7292 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Thu Jul 25 20:29:23 2013 @@ -293,7 +293,7 @@ { static const TCHAR dotlog[] = _T(".LOG"); HANDLE hFile; - LPTSTR pszText; + LPTSTR pszText = NULL; DWORD dwTextLen; TCHAR log[5];

1 0

[ion] 59584: - Server 2003 and later return the remote PEB in the TIB->ArbitraryUserPointer. Do so as well.
by ion＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: ion Date: Thu Jul 25 18:32:52 2013 New Revision: 59584 URL: http://svn.reactos.org/svn/reactos?rev=59584&view=rev Log: - Server 2003 and later return the remote PEB in the TIB->ArbitraryUserPointer. Do so as well. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Jul 25 18:32:52 2013 @@ -838,6 +838,12 @@ /* Protect against bad user-mode pointer */ _SEH2_TRY { + /* Hacky way of returning the PEB to the user-mode creator */ + if ((Process->Peb) && (CurrentThread->Tcb.Teb)) + { + CurrentThread->Tcb.Teb->NtTib.ArbitraryUserPointer = Process->Peb; + } + /* Save the process handle */ *ProcessHandle = hProcess; }

1 0

[ion] 59583: [NTDLL]: Export LdrOpenImageFileOptionsKey and LdrQueryIamgeFileKeyOption. These were implemented, we just never exported them.
by ion＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: ion Date: Thu Jul 25 18:30:06 2013 New Revision: 59583 URL: http://svn.reactos.org/svn/reactos?rev=59583&view=rev Log: [NTDLL]: Export LdrOpenImageFileOptionsKey and LdrQueryIamgeFileKeyOption. These were implemented, we just never exported them. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu Jul 25 18:30:06 2013 @@ -91,9 +91,10 @@ @ stdcall LdrLoadAlternateResourceModule(ptr ptr) @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) -;@ stdcall LdrOpenImageFileOptionsKey ; 5.2 SP1 and higher +@ stdcall LdrOpenImageFileOptionsKey(ptr long ptr) ; 5.2 SP1 and higher @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr str long ptr long ptr) +@ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) ;@ stdcall LdrSetAppCompatDllRedirectionCallback ;@ stdcall LdrSetDllManifestProber

1 0

[akhaldi] 59582: [CDMAKE] * Remove an unused variable.
by akhaldi＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: akhaldi Date: Thu Jul 25 15:14:32 2013 New Revision: 59582 URL: http://svn.reactos.org/svn/reactos?rev=59582&view=rev Log: [CDMAKE] * Remove an unused variable. Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jul 25 15:14:32 2013 @@ -129,7 +129,6 @@ void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) { - unsigned int hashcode; struct target_file *tf; struct target_dir_entry *de; const char *filename = chop_filename(target);

1 0

[pschweitzer] 59581: [CDMAKE] Fix memory leak in dir_hash_add_file(). The duplicated targetnorm used for calling dir_hash_create_dir is never affected anywhere. It is duplicated again before affect...
by pschweitzer＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: pschweitzer Date: Thu Jul 25 15:04:56 2013 New Revision: 59581 URL: http://svn.reactos.org/svn/reactos?rev=59581&view=rev Log: [CDMAKE] Fix memory leak in dir_hash_add_file(). The duplicated targetnorm used for calling dir_hash_create_dir is never affected anywhere. It is duplicated again before affectation. And thus, leaks. Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jul 25 15:04:56 2013 @@ -139,6 +139,7 @@ targetnorm = strdup(targetdir); normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); + free(targetnorm); tf = calloc(1, sizeof(*tf)); tf->next = de->head; de->head = tf;

1 0

[gadamopoulos] 59580: [shell32] - Do not call OnDefaultCommand when there is no selected item in the shell view
by gadamopoulos＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: gadamopoulos Date: Thu Jul 25 12:57:56 2013 New Revision: 59580 URL: http://svn.reactos.org/svn/reactos?rev=59580&view=rev Log: [shell32] - Do not call OnDefaultCommand when there is no selected item in the shell view Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Jul 25 12:57:56 2013 @@ -1102,6 +1102,10 @@ UINT uCommand; HRESULT hResult; + cidl = ListView_GetSelectedCount(hWndList); + if (cidl == 0) + return S_OK; + hResult = OnDefaultCommand(); if (hResult == S_OK) return hResult; @@ -1175,7 +1179,7 @@ if (!hMenu) return E_FAIL; - GetSelections(); + cidl = ListView_GetSelectedCount(hWndList); hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); if (FAILED( hResult))

1 0

[gadamopoulos] 59579: [shell32] - Improve the execution of a shell verb in the default context menu. - Retrieve the browse flags from the verb in order to figure out if we should actually try to br...
by gadamopoulos＠svn.reactos.org 25 Jul '13

25 Jul '13

Author: gadamopoulos Date: Thu Jul 25 12:54:30 2013 New Revision: 59579 URL: http://svn.reactos.org/svn/reactos?rev=59579&view=rev Log: [shell32] - Improve the execution of a shell verb in the default context menu. - Retrieve the browse flags from the verb in order to figure out if we should actually try to browse - Execute all the items that were selected and not only the first one Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Thu Jul 25 12:54:30 2013 @@ -8,10 +8,7 @@ /* TODO: -1. In DoStaticShellExtensions, check for "Explore" and "Open" verbs, and for BrowserFlags or - ExplorerFlags under those entries. These flags indicate if we should browse to the new item - instead of attempting to open it. -2. The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent + The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent example of the wrong way to do it. */ @@ -71,6 +68,9 @@ HRESULT DoFormat(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoDynamicShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoStaticShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); + DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); + HRESULT TryToBrowse(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags); + HRESULT InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry); public: CDefaultContextMenu(); @@ -1484,23 +1484,64 @@ return E_FAIL; } - -HRESULT -CDefaultContextMenu::DoStaticShellExtensions( - LPCMINVOKECOMMANDINFO lpcmi) -{ - PStaticShellEntry pEntry = m_pStaticEntries; - INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; +DWORD +CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) +{ + LPSHELLBROWSER lpSB; + HWND hwndTree; + LPWSTR FlagsName; + WCHAR wszKey[256]; HRESULT hr; - - while (pEntry && (iCmd--) > 0) - pEntry = pEntry->pNext; - - if (iCmd > 0) - return E_FAIL; - + DWORD wFlags; + DWORD cbVerb; + + /* Get a pointer to the shell browser */ + lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (lpSB == NULL) + return 0; + + /* See if we are in Explore or Browse mode. If the browser's tree is present, we are in Explore mode.*/ + if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) + FlagsName = L"ExplorerFlags"; + else + FlagsName = L"BrowserFlags"; + + /* Try to get the flag from the verb */ + hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"%s\\shell\\%s", pEntry->szClass, pEntry->szVerb); + if (!SUCCEEDED(hr)) + return 0; + + cbVerb = sizeof(wFlags); + if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, FlagsName, RRF_RT_REG_DWORD, NULL, &wFlags, &cbVerb) == ERROR_SUCCESS) + { + return wFlags; + } + + return 0; +} + +HRESULT +CDefaultContextMenu::TryToBrowse( + LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) +{ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + HRESULT hr; + + if (lpSB == NULL) + return E_FAIL; + + hr = lpSB->BrowseObject(ILCombine(m_Dcm.pidlFolder, pidl), wFlags); + + return hr; +} + +HRESULT +CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) +{ + HRESULT hr; STRRET strFile; - hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile); + + hr = m_Dcm.psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); if (hr != S_OK) { ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); @@ -1508,7 +1549,7 @@ } WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, MAX_PATH); + hr = StrRetToBufW(&strFile, pidl, wszPath, MAX_PATH); if (hr != S_OK) return hr; @@ -1519,14 +1560,57 @@ SHELLEXECUTEINFOW sei; ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_CLASSNAME; - sei.lpClass = pEntry->szClass; sei.hwnd = lpcmi->hwnd; sei.nShow = SW_SHOWNORMAL; sei.lpVerb = pEntry->szVerb; sei.lpFile = wszPath; sei.lpDirectory = wszDir; ShellExecuteExW(&sei); + + return S_OK; +} + +HRESULT +CDefaultContextMenu::DoStaticShellExtensions( + LPCMINVOKECOMMANDINFO lpcmi) +{ + PStaticShellEntry pEntry = m_pStaticEntries; + INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; + HRESULT hr; + UINT i; + + while (pEntry && (iCmd--) > 0) + pEntry = pEntry->pNext; + + if (iCmd > 0) + return E_FAIL; + + /* Get the browse flags to see if we need to browse */ + DWORD wFlags = BrowserFlagsFromVerb(lpcmi, pEntry); + BOOL bBrowsed = FALSE; + + for (i=0; i < m_Dcm.cidl; i++) + { + /* Check if we need to browse */ + if (wFlags > 0) + { + /* In xp if we have browsed, we don't open any more folders . + * In win7 we browse to the first folder we find and + * open new windows fo for each of the rest of the folders */ + if (bBrowsed) + continue; + + hr = TryToBrowse(lpcmi, m_Dcm.apidl[i], wFlags); + if (SUCCEEDED(hr)) + { + bBrowsed = TRUE; + continue; + } + } + + InvokePidl(lpcmi, m_Dcm.apidl[i], pEntry); + } + return S_OK; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs