Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 63713: [BOOTDATA] Add / enable NLS settings for Arabic, Azeri, Kyrgyz, Latvian, Tatar and Uzbek. CORE-8348 #resolve
by ekohl＠svn.reactos.org 13 Jul '14

13 Jul '14

Author: ekohl Date: Sun Jul 13 16:40:44 2014 New Revision: 63713 URL: http://svn.reactos.org/svn/reactos?rev=63713&view=rev Log: [BOOTDATA] Add / enable NLS settings for Arabic, Azeri, Kyrgyz, Latvian, Tatar and Uzbek. CORE-8348 #resolve Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Jul 13 16:40:44 2014 @@ -882,6 +882,23 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","Unicode",2,"E000-F8FF" ; NLS Language settings +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","1c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","2c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3401",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3801",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","3c01",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","4001",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0401",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0402",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0404",0x00000000,"l_intl.nls" @@ -971,8 +988,8 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0429",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042a",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042b",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042c",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","082c",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042c",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","082c",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042d",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","042f",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0436",0x00000000,"l_intl.nls" @@ -982,10 +999,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","083e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0441",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0843",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0444",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0445",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0455",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0456",0x00000000,"l_intl.nls" @@ -998,6 +1016,22 @@ ; If you add/uncomment an entry here, please also add the appropriate Language ; in the previous section. HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00001c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00002c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003001",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003401",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003801",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00003c01",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00004001",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000403",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000404",0x00000000,"9" @@ -1083,8 +1117,8 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042a",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042b",0x00000000,"11" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042c",0x00000000,"6" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000082c",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042c",0x00000000,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000436",0x00000000,"1" @@ -1094,10 +1128,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000083e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000843",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000444",0x00000000,"5" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000445",0x00000000,"f" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000455",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000456",0x00000000,"1" @@ -1286,6 +1321,11 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\Software",,0x00000012 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\System",,0x00000012 ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 @@ -1963,7 +2003,7 @@ HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+sam,+netapi32,+msports,+devmgr" ; Winsrv configuration HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012

1 0

[ekohl] 63712: [NETSHELL] Add code to rename network conections.
by ekohl＠svn.reactos.org 13 Jul '14

13 Jul '14

Author: ekohl Date: Sun Jul 13 07:38:49 2014 New Revision: 63712 URL: http://svn.reactos.org/svn/reactos?rev=63712&view=rev Log: [NETSHELL] Add code to rename network conections. Modified: trunk/reactos/dll/win32/netshell/connectmanager.cpp trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp Modified: trunk/reactos/dll/win32/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] Sun Jul 13 07:38:49 2014 @@ -329,7 +329,45 @@ WINAPI CNetConnection::Rename(LPCWSTR pszwDuplicateName) { - return E_NOTIMPL; + WCHAR szName[140]; + LPOLESTR pStr; + DWORD dwSize; + HKEY hKey; + HRESULT hr; + + if (pszwDuplicateName == NULL || wcslen(pszwDuplicateName) == 0) + return S_OK; + + if (Props.pszwName) + { + CoTaskMemFree(Props.pszwName); + Props.pszwName = NULL; + } + + dwSize = (wcslen(pszwDuplicateName) + 1) * sizeof(WCHAR); + Props.pszwName = (LPWSTR)CoTaskMemAlloc(dwSize); + if (Props.pszwName == NULL) + return E_OUTOFMEMORY; + + wcscpy(Props.pszwName, pszwDuplicateName); + + hr = StringFromCLSID((CLSID)Props.guidId, &pStr); + if (SUCCEEDED(hr)) + { + wcscpy(szName, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); + wcscat(szName, pStr); + wcscat(szName, L"\\Connection"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, L"Name", NULL, REG_SZ, (LPBYTE)Props.pszwName, dwSize); + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + } + + return hr; } HRESULT WINAPI IConnection_Constructor(INetConnection **ppv, PINetConnectionItem pItem) Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Jul 13 07:38:49 2014 @@ -522,7 +522,16 @@ HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { - return E_NOTIMPL; + VALUEStruct * val; + + val = _ILGetValueStruct(pidl); + if (!val) + return E_FAIL; + + if (!val->pItem) + return E_FAIL; + + return val->pItem->Rename(lpName); } HRESULT WINAPI CNetworkConnections::GetDefaultSearchGUID(GUID * pguid)

1 0

[dquintana] 63711: [RSHELL] * the Programs menu is localized. Obtain it the right way.
by dquintana＠svn.reactos.org 12 Jul '14

12 Jul '14

Author: dquintana Date: Sat Jul 12 12:40:50 2014 New Revision: 63711 URL: http://svn.reactos.org/svn/reactos?rev=63711&view=rev Log: [RSHELL] * the Programs menu is localized. Obtain it the right way. Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Sat Jul 12 12:40:50 2014 @@ -380,6 +380,7 @@ HRESULT hr; IShellFolder * psf; + LPITEMIDLIST pidlProgramsAbsolute; LPITEMIDLIST pidlPrograms; CComPtr<IShellFolder> psfPrograms; @@ -410,10 +411,10 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - WCHAR name[] = L"Programs"; - hr = psf->ParseDisplayName(NULL, NULL, name, NULL, &pidlPrograms, NULL); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); + + pidlPrograms = ILClone(ILFindLastID(pidlProgramsAbsolute)); + ILFree(pidlProgramsAbsolute); hr = psf->BindToObject(pidlPrograms, NULL, IID_PPV_ARG(IShellFolder, &psfPrograms)); if (FAILED_UNEXPECTEDLY(hr))

1 0

[dquintana] 63710: [RSHELL] * Notify the parent menu popup when the deskbar is closing. [EXPLORER-NEW] * Set the button pressed when the start menu gets displayed. * Set the button released when th...
by dquintana＠svn.reactos.org 12 Jul '14

12 Jul '14

Author: dquintana Date: Sat Jul 12 02:43:06 2014 New Revision: 63710 URL: http://svn.reactos.org/svn/reactos?rev=63710&view=rev Log: [RSHELL] * Notify the parent menu popup when the deskbar is closing. [EXPLORER-NEW] * Set the button pressed when the start menu gets displayed. * Set the button released when the start menu notifies it was closed. Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h branches/shell-experiments/base/shell/explorer-new/startmnu.c branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] Sat Jul 12 02:43:06 2014 @@ -455,4 +455,7 @@ CreateTaskSwitchWnd(IN HWND hWndParent, IN OUT ITrayWindow *Tray); +HRESULT +Tray_OnStartMenuDismissed(); + #endif /* _EXPLORER_PRECOMP__H_ */ Modified: branches/shell-experiments/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] Sat Jul 12 02:43:06 2014 @@ -291,6 +291,7 @@ static const IServiceProviderVtbl IServiceProviderImpl_Vtbl; static const ITrayPrivVtbl ITrayPrivImpl_Vtbl; static const IOleCommandTargetVtbl IOleCommandTargetImpl_Vtbl; +static const IMenuPopupVtbl IMenuPopupImpl_Vtbl; typedef struct { @@ -298,9 +299,12 @@ const IServiceProviderVtbl *lpServiceProviderVtbl; const ITrayPrivVtbl *lpStartMenuCallbackVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; + const IMenuPopupVtbl *lpMenuPopupVtbl; LONG Ref; ITrayWindow *Tray; + + IMenuPopup * StartMenuPopup; } IStartMenuSiteImpl; static IUnknown * @@ -313,6 +317,8 @@ IMPL_CASTS(IServiceProvider, IStartMenuSite, lpServiceProviderVtbl) IMPL_CASTS(ITrayPriv, IStartMenuSite, lpStartMenuCallbackVtbl) IMPL_CASTS(IOleCommandTarget, IStartMenuSite, lpOleCommandTargetVtbl) +IMPL_CASTS(IDeskBar, IStartMenuSite, lpMenuPopupVtbl) +IMPL_CASTS(IMenuPopup, IStartMenuSite, lpMenuPopupVtbl) /*******************************************************************/ @@ -379,6 +385,16 @@ &IID_IOleCommandTarget)) { *ppvObj = IOleCommandTarget_from_IStartMenuSiteImpl(This); + } + else if (IsEqualIID(riid, + &IID_IDeskBar)) + { + *ppvObj = IDeskBar_from_IStartMenuSiteImpl(This); + } + else if (IsEqualIID(riid, + &IID_IMenuPopup)) + { + *ppvObj = IMenuPopup_from_IStartMenuSiteImpl(This); } else { @@ -776,6 +792,89 @@ /*******************************************************************/ +METHOD_IUNKNOWN_INHERITED_ADDREF(IMenuPopup, IStartMenuSite) +METHOD_IUNKNOWN_INHERITED_RELEASE(IMenuPopup, IStartMenuSite) +METHOD_IUNKNOWN_INHERITED_QUERYINTERFACE(IMenuPopup, IStartMenuSite) + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_IMenuPopup_GetWindow(IN OUT IMenuPopup *iface, OUT HWND *phwnd) +{ + IStartMenuSiteImpl * This = IStartMenuSiteImpl_from_IMenuPopup(iface); + ITrayPriv * tp = ITrayPriv_from_IStartMenuSiteImpl(This); + return IStartMenuSiteImpl_GetWindow(tp, phwnd); +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_IMenuPopup_ContextSensitiveHelp(IN OUT IMenuPopup *iface, IN BOOL fEnterMode) +{ + IStartMenuSiteImpl * This = IStartMenuSiteImpl_from_IMenuPopup(iface); + ITrayPriv * tp = ITrayPriv_from_IStartMenuSiteImpl(This); + return IStartMenuSiteImpl_ContextSensitiveHelp(tp, fEnterMode); +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_SetClient(IN OUT IMenuPopup *iface, IUnknown *punkClient) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_GetClient(IN OUT IMenuPopup *iface, IUnknown ** ppunkClient) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_OnPosRectChangeDB(IN OUT IMenuPopup *iface, RECT *prc) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_Popup(IN OUT IMenuPopup *iface, POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_OnSelect(IN OUT IMenuPopup *iface, DWORD dwSelectType) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IStartMenuSiteImpl_SetSubMenu(IN OUT IMenuPopup *iface, IMenuPopup *pmp, BOOL fSet) +{ + if (!fSet) + { + return Tray_OnStartMenuDismissed(); + } + + return S_OK; +} + +static const IMenuPopupVtbl IMenuPopupImpl_Vtbl = +{ + /*** IUnknown methods ***/ + METHOD_IUNKNOWN_INHERITED_QUERYINTERFACE_NAME(IMenuPopup, IStartMenuSite), + METHOD_IUNKNOWN_INHERITED_ADDREF_NAME(IMenuPopup, IStartMenuSite), + METHOD_IUNKNOWN_INHERITED_RELEASE_NAME(IMenuPopup, IStartMenuSite), + /*** IOleWindow methods ***/ + IStartMenuSiteImpl_IMenuPopup_GetWindow, + IStartMenuSiteImpl_IMenuPopup_ContextSensitiveHelp, + /*** IDeskBar methods ***/ + IStartMenuSiteImpl_SetClient, + IStartMenuSiteImpl_GetClient, + IStartMenuSiteImpl_OnPosRectChangeDB, + /*** IMenuPopup ***/ + IStartMenuSiteImpl_Popup, + IStartMenuSiteImpl_OnSelect, + IStartMenuSiteImpl_SetSubMenu +}; + + +/*******************************************************************/ + static IStartMenuSiteImpl* IStartMenuSiteImpl_Construct(IN ITrayWindow *Tray) { @@ -791,6 +890,7 @@ This->lpServiceProviderVtbl = &IServiceProviderImpl_Vtbl; This->lpStartMenuCallbackVtbl = &ITrayPrivImpl_Vtbl; This->lpOleCommandTargetVtbl = &IOleCommandTargetImpl_Vtbl; + This->lpMenuPopupVtbl = &IMenuPopupImpl_Vtbl; This->Ref = 1; This->Tray = Tray; Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Jul 12 02:43:06 2014 @@ -101,6 +101,8 @@ HDPA hdpaShellServices; } ITrayWindowImpl; +static ITrayWindowImpl * g_TrayWindow; + BOOL LaunchCPanel(HWND hwnd, LPCTSTR applet) { TCHAR szParams[MAX_PATH]; @@ -2122,6 +2124,8 @@ &pt, &rcExclude, dwFlags); + + SendMessageW(This->hwndStart, BM_SETSTATE, TRUE, 0); } } } @@ -2870,6 +2874,8 @@ ITrayWindowImpl_Open(TrayWindow); + g_TrayWindow = This; + return TrayWindow; } @@ -3040,3 +3046,16 @@ ITrayWindowImpl_IShellDesktopTray_RegisterDesktopWindow, ITrayWindowImpl_IShellDesktopTray_Unknown }; + +HRESULT +ITrayWindowImpl_RaiseStartButton(ITrayWindowImpl * This) +{ + SendMessageW(This->hwndStart, BM_SETSTATE, FALSE, 0); + return S_OK; +} + +HRESULT +Tray_OnStartMenuDismissed() +{ + return ITrayWindowImpl_RaiseStartButton(g_TrayWindow); +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sat Jul 12 02:43:06 2014 @@ -495,6 +495,11 @@ m_Shown = false; + if (m_SubMenuParent) + { + m_SubMenuParent->SetSubMenu(this, FALSE); + } + if (m_SubMenuChild) { hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL);

1 0

[dquintana] 63709: [RSHELL] * Really fix GCC build.
by dquintana＠svn.reactos.org 10 Jul '14

10 Jul '14

Author: dquintana Date: Thu Jul 10 19:16:21 2014 New Revision: 63709 URL: http://svn.reactos.org/svn/reactos?rev=63709&view=rev Log: [RSHELL] * Really fix GCC build. Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/rshell.spec Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Thu Jul 10 19:16:21 2014 @@ -111,7 +111,7 @@ m_UserLocalFolder = userLocal; m_AllUSersFolder = allUSers; - TRACE("SetSources %p %p\n", m_UserLocalFolder, m_AllUSersFolder); + TRACE("SetSources %p %p\n", userLocal, allUSers); return S_OK; } @@ -397,7 +397,7 @@ return E_NOTIMPL; } - TRACE("AddNameSpace %p %p\n", m_UserLocal, m_AllUSers); + TRACE("AddNameSpace %p %p\n", m_UserLocal.p, m_AllUSers.p); // FIXME: Use a DSA to store the list of merged namespaces, together with their related info (psf, pidl, ...) // For now, assume only 2 will ever be used, and ignore all the other data. Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] Thu Jul 10 19:16:21 2014 @@ -19,9 +19,9 @@ */ #pragma once -static IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; -static IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; -static CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; +extern IID IID_IAugmentedShellFolder; +extern IID IID_IAugmentedShellFolder2; +extern CLSID CLSID_MergedFolder; interface IAugmentedShellFolder : public IShellFolder { Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Thu Jul 10 19:16:21 2014 @@ -20,6 +20,10 @@ #include "precomp.h" #include "CMergedFolder.h" + +IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; +IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; +CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; //#define TEST_TRACKPOPUPMENU_SUBMENUS @@ -406,7 +410,8 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = psf->ParseDisplayName(NULL, NULL, L"Programs", NULL, &pidlPrograms, NULL); + WCHAR name[] = L"Programs"; + hr = psf->ParseDisplayName(NULL, NULL, name, NULL, &pidlPrograms, NULL); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] Thu Jul 10 19:16:21 2014 @@ -2,4 +2,4 @@ @ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr); -@ stdcall CMergedFolder_Constructor(ptr ptr ptr ptr) +@ stdcall CMergedFolder_Constructor(ptr ptr);

1 0

[dquintana] 63708: [RSHELL] * Use the IAugmentedShellFolder methods instead of the old constructor. [SHELL32] * Fix gcc compilation.
by dquintana＠svn.reactos.org 10 Jul '14

10 Jul '14

Author: dquintana Date: Thu Jul 10 17:17:36 2014 New Revision: 63708 URL: http://svn.reactos.org/svn/reactos?rev=63708&view=rev Log: [RSHELL] * Use the IAugmentedShellFolder methods instead of the old constructor. [SHELL32] * Fix gcc compilation. Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Thu Jul 10 17:17:36 2014 @@ -30,7 +30,6 @@ BOOL shared; IShellFolder * parent; LPITEMIDLIST pidl; - LPITEMIDLIST pidlCommon; }; class CEnumMergedFolder : @@ -41,8 +40,6 @@ private: CComPtr<IShellFolder> m_UserLocalFolder; CComPtr<IShellFolder> m_AllUSersFolder; - CComPtr<IEnumIDList> m_UserLocal; - CComPtr<IEnumIDList> m_AllUSers; HWND m_HwndOwner; SHCONTF m_Flags; @@ -83,8 +80,6 @@ CEnumMergedFolder::CEnumMergedFolder() : m_UserLocalFolder(NULL), m_AllUSersFolder(NULL), - m_UserLocal(NULL), - m_AllUSers(NULL), m_HwndOwner(NULL), m_Flags(0), m_hDsa(NULL), @@ -115,6 +110,8 @@ { m_UserLocalFolder = userLocal; m_AllUSersFolder = allUSers; + + TRACE("SetSources %p %p\n", m_UserLocalFolder, m_AllUSersFolder); return S_OK; } @@ -129,13 +126,15 @@ TRACE("Search conditions changed, recreating list...\n"); - hr = m_UserLocalFolder->EnumObjects(hwndOwner, flags, &m_UserLocal); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - hr = m_AllUSersFolder->EnumObjects(hwndOwner, flags, &m_AllUSers); - if (FAILED_UNEXPECTEDLY(hr)) - { - m_UserLocal = NULL; + CComPtr<IEnumIDList> userLocal; + CComPtr<IEnumIDList> allUSers; + hr = m_UserLocalFolder->EnumObjects(hwndOwner, flags, &userLocal); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = m_AllUSersFolder->EnumObjects(hwndOwner, flags, &allUSers); + if (FAILED_UNEXPECTEDLY(hr)) + { + userLocal = NULL; return hr; } @@ -159,7 +158,7 @@ { if (hr1 == S_OK) { - hr1 = m_UserLocal->Next(1, &pidl1, NULL); + hr1 = userLocal->Next(1, &pidl1, NULL); if (FAILED_UNEXPECTEDLY(hr1)) return hr1; } @@ -172,7 +171,7 @@ { if (hr2 == S_OK) { - hr2 = m_AllUSers->Next(1, &pidl2, NULL); + hr2 = allUSers->Next(1, &pidl2, NULL); if (FAILED_UNEXPECTEDLY(hr2)) return hr2; } @@ -197,19 +196,27 @@ StrRetToStrW(&str1, pidl1, &name1); StrRetToStrW(&str2, pidl2, &name2); order = StrCmpW(name1, name2); + + TRACE("Both sources are S_OK, comparison between %S and %S returns %d\n", name1, name2, order); + CoTaskMemFree(name1); CoTaskMemFree(name2); } else if (hr1 == S_OK) { order = -1; + + TRACE("Both sources are S_OK, forcing %d\n", order); } else if (hr2 == S_OK) { order = 1; + + TRACE("Both sources are S_OK, forcing %d\n", order); } else { + TRACE("None of the sources\n"); break; } @@ -347,7 +354,7 @@ // CMergedFolder extern "C" -HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv) { *ppv = NULL; @@ -357,8 +364,6 @@ return E_OUTOFMEMORY; HRESULT hr; - - hr = fld->_SetSources(userLocal, allUsers); hr = fld->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) @@ -371,27 +376,46 @@ m_UserLocal(NULL), m_AllUSers(NULL), m_EnumSource(NULL), + m_UserLocalPidl(NULL), + m_AllUsersPidl(NULL), m_shellPidl(NULL) { } CMergedFolder::~CMergedFolder() { -} - -HRESULT CMergedFolder::_SetSources(IShellFolder* userLocal, IShellFolder* allUsers) -{ - m_UserLocal = userLocal; - m_AllUSers = allUsers; + if (m_UserLocalPidl) ILFree(m_UserLocalPidl); + if (m_AllUsersPidl) ILFree(m_AllUsersPidl); +} + +// IAugmentedShellFolder2 +HRESULT STDMETHODCALLTYPE CMergedFolder::AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown) +{ + if (lpGuid) + { + TRACE("FIXME: No idea how to handle the GUID\n"); + return E_NOTIMPL; + } + + TRACE("AddNameSpace %p %p\n", m_UserLocal, m_AllUSers); + + // FIXME: Use a DSA to store the list of merged namespaces, together with their related info (psf, pidl, ...) + // For now, assume only 2 will ever be used, and ignore all the other data. + if (!m_UserLocal) + { + m_UserLocal = psf; + m_UserLocalPidl = ILClone(pcidl); + return S_OK; + } + + if (m_AllUSers) + return E_FAIL; + + m_AllUSers = psf; + m_AllUsersPidl = ILClone(pcidl); + m_EnumSource = new CComObject<CEnumMergedFolder>(); return m_EnumSource->SetSources(m_UserLocal, m_AllUSers); -} - -// IAugmentedShellFolder2 -HRESULT STDMETHODCALLTYPE CMergedFolder::AddNameSpace(LPGUID lpGuid, IShellFolder * psf, LPCITEMIDLIST pcidl, ULONG dwUnknown) -{ - UNIMPLEMENTED; - return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CMergedFolder::GetNameSpaceID(LPCITEMIDLIST pcidl, LPGUID lpGuid) @@ -429,26 +453,39 @@ { HRESULT hr; LocalPidlInfo info; + LPITEMIDLIST pidl; if (!ppidl) return E_FAIL; if (pchEaten) *pchEaten = 0; if (pdwAttributes) *pdwAttributes = 0; - hr = m_UserLocal->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + TRACE("ParseDisplayName name=%S\n", lpszDisplayName); + + hr = m_UserLocal->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, &pidl, pdwAttributes); if (SUCCEEDED(hr)) { - hr = m_EnumSource->FindPidlInList(hwndOwner, *ppidl, &info); + TRACE("ParseDisplayName result local\n"); + hr = m_EnumSource->FindPidlInList(hwndOwner, pidl, &info); if (SUCCEEDED(hr)) + { + ILFree(pidl); + *ppidl = ILClone(info.pidl); return hr; - } - - hr = m_AllUSers->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + } + } + + hr = m_AllUSers->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, pchEaten, &pidl, pdwAttributes); if (SUCCEEDED(hr)) { - hr = m_EnumSource->FindPidlInList(hwndOwner, *ppidl, &info); + TRACE("ParseDisplayName result common\n"); + hr = m_EnumSource->FindPidlInList(hwndOwner, pidl, &info); if (SUCCEEDED(hr)) + { + ILFree(pidl); + *ppidl = ILClone(info.pidl); return hr; + } } if (ppidl) *ppidl = NULL; @@ -477,12 +514,12 @@ { LocalPidlInfo info; HRESULT hr; - - TRACE("BindToObject\n"); - + hr = m_EnumSource->FindPidlInList(NULL, pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; + + TRACE("BindToObject shared = %d\n", info.shared); if (!info.shared) return info.parent->BindToObject(info.pidl, pbcReserved, riid, ppvOut); @@ -501,7 +538,24 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - return CMergedFolder_Constructor(fld1, fld2, riid, ppvOut); + CComPtr<IAugmentedShellFolder> pasf; + hr = CMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->QueryInterface(riid, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->AddNameSpace(NULL, fld1, info.pidl, 0xFF00); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->AddNameSpace(NULL, fld2, info.pidl, 0x0000); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return hr; } HRESULT STDMETHODCALLTYPE CMergedFolder::BindToStorage( Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] Thu Jul 10 17:17:36 2014 @@ -65,6 +65,8 @@ CComPtr<IShellFolder> m_AllUSers; CComPtr<CEnumMergedFolder> m_EnumSource; + LPITEMIDLIST m_UserLocalPidl; + LPITEMIDLIST m_AllUsersPidl; LPITEMIDLIST m_shellPidl; public: Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Thu Jul 10 17:17:36 2014 @@ -310,6 +310,9 @@ HRESULT hr; LPITEMIDLIST pidlUserStartMenu; LPITEMIDLIST pidlCommonStartMenu; + CComPtr<IShellFolder> psfUserStartMenu; + CComPtr<IShellFolder> psfCommonStartMenu; + CComPtr<IAugmentedShellFolder> pasf; *ppsfStartMenu = NULL; @@ -324,27 +327,22 @@ return hr; } - CComPtr<IShellFolder> psfUserStartMenu; hr = BindToDesktop(pidlUserStartMenu, &psfUserStartMenu); if (FAILED_UNEXPECTEDLY(hr)) return hr; - CComPtr<IShellFolder> psfCommonStartMenu; hr = BindToDesktop(pidlCommonStartMenu, &psfCommonStartMenu); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if CUSTOM_MERGE_FOLDERS - IShellFolder * psfMerged; - hr = CMergedFolder_Constructor(psfUserStartMenu, psfCommonStartMenu, IID_PPV_ARG(IShellFolder, &psfMerged)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; +#if 1 + hr = CMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); #else - CComPtr<IAugmentedShellFolder> pasf; hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); - if (FAILED_UNEXPECTEDLY(hr)) - { - hr = BindToDesktop(pidlUserStartMenu, ppsfStartMenu); +#endif + if (FAILED_UNEXPECTEDLY(hr)) + { + *ppsfStartMenu = psfUserStartMenu.Detach(); ILFree(pidlCommonStartMenu); ILFree(pidlUserStartMenu); return hr; @@ -360,7 +358,6 @@ hr = pasf->QueryInterface(IID_PPV_ARG(IShellFolder, ppsfStartMenu)); pasf.Release(); -#endif ILFree(pidlCommonStartMenu); ILFree(pidlUserStartMenu); Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Thu Jul 10 17:17:36 2014 @@ -71,7 +71,7 @@ extern "C" HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv); extern "C" HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv); extern "C" HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv); -extern "C" HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv); static __inline ULONG Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Thu Jul 10 17:17:36 2014 @@ -1675,7 +1675,7 @@ // FIXME: This needs to be freed somewhere (like in the destructor of the context menu) LPCITEMIDLIST *apidl2 = (LPCITEMIDLIST *) SHAlloc(sizeof(LPCITEMIDLIST) * cidl); - for (int i = 0; i < cidl; i++) + for (int i = 0; i < (int)cidl; i++) { apidl2[i] = apidl[i]; }

1 0

[jgardou] 63707: [NTOS/CM] - Fix overzealous check
by jgardou＠svn.reactos.org 10 Jul '14

10 Jul '14

Author: jgardou Date: Thu Jul 10 09:43:30 2014 New Revision: 63707 URL: http://svn.reactos.org/svn/reactos?rev=63707&view=rev Log: [NTOS/CM] - Fix overzealous check Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Thu Jul 10 09:43:30 2014 @@ -625,8 +625,8 @@ PreviousMode = ExGetPreviousMode(); - if (Data && !DataSize) - return STATUS_INVALID_PARAMETER; + if (!DataSize) + Data = NULL; /* Probe and copy the data */ if ((PreviousMode != KernelMode) && Data)

1 0

[jgardou] 63706: [APPWIZ] - Expand the registry entry when installing gecko package from disk. Now unattended setup can really be unattended.
by jgardou＠svn.reactos.org 10 Jul '14

10 Jul '14

Author: jgardou Date: Thu Jul 10 09:05:43 2014 New Revision: 63706 URL: http://svn.reactos.org/svn/reactos?rev=63706&view=rev Log: [APPWIZ] - Expand the registry entry when installing gecko package from disk. Now unattended setup can really be unattended. Modified: trunk/reactos/dll/cpl/appwiz/addons.c Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Thu Jul 10 09:05:43 2014 @@ -214,6 +214,18 @@ return INSTALL_FAILED; } + if (type == REG_EXPAND_SZ) + { + size = ExpandEnvironmentStringsA(package_dir, NULL, 0); + if (size) + { + char* buf = heap_alloc(size + sizeof(addon->file_name)); + ExpandEnvironmentStringsA(package_dir, buf, size); + heap_free(package_dir); + package_dir = buf; + } + } + TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); ret = install_from_unix_file(package_dir, "", addon->file_name);

1 0

[jgardou] 63705: [NTOSKRNL] - Partial revert of r63700 on Alex's request - This cancels the "Use ZwSetValueKey" instead of NtSetValueKey" part Oddly enough, it doesn't cause a problem anymore. I mu...
by jgardou＠svn.reactos.org 10 Jul '14

10 Jul '14

Author: jgardou Date: Thu Jul 10 09:05:37 2014 New Revision: 63705 URL: http://svn.reactos.org/svn/reactos?rev=63705&view=rev Log: [NTOSKRNL] - Partial revert of r63700 on Alex's request - This cancels the "Use ZwSetValueKey" instead of NtSetValueKey" part Oddly enough, it doesn't cause a problem anymore. I must have messed up in my initial testings Modified: trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -97,7 +97,7 @@ /* Setup the component information key */ RtlInitUnicodeString(&ValueName, L"Component Information"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -124,7 +124,7 @@ if (NT_SUCCESS(Status)) { /* Save the identifier in the registry */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -178,7 +178,7 @@ CmpConfigurationData->BusNumber = BusNumber; /* Save the actual data */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_FULL_RESOURCE_DESCRIPTOR, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -416,7 +416,7 @@ /* Key opened, now write to the key */ RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -427,7 +427,7 @@ /* Setup value name for system boot device in ARC format */ RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &KeyName, 0, REG_SZ, @@ -474,7 +474,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ @@ -488,17 +488,16 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&KeyHandle, + Status = NtCreateKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, &Disposition); - if (!NT_SUCCESS(Status)) - return Status; - - /* We don't need the handle */ + if (!NT_SUCCESS(Status)) return Status; + + /* Don't need the handle */ ZwClose(KeyHandle); /* Use hard-coded setting */ @@ -534,7 +533,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&KeyHandle, + Status = NtCreateKey(&KeyHandle, KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -558,7 +557,7 @@ Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); /* Set the value */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -573,7 +572,7 @@ KeyHandle, NULL); Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); - ZwClose(KeyHandle); + NtClose(KeyHandle); /* Check if we don't have one */ if (!NT_SUCCESS(Status)) @@ -690,7 +689,7 @@ ASSERT(STATUS_SUCCESS == Status); /* Set it */ - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, @@ -2181,7 +2180,7 @@ RtlInitUnicodeString(&ValueData, Buffer); - ZwSetValueKey(CurrentVersionKeyHandle, + NtSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, REG_SZ, Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -268,7 +268,7 @@ /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - ZwSetValueKey(KeyHandle, + NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -463,7 +463,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -486,7 +486,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -502,7 +502,7 @@ { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -515,7 +515,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -528,7 +528,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -621,7 +621,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -643,7 +643,7 @@ if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = ZwSetValueKey(BiosHandle, + Status = NtSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -703,7 +703,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -746,7 +746,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -801,7 +801,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -267,7 +267,7 @@ /* Set the value */ RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - ZwSetValueKey(KeyHandle, + NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -465,7 +465,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -488,7 +488,7 @@ /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, @@ -504,7 +504,7 @@ { /* Add them to the registry */ RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -517,7 +517,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_DWORD, @@ -530,7 +530,7 @@ { /* Add it to the registry */ RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = ZwSetValueKey(KeyHandle, + Status = NtSetValueKey(KeyHandle, &ValueName, 0, REG_BINARY, @@ -623,7 +623,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -645,7 +645,7 @@ if (NT_SUCCESS(Status)) { /* Save it to the registry */ - Status = ZwSetValueKey(BiosHandle, + Status = NtSetValueKey(BiosHandle, &ValueName, 0, REG_SZ, @@ -705,7 +705,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, @@ -749,7 +749,7 @@ /* Write the date into the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_SZ, @@ -804,7 +804,7 @@ /* Write the BIOS Version to the registry */ RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = ZwSetValueKey(SystemHandle, + Status = NtSetValueKey(SystemHandle, &ValueName, 0, REG_MULTI_SZ, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=637… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -1853,7 +1853,7 @@ { /* Write the safe boot type */ RtlInitUnicodeString(&KeyName, L"OptionValue"); - ZwSetValueKey(OptionHandle, + NtSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, @@ -1866,7 +1866,7 @@ /* Remember this for later */ Disposition = TRUE; RtlInitUnicodeString(&KeyName, L"UseAlternateShell"); - ZwSetValueKey(OptionHandle, + NtSetValueKey(OptionHandle, &KeyName, 0, REG_DWORD, Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] Thu Jul 10 09:05:37 2014 @@ -135,7 +135,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); } else {

1 0

[dquintana] 63704: [RSHELL] * Filter out the Programs item from the top list.
by dquintana＠svn.reactos.org 09 Jul '14

09 Jul '14

Author: dquintana Date: Wed Jul 9 23:37:02 2014 New Revision: 63704 URL: http://svn.reactos.org/svn/reactos?rev=63704&view=rev Log: [RSHELL] * Filter out the Programs item from the top list. Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Jul 9 23:37:02 2014 @@ -1285,29 +1285,37 @@ INT index = 0; INT indexOpen = 0; - STRRET sr = { STRRET_CSTR, { 0 } }; - - hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - StrRetToStr(&sr, NULL, &MenuString); - - index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); - - LPCITEMIDLIST itemc = item; - - SFGAOF attrs = SFGAO_FOLDER; - hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs); - - DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); - - // Fetch next item already, so we know if the current one is the last - hr = eidl->Next(1, &item, NULL); - - AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData, hr != S_OK); - - CoTaskMemFree(MenuString); + if (m_menuBand->_CallCBWithItemPidl(item, 0x10000000, 0, 0) == S_OK) + { + STRRET sr = { STRRET_CSTR, { 0 } }; + + hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + StrRetToStr(&sr, NULL, &MenuString); + + index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); + + LPCITEMIDLIST itemc = item; + + SFGAOF attrs = SFGAO_FOLDER; + hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs); + + DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); + + // Fetch next item already, so we know if the current one is the last + hr = eidl->Next(1, &item, NULL); + + AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData, hr != S_OK); + + CoTaskMemFree(MenuString); + } + else + { + // Fetch next item here also + hr = eidl->Next(1, &item, NULL); + } } ILFree(item); Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Jul 9 23:37:02 2014 @@ -65,7 +65,9 @@ CComPtr<IBandSite> m_pBandSite; CComPtr<IDeskBar> m_pDeskBar; CComPtr<ITrayPriv> m_pTrayPriv; - CComPtr<IShellFolder> m_programsFolder; + CComPtr<IShellFolder> m_psfPrograms; + + LPITEMIDLIST m_pidlPrograms; HRESULT OnInitMenu() { @@ -161,9 +163,9 @@ { IShellFolder *psfStartMenu; - if (csidl == CSIDL_PROGRAMS && m_programsFolder) + if (csidl == CSIDL_PROGRAMS && m_psfPrograms) { - psfStartMenu = m_programsFolder; + psfStartMenu = m_psfPrograms; } else { @@ -251,9 +253,10 @@ m_pDeskBar.Release(); } - HRESULT _SetProgramsFolder(IShellFolder * programs) - { - m_programsFolder = programs; + HRESULT _SetProgramsFolder(IShellFolder * psf, LPITEMIDLIST pidl) + { + m_psfPrograms = psf; + m_pidlPrograms = pidl; return S_OK; } @@ -276,6 +279,10 @@ case SMC_SFEXEC: m_pTrayPriv->Execute(psmd->psf, psmd->pidlItem); break; + case 0x10000000: // _FilterPIDL from CMenuSFToolbar + if (psmd->psf->CompareIDs(0, psmd->pidlItem, m_pidlPrograms) == 0) + return S_FALSE; + return S_OK; } return S_FALSE; @@ -312,9 +319,9 @@ if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_STARTMENU, &pidlCommonStartMenu))) { - BindToDesktop(pidlUserStartMenu, ppsfStartMenu); + hr = BindToDesktop(pidlUserStartMenu, ppsfStartMenu); ILFree(pidlUserStartMenu); - return S_OK; + return hr; } CComPtr<IShellFolder> psfUserStartMenu; @@ -337,10 +344,10 @@ hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { - BindToDesktop(pidlUserStartMenu, ppsfStartMenu); + hr = BindToDesktop(pidlUserStartMenu, ppsfStartMenu); ILFree(pidlCommonStartMenu); ILFree(pidlUserStartMenu); - return S_OK; + return hr; } hr = pasf->AddNameSpace(NULL, psfUserStartMenu, pidlUserStartMenu, 0xFF00); @@ -410,7 +417,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = pCallback->_SetProgramsFolder(psfPrograms); + hr = pCallback->_SetProgramsFolder(psfPrograms, pidlPrograms); if (FAILED_UNEXPECTEDLY(hr)) return hr;

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