Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 68731: [SHELL32] -Fix build
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 11:46:22 2015 New Revision: 68731 URL: http://svn.reactos.org/svn/reactos?rev=68731&view=rev Log: [SHELL32] -Fix build Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 17 11:46:22 2015 @@ -398,7 +398,7 @@ } else { - DPRINT1("Got and unknown pidl!\n"); + ERR("Got and unknown pidl!\n"); } } else

1 0

[gadamopoulos] 68730: [SHELL32] - Use SHELL32_GetGuidItemAttributes, SHELL32_GetFSItemAttributes, SHELL32_BindToGuidItem and SHELL32_GetDisplayNameOfGUIDItem in CControlPanelFolder, CDrivesFolder a...
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 11:41:15 2015 New Revision: 68730 URL: http://svn.reactos.org/svn/reactos?rev=68730&view=rev Log: [SHELL32] - Use SHELL32_GetGuidItemAttributes, SHELL32_GetFSItemAttributes, SHELL32_BindToGuidItem and SHELL32_GetDisplayNameOfGUIDItem in CControlPanelFolder, CDrivesFolder and CFSFolder instead of using functions that accept all sorts of pidl types. Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -388,9 +388,7 @@ REFIID riid, LPVOID *ppvOut) { - TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); - - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); } /************************************************************************** @@ -484,7 +482,7 @@ if (_ILIsCPanelStruct(*apidl)) *rgfInOut &= SFGAO_CANLINK; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + SHELL32_GetGuidItemAttributes(this, *apidl, rgfInOut); else ERR("Got an unkown pidl here!\n"); apidl++; @@ -574,69 +572,24 @@ */ HRESULT WINAPI CControlPanelFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - CHAR szName[MAX_PATH]; - WCHAR wszName[MAX_PATH+1]; /* +1 for potential backslash */ - PIDLCPanelStruct *pCPanel; - HRESULT hr; - - *szName = '\0'; - - TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump(pidl); - if (!pidl) return S_FALSE; - pCPanel = _ILGetCPanelPointer(pidl); + PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(pidl); if (pCPanel) { /* copy display name from pidl - it was retrived from applet before; SHGDN_FORPARSING does not need special handling */ - lstrcpyA(szName, pCPanel->szName + pCPanel->offsDispName); - } - /* take names of special folders only if it's only this folder */ + strRet->uType = STRRET_CSTR; + lstrcpyA(strRet->cStr, pCPanel->szName + pCPanel->offsDispName); + } else if (_ILIsSpecialFolder(pidl)) { - BOOL bSimplePidl = _ILIsPidlSimple(pidl); - SFGAOF Attr = SFGAO_FILESYSTEM; - - SHELL32_GetItemAttributes(this, pidl, &Attr); - if (Attr & SFGAO_FILESYSTEM) - { - hr = SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszName, sizeof(wszName)); - if (FAILED(hr)) - return hr; - } - else if (bSimplePidl) - { - _ILSimpleGetTextW(pidl, wszName, MAX_PATH); /* append my own path */ - } - else - { - FIXME("special pidl\n"); - if (dwFlags & SHGDN_FORPARSING) - { - /* go deeper if needed */ - int cchName; - - PathAddBackslashW(wszName); - cchName = wcslen(wszName); - - hr = SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, wszName + cchName, MAX_PATH + 1 - cchName); - if (FAILED(hr)) - return hr; - } - } - - if (!WideCharToMultiByte(CP_ACP, 0, wszName, -1, szName, MAX_PATH, NULL, NULL)) - szName[0] = '\0'; - } - - strRet->uType = STRRET_CSTR; - lstrcpynA(strRet->cStr, szName, MAX_PATH); - - TRACE("--(%p)->(%s)\n", this, szName); + static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"; + return SHELL32_GetDisplayNameOfGUIDItem(this, pszCPanelPath, pidl, dwFlags, strRet); + } + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -263,6 +263,9 @@ TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); + if (_ILIsSpecialFolder(pidl)) + return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); + return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); } @@ -376,7 +379,7 @@ else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); + SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut); else ERR("Got unknown pidl type!\n"); } @@ -493,91 +496,10 @@ } else if (_ILIsPidlSimple(pidl)) { - /* take names of special folders only if its only this folder */ if (_ILIsSpecialFolder(pidl)) - { - GUID const *clsid; - - clsid = _ILGetGUIDPointer (pidl); - if (clsid) - { - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) - { - static const WCHAR clsidW[] = L"CLSID\\"; - static const WCHAR shellfolderW[] = L"\\shellfolder"; - static const WCHAR wantsForParsingW[] = L"WantsForParsing"; - BOOL bWantsForParsing = FALSE; - WCHAR szRegPath[100]; - LONG r; - - /* - * We can only get a filesystem path from a shellfolder - * if the value WantsFORPARSING exists in - * CLSID\\{...}\\shellfolder - * exception: the MyComputer folder has this keys not - * but like any filesystem backed - * folder it needs these behaviour - * - * Get the "WantsFORPARSING" flag from the registry - */ - - wcscpy(szRegPath, clsidW); - SHELL32_GUIDToStringW(*clsid, &szRegPath[6]); - wcscat(szRegPath, shellfolderW); - r = SHGetValueW(HKEY_CLASSES_ROOT, szRegPath, - wantsForParsingW, NULL, NULL, NULL); - if (r == ERROR_SUCCESS) - bWantsForParsing = TRUE; - - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - bWantsForParsing) - { - /* - * We need the filesystem path to the destination folder - * Only the folder itself can know it - */ - hr = SHELL32_GetDisplayNameOfChild (this, pidl, - dwFlags, pszPath, MAX_PATH); - } - else - { - LPWSTR p = pszPath; - - /* parsing name like ::{...} */ - p[0] = ':'; - p[1] = ':'; - p += 2; - p += SHELL32_GUIDToStringW(CLSID_MyComputer, p); - - /* \:: */ - p[0] = '\\'; - p[1] = ':'; - p[2] = ':'; - p += 3; - SHELL32_GUIDToStringW(*clsid, p); - } - } - else - { - /* user friendly name */ - - if (_ILIsMyComputer(pidl) && sName) - wcscpy(pszPath, sName); - else - HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); - - TRACE("pszPath %s\n", debugstr_w(pszPath)); - } - } - else - { - /* append my own path */ - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); - } - } + return SHELL32_GetDisplayNameOfGUIDItem(this, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", pidl, dwFlags, strRet); else if (_ILIsDrive(pidl)) { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 17 11:41:15 2015 @@ -233,7 +233,7 @@ { /* it's the last element */ if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes(this, pidlTemp, pdwAttributes); + hr = SHELL32_GetFSItemAttributes(this, pidlTemp, pdwAttributes); } } } @@ -369,12 +369,6 @@ PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; - static const DWORD dwDriveAttributes = - SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | - SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; - - TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, - rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) return E_INVALIDARG; @@ -386,20 +380,25 @@ if(cidl == 0) { - IShellFolder *psfParent = NULL; - LPCITEMIDLIST rpidl = NULL; - - hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), &rpidl); - if(SUCCEEDED(hr)) - { - if (_ILIsDrive(rpidl)) - *rgfInOut &= dwDriveAttributes; - if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) - SHELL32_GetItemAttributes(this, rpidl, rgfInOut); - else - ERR("Got an unknown type of pidl!!!\n"); - - psfParent->Release(); + LPCITEMIDLIST rpidl = ILFindLastID(pidlRoot); + + if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) + { + SHELL32_GetFSItemAttributes(this, rpidl, rgfInOut); + } + else if (_ILIsDrive(rpidl)) + { + IShellFolder *psfParent = NULL; + hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), NULL); + if(SUCCEEDED(hr)) + { + hr = psfParent->GetAttributesOf(1, &rpidl, (SFGAOF*)rgfInOut); + psfParent->Release(); + } + } + else + { + DPRINT1("Got and unknown pidl!\n"); } } else @@ -408,7 +407,7 @@ { pdump(*apidl); if(_ILIsFolder(*apidl) || _ILIsValue(*apidl)) - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + SHELL32_GetFSItemAttributes(this, *apidl, rgfInOut); else ERR("Got an unknown type of pidl!!!\n"); apidl++;

1 0

[gadamopoulos] 68729: [SHELL32] - Split SHELL32_GetItemAttributes to SHELL32_GetGuidItemAttributes and SHELL32_GetFSItemAttributes. - Add a couple helper functions that will reduce code duplication...
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 11:36:56 2015 New Revision: 68729 URL: http://svn.reactos.org/svn/reactos?rev=68729&view=rev Log: [SHELL32] - Split SHELL32_GetItemAttributes to SHELL32_GetGuidItemAttributes and SHELL32_GetFSItemAttributes. - Add a couple helper functions that will reduce code duplication in folders with reg items: SHELL32_BindToGuidItem, SHELL32_GetDisplayNameOfGUIDItem Modified: trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/dll/win32/shell32/wine/classes.c Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Mon Aug 17 11:36:56 2015 @@ -52,6 +52,21 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); +HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, + PCUIDLIST_RELATIVE pidl, + LPBC pbcReserved, + REFIID riid, + LPVOID *ppvOut); + +HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); + +HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); + +HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + +extern "C" +BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Aug 17 11:36:56 2015 @@ -330,6 +330,45 @@ return hr; } +HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, + PCUIDLIST_RELATIVE pidl, + LPBC pbcReserved, + REFIID riid, + LPVOID *ppvOut) +{ + CComPtr<IPersistFolder> pFolder; + HRESULT hr; + + GUID *pGUID = _ILGetGUIDPointer(pidl); + if (!pGUID) + { + ERR("SHELL32_BindToGuidItem called for non guid item!\n"); + return E_FAIL; + } + + hr = SHCoCreateInstance(NULL, pGUID, NULL, IID_PPV_ARG(IPersistFolder, &pFolder)); + if (FAILED(hr)) + return hr; + + hr = pFolder->Initialize(ILCombine(pidlRoot, pidl)); + if (FAILED(hr)) + return hr; + + if (_ILIsPidlSimple (pidl)) + { + return pFolder->QueryInterface(riid, ppvOut); + } + else + { + CComPtr<IShellFolder> psf; + hr = pFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED(hr)) + return hr; + + return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); + } +} + /*********************************************************************** * SHELL32_GetDisplayNameOfChild * @@ -376,6 +415,85 @@ hr = E_OUTOFMEMORY; TRACE ("-- ret=0x%08x %s\n", hr, debugstr_w(szOut)); + + return hr; +} + +HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) +{ + HRESULT hr = S_OK; + GUID const *clsid = _ILGetGUIDPointer (pidl); + + if (!strRet) + return E_INVALIDARG; + + LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) + { + int bWantsForParsing; + + /* + * We can only get a filesystem path from a shellfolder if the + * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. + * + * Exception: The MyComputer folder doesn't have this key, + * but any other filesystem backed folder it needs it. + */ + if (IsEqualIID (*clsid, CLSID_MyComputer)) + { + bWantsForParsing = TRUE; + } + else + { + HKEY hkeyClass; + if (HCR_RegOpenClassIDKey(*clsid, &hkeyClass)) + { + LONG res = SHGetValueW(hkeyClass, L"Shellfolder", L"WantsForParsing", NULL, NULL, NULL); + bWantsForParsing = (res == ERROR_SUCCESS); + RegCloseKey(hkeyClass); + } + } + + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + bWantsForParsing) + { + /* + * we need the filesystem path to the destination folder. + * Only the folder itself can know it + */ + hr = SHELL32_GetDisplayNameOfChild (psf, pidl, dwFlags, + pszPath, + MAX_PATH); + } + else + { + wcscpy(pszPath, pszFolderPath); + PWCHAR pItemName = &pszPath[wcslen(pszPath)]; + + /* parsing name like ::{...} */ + pItemName[0] = ':'; + pItemName[1] = ':'; + SHELL32_GUIDToStringW (*clsid, &pItemName[2]); + } + } + else + { + /* user friendly name */ + HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); + } + + if (SUCCEEDED(hr)) + { + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszPath; + } + else + { + CoTaskMemFree(pszPath); + } return hr; } @@ -399,27 +517,31 @@ * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) -{ - DWORD dwAttributes; - BOOL has_guid; - static const DWORD dwSupportedAttr= - SFGAO_CANCOPY | /*0x00000001 */ - SFGAO_CANMOVE | /*0x00000002 */ - SFGAO_CANLINK | /*0x00000004 */ - SFGAO_CANRENAME | /*0x00000010 */ - SFGAO_CANDELETE | /*0x00000020 */ - SFGAO_HASPROPSHEET | /*0x00000040 */ - SFGAO_DROPTARGET | /*0x00000100 */ - SFGAO_LINK | /*0x00010000 */ - SFGAO_READONLY | /*0x00040000 */ - SFGAO_HIDDEN | /*0x00080000 */ - SFGAO_FILESYSANCESTOR | /*0x10000000 */ - SFGAO_FOLDER | /*0x20000000 */ - SFGAO_FILESYSTEM | /*0x40000000 */ - SFGAO_HASSUBFOLDER; /*0x80000000 */ - - TRACE ("0x%08x\n", *pdwAttributes); + +static const DWORD dwSupportedAttr= + SFGAO_CANCOPY | /*0x00000001 */ + SFGAO_CANMOVE | /*0x00000002 */ + SFGAO_CANLINK | /*0x00000004 */ + SFGAO_CANRENAME | /*0x00000010 */ + SFGAO_CANDELETE | /*0x00000020 */ + SFGAO_HASPROPSHEET | /*0x00000040 */ + SFGAO_DROPTARGET | /*0x00000100 */ + SFGAO_LINK | /*0x00010000 */ + SFGAO_READONLY | /*0x00040000 */ + SFGAO_HIDDEN | /*0x00080000 */ + SFGAO_FILESYSANCESTOR | /*0x10000000 */ + SFGAO_FOLDER | /*0x20000000 */ + SFGAO_FILESYSTEM | /*0x40000000 */ + SFGAO_HASSUBFOLDER; /*0x80000000 */ + +HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + if (!_ILIsSpecialFolder(pidl)) + { + ERR("Got wrong type of pidl!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } if (*pdwAttributes & ~dwSupportedAttr) { @@ -427,79 +549,114 @@ *pdwAttributes &= dwSupportedAttr; } - has_guid = _ILGetGUIDPointer(pidl) != NULL; - - dwAttributes = *pdwAttributes; - - if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) - *pdwAttributes = dwAttributes; - else if (_ILGetDataPointer(pidl)) - { - dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); - - if (!dwAttributes && has_guid) - { - WCHAR path[MAX_PATH]; - STRRET strret; - - /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ - - HRESULT hr = psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strret); - - if (SUCCEEDED(hr)) + /* First try to get them from the registry */ + if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) + { + return S_OK; + } + else + { + /* If we can't get it from the registry we have to query the child */ + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + return psf2->GetAttributesOf(0, NULL, pdwAttributes); + } + } + + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; +} + +HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + DWORD dwAttributes; + + if (*pdwAttributes & ~dwSupportedAttr) + { + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + *pdwAttributes &= dwSupportedAttr; + } + + dwAttributes = _ILGetFileAttributes(pidl, NULL, 0); + if (!dwAttributes) + { + ERR("Got 0 attrs!\n"); + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; + } + + /* Set common attributes */ + *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; + + if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + } + else + *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + + if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) + *pdwAttributes |= SFGAO_HIDDEN; + else + *pdwAttributes &= ~SFGAO_HIDDEN; + + if (dwAttributes & FILE_ATTRIBUTE_READONLY) + *pdwAttributes |= SFGAO_READONLY; + else + *pdwAttributes &= ~SFGAO_READONLY; + + if (SFGAO_LINK & *pdwAttributes) + { + char ext[MAX_PATH]; + + if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) + *pdwAttributes &= ~SFGAO_LINK; + } + + if (SFGAO_HASSUBFOLDER & *pdwAttributes) + { + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + CComPtr<IEnumIDList> pEnumIL; + if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) { - hr = StrRetToBufW(&strret, pidl, path, MAX_PATH); - - /* call GetFileAttributes() only for file system paths, not for parsing names like "::{...}" */ - if (SUCCEEDED(hr) && path[0]!=':') - dwAttributes = GetFileAttributesW(path); + if (pEnumIL->Skip(1) != S_OK) + *pdwAttributes &= ~SFGAO_HASSUBFOLDER; } } - + } + + TRACE ("-- 0x%08x\n", *pdwAttributes); + return S_OK; +} + +HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + TRACE ("0x%08x\n", *pdwAttributes); + + if (*pdwAttributes & ~dwSupportedAttr) + { + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + *pdwAttributes &= dwSupportedAttr; + } + + if (_ILIsSpecialFolder(pidl)) + { + return SHELL32_GetGuidItemAttributes(psf, pidl, pdwAttributes); + } + else if(_ILIsFolder(pidl) || _ILIsValue(pidl)) + { + return SHELL32_GetFSItemAttributes(psf, pidl, pdwAttributes); + } + else + { /* Set common attributes */ - *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | - SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; - - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - } - else - *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); - - if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) - *pdwAttributes |= SFGAO_HIDDEN; - else - *pdwAttributes &= ~SFGAO_HIDDEN; - - if (dwAttributes & FILE_ATTRIBUTE_READONLY) - *pdwAttributes |= SFGAO_READONLY; - else - *pdwAttributes &= ~SFGAO_READONLY; - - if (SFGAO_LINK & *pdwAttributes) - { - char ext[MAX_PATH]; - - if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) - *pdwAttributes &= ~SFGAO_LINK; - } - - if (SFGAO_HASSUBFOLDER & *pdwAttributes) - { - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - CComPtr<IEnumIDList> pEnumIL; - if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) - { - if (pEnumIL->Skip(1) != S_OK) - *pdwAttributes &= ~SFGAO_HASSUBFOLDER; - } - } - } - } else - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; + ERR("We got a pidl that is neither a guid or an FS item!!! Type=0x%x\n",pidl->mkid.abID[0]); + *pdwAttributes &= SFGAO_CANLINK; + } TRACE ("-- 0x%08x\n", *pdwAttributes); return S_OK; Modified: trunk/reactos/dll/win32/shell32/wine/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cla… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/classes.c [iso-8859-1] Mon Aug 17 11:36:56 2015 @@ -222,7 +222,7 @@ * * Gets the icon for a filetype */ -static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) +BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) { char xriid[50]; sprintf( xriid, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",

1 0

[gadamopoulos] 68728: [SHELL32] - CAdminToolsFolder: return proper attributes when no items are specified. (This is fine for reg folders but doesn't work for fs folders). - CFontsFolder: fix GetAtt...
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 11:28:20 2015 New Revision: 68728 URL: http://svn.reactos.org/svn/reactos?rev=68728&view=rev Log: [SHELL32] - CAdminToolsFolder: return proper attributes when no items are specified. (This is fine for reg folders but doesn't work for fs folders). - CFontsFolder: fix GetAttributesOf as above. Fix Initialize method to return success. All shell folders should support this method. - CNetFolder: Return the name of the folder when asked. - CPrinterFolder: It doesn't have subfolders so it doesn't make sense to implement BindToObject. Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -114,7 +114,31 @@ HRESULT WINAPI CAdminToolsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { - return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + static const DWORD dwAdminToolsAttributes = + SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + + if(cidl) + { + return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + } + else + { + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwAdminToolsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; + } } HRESULT WINAPI CAdminToolsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, Modified: trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -111,7 +111,31 @@ HRESULT WINAPI CFontsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { - return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + static const DWORD dwFontsAttributes = + SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + + if(cidl) + { + return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); + } + else + { + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + *rgfInOut &= dwFontsAttributes; + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; + } } HRESULT WINAPI CFontsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, @@ -222,7 +246,7 @@ { TRACE ("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return S_OK; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -279,11 +279,30 @@ */ HRESULT WINAPI CNetFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - FIXME("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); - pdump(pidl); + LPWSTR pszName; + + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", this, pidl, dwFlags, strRet); + pdump (pidl); if (!strRet) return E_INVALIDARG; + + if (!pidl->mkid.cb) + { + pszName = (LPWSTR)CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + if (LoadStringW(shell32_hInstance, IDS_NETWORKPLACE, pszName, MAX_PATH)) + { + pszName[MAX_PATH-1] = L'\0'; + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszName; + return S_OK; + } + CoTaskMemFree(pszName); + return E_FAIL; + } return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Mon Aug 17 11:28:20 2015 @@ -370,10 +370,7 @@ */ HRESULT WINAPI CPrinterFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) { - TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, - pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return E_NOTIMPL; } /**************************************************************************

1 0

[gadamopoulos] 68727: [SHELL32] - Do not try to set the site of the context menu from the CDefView. This should be done elsewhere and should be the context menu callback.
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 11:22:11 2015 New Revision: 68727 URL: http://svn.reactos.org/svn/reactos?rev=68727&view=rev Log: [SHELL32] - Do not try to set the site of the context menu from the CDefView. This should be done elsewhere and should be the context menu callback. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Aug 17 11:22:11 2015 @@ -1223,10 +1223,6 @@ if (FAILED(hResult)) goto cleanup; - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; - hResult = m_pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); if (FAILED(hResult)) goto cleanup; @@ -1251,10 +1247,7 @@ DestroyMenu(hMenu); if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } return hResult; } @@ -1290,10 +1283,6 @@ if (FAILED( hResult)) goto cleanup; - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; - hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; @@ -1319,10 +1308,7 @@ cleanup: if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } if (hMenu) DestroyMenu(hMenu); @@ -1343,10 +1329,6 @@ hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); if (FAILED( hResult)) goto cleanup; - - hResult = IUnknown_SetSite(m_pCM, (IShellView *)this); - //if (FAILED( hResult)) - // goto cleanup; hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) @@ -1361,10 +1343,7 @@ cleanup: if (m_pCM) - { - IUnknown_SetSite(m_pCM, NULL); m_pCM.Release(); - } if (hMenu) DestroyMenu(hMenu);

1 0

[tfaber] 68726: [WININET] - Repair the ROS-Diff from r54992. Now we hopefully don't initialize the URL cache multiple times anymore.
by tfaber＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: tfaber Date: Mon Aug 17 08:14:24 2015 New Revision: 68726 URL: http://svn.reactos.org/svn/reactos?rev=68726&view=rev Log: [WININET] - Repair the ROS-Diff from r54992. Now we hopefully don't initialize the URL cache multiple times anymore. Modified: trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Aug 17 08:14:24 2015 @@ -804,6 +804,10 @@ cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); } + +#ifdef __REACTOS__ + bDefaultContainersAdded = TRUE; +#endif } static void cache_containers_free(void) @@ -823,9 +827,11 @@ if(!url) return ERROR_INVALID_PARAMETER; +#ifdef __REACTOS__ /* ReactOS r54992 */ if (!bDefaultContainersAdded) cache_containers_init(); +#endif LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { @@ -853,9 +859,11 @@ if (search_pattern && index > 0) return FALSE; +#ifdef __REACTOS__ /* ReactOS r54992 */ if (!bDefaultContainersAdded) cache_containers_init(); +#endif LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { @@ -4014,7 +4022,9 @@ return FALSE; } +#ifndef __REACTOS__ cache_containers_init(); +#endif return TRUE; } Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Mon Aug 17 08:14:24 2015 @@ -111,25 +111,50 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; -@@ -835,6 +823,10 @@ static DWORD cache_containers_find(const +@@ -816,6 +804,10 @@ static void cache_containers_init(void) + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, + DefaultContainerData[i].default_entry_type, wszMutexName); + } ++ ++#ifdef __REACTOS__ ++ bDefaultContainersAdded = TRUE; ++#endif + } + + static void cache_containers_free(void) +@@ -835,6 +827,12 @@ static DWORD cache_containers_find(const if(!url) return ERROR_INVALID_PARAMETER; ++#ifdef __REACTOS__ + /* ReactOS r54992 */ + if (!bDefaultContainersAdded) + cache_containers_init(); ++#endif + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { int prefix_len = strlen(container->cache_prefix); -@@ -861,6 +853,10 @@ static BOOL cache_containers_enum(char * +@@ -861,6 +859,12 @@ static BOOL cache_containers_enum(char * if (search_pattern && index > 0) return FALSE; ++#ifdef __REACTOS__ + /* ReactOS r54992 */ + if (!bDefaultContainersAdded) + cache_containers_init(); ++#endif + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { if (search_pattern) +@@ -4018,7 +4022,9 @@ BOOL init_urlcache(void) + return FALSE; + } + ++#ifndef __REACTOS__ + cache_containers_init(); ++#endif + return TRUE; + } +

1 0

[tfaber] 68725: [SHELL32] - Only complain about _OpenDirectory failing if it actually failed CORE-1171
by tfaber＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: tfaber Date: Mon Aug 17 08:03:02 2015 New Revision: 68725 URL: http://svn.reactos.org/svn/reactos?rev=68725&view=rev Log: [SHELL32] - Only complain about _OpenDirectory failing if it actually failed CORE-1171 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Mon Aug 17 08:03:02 2015 @@ -250,9 +250,18 @@ item->apidl[i].backBuffer = SHAlloc(BUFFER_SIZE); item->apidl[i].overlapped.hEvent = &item->apidl[i]; - if (fSources & SHCNRF_InterruptLevel && _OpenDirectory( &item->apidl[i] )) - QueueUserAPC(_AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); - else ERR("_OpenDirectory Failed\n"); + if (fSources & SHCNRF_InterruptLevel) + { + if (_OpenDirectory( &item->apidl[i] )) + QueueUserAPC( _AddDirectoryProc, m_hThread, (ULONG_PTR) &item->apidl[i] ); + else + { + CHAR buffer[MAX_PATH]; + if (!SHGetPathFromIDListA( item->apidl[i].pidl, buffer )) + strcpy( buffer, "<unknown>" ); + ERR("_OpenDirectory failed for %s\n", buffer); + } + } #endif } item->hwnd = hwnd;

1 0

[bfreisen] 68724: [MSPAINT_NEW] save/restore certain settings to/from registry
by bfreisen＠svn.reactos.org 16 Aug '15

16 Aug '15

Author: bfreisen Date: Sun Aug 16 19:52:37 2015 New Revision: 68724 URL: http://svn.reactos.org/svn/reactos?rev=68724&view=rev Log: [MSPAINT_NEW] save/restore certain settings to/from registry Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/precomp.h trunk/reactos/base/applications/mspaint_new/registry.cpp trunk/reactos/base/applications/mspaint_new/registry.h trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -19,6 +19,9 @@ extern int heightSetInDlg; extern STRETCHSKEW stretchSkew; + +class RegistrySettings; +extern RegistrySettings registrySettings; class ImageModel; extern ImageModel imageModel; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -29,9 +29,9 @@ redoSteps = 0; imageSaved = TRUE; - // TODO: load dimensions from registry - int imgXRes = 400; - int imgYRes = 300; + // prepare a minimal usable bitmap + int imgXRes = 1; + int imgYRes = 1; hDrawingDC = CreateCompatibleDC(NULL); SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -12,7 +12,6 @@ #include "precomp.h" #include "dialogs.h" -#include "registry.h" /* FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -31,6 +31,8 @@ int textToolTextMaxLen = 0; PaletteModel paletteModel; + +RegistrySettings registrySettings; ImageModel imageModel; BOOL askBeforeEnlarging = FALSE; // TODO: initialize from registry @@ -134,13 +136,21 @@ _stprintf(progtitle, resstr, filename); LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); + /* load settings from registry */ + registrySettings.Load(); + showMiniature = registrySettings.ShowThumbnail; + imageModel.Crop(registrySettings.BMPWidth, registrySettings.BMPHeight); + /* create main window */ RECT mainWindowPos = {0, 0, 544, 375}; // FIXME: use equivalent of CW_USEDEFAULT for position hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, progtitle, WS_OVERLAPPEDWINDOW); - RECT miniaturePos = {180, 200, 180 + 120, 200 + 100}; + RECT miniaturePos = {(LONG) registrySettings.ThumbXPos, (LONG) registrySettings.ThumbYPos, + (LONG) registrySettings.ThumbXPos + (LONG) registrySettings.ThumbWidth, + (LONG) registrySettings.ThumbYPos + (LONG) registrySettings.ThumbHeight}; miniature.Create(hwnd, miniaturePos, miniaturetitle, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, WS_EX_PALETTEWINDOW); + miniature.ShowWindow(showMiniature ? SW_SHOW : SW_HIDE); /* loading and setting the window menu from resource */ menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU)); @@ -276,7 +286,7 @@ imageArea.SendMessage(WM_SIZE, 0, 0); /* by moving the window, the things in WM_SIZE are done */ - MoveWindow(hwnd, 100, 100, 600, 450, TRUE); + mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement)); /* creating the text editor window for the text tool */ RECT textEditWindowPos = {300, 0, 300 + 300, 0 + 200}; @@ -299,6 +309,12 @@ DispatchMessage(&messages); } + /* write back settings to registry */ + registrySettings.ShowThumbnail = showMiniature; + registrySettings.BMPWidth = imageModel.GetWidth(); + registrySettings.BMPHeight = imageModel.GetHeight(); + registrySettings.Store(); + /* The program return-value is 0 - The value that PostQuitMessage() gave */ return messages.wParam; } Modified: trunk/reactos/base/applications/mspaint_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/precomp.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -28,6 +28,7 @@ #include "mouse.h" #include "palette.h" #include "palettemodel.h" +#include "registry.h" #include "scrollbox.h" #include "selection.h" #include "selectionmodel.h" Modified: trunk/reactos/base/applications/mspaint_new/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/registry.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -14,8 +14,7 @@ /* FUNCTIONS ********************************************************/ -void -SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too +void RegistrySettings::SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { HKEY hDesktop; TCHAR szStyle[3], szTile[3]; @@ -42,3 +41,85 @@ RegCloseKey(hDesktop); } } + +void RegistrySettings::LoadPresets() +{ + BMPHeight = 300; + BMPWidth = 400; + GridExtent = 1; + NoStretching = 0; + ShowThumbnail = 0; + SnapToGrid = 0; + ThumbHeight = 100; + ThumbWidth = 120; + ThumbXPos = 180; + ThumbYPos = 200; + UnitSetting = 0; + const WINDOWPLACEMENT DefaultWindowPlacement = { + sizeof(WINDOWPLACEMENT), + 0, + SW_SHOWNORMAL, + {0, 0}, + {-1, -1}, + {100, 100, 700, 550} + }; + WindowPlacement = DefaultWindowPlacement; +} + +void RegistrySettings::Load() +{ + HKEY hView; + LoadPresets(); + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), + 0, KEY_READ | KEY_SET_VALUE, &hView) == ERROR_SUCCESS) + { + DWORD cbData; + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("BMPHeight"), 0, NULL, (LPBYTE) &BMPHeight, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("BMPWidth"), 0, NULL, (LPBYTE) &BMPWidth, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("GridExtent"), 0, NULL, (LPBYTE) &GridExtent, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("NoStretching"), 0, NULL, (LPBYTE) &NoStretching, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ShowThumbnail"), 0, NULL, (LPBYTE) &ShowThumbnail, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("SnapToGrid"), 0, NULL, (LPBYTE) &SnapToGrid, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbHeight"), 0, NULL, (LPBYTE) &ThumbHeight, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbWidth"), 0, NULL, (LPBYTE) &ThumbWidth, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbXPos"), 0, NULL, (LPBYTE) &ThumbXPos, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("ThumbYPos"), 0, NULL, (LPBYTE) &ThumbYPos, &cbData); + cbData = sizeof(DWORD); + RegQueryValueEx(hView, _T("UnitSetting"), 0, NULL, (LPBYTE) &UnitSetting, &cbData); + cbData = sizeof(WINDOWPLACEMENT); + RegQueryValueEx(hView, _T("WindowPlacement"), 0, NULL, (LPBYTE) &WindowPlacement, &cbData); + } +} + +void RegistrySettings::Store() +{ + HKEY hView; + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), + 0, NULL, 0, KEY_READ | KEY_SET_VALUE, NULL, &hView, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hView, _T("BMPHeight"), 0, REG_DWORD, (LPBYTE) &BMPHeight, sizeof(DWORD)); + RegSetValueEx(hView, _T("BMPWidth"), 0, REG_DWORD, (LPBYTE) &BMPWidth, sizeof(DWORD)); + RegSetValueEx(hView, _T("GridExtent"), 0, REG_DWORD, (LPBYTE) &GridExtent, sizeof(DWORD)); + RegSetValueEx(hView, _T("NoStretching"), 0, REG_DWORD, (LPBYTE) &NoStretching, sizeof(DWORD)); + RegSetValueEx(hView, _T("ShowThumbnail"), 0, REG_DWORD, (LPBYTE) &ShowThumbnail, sizeof(DWORD)); + RegSetValueEx(hView, _T("SnapToGrid"), 0, REG_DWORD, (LPBYTE) &SnapToGrid, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbHeight"), 0, REG_DWORD, (LPBYTE) &ThumbHeight, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbWidth"), 0, REG_DWORD, (LPBYTE) &ThumbWidth, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbXPos"), 0, REG_DWORD, (LPBYTE) &ThumbXPos, sizeof(DWORD)); + RegSetValueEx(hView, _T("ThumbYPos"), 0, REG_DWORD, (LPBYTE) &ThumbYPos, sizeof(DWORD)); + RegSetValueEx(hView, _T("UnitSetting"), 0, REG_DWORD, (LPBYTE) &UnitSetting, sizeof(DWORD)); + RegSetValueEx(hView, _T("WindowPlacement"), 0, REG_BINARY, (LPBYTE) &WindowPlacement, sizeof(WINDOWPLACEMENT)); + } +} Modified: trunk/reactos/base/applications/mspaint_new/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/registry.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/registry.h [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -6,4 +6,27 @@ * PROGRAMMERS: Benedikt Freisen */ -void SetWallpaper(TCHAR *szFileName, DWORD dwStyle, DWORD dwTile); +class RegistrySettings +{ +private: + void LoadPresets(); + +public: + DWORD BMPHeight; + DWORD BMPWidth; + DWORD GridExtent; + DWORD NoStretching; + DWORD ShowThumbnail; + DWORD SnapToGrid; + DWORD ThumbHeight; + DWORD ThumbWidth; + DWORD ThumbXPos; + DWORD ThumbYPos; + DWORD UnitSetting; + WINDOWPLACEMENT WindowPlacement; + + static void SetWallpaper(TCHAR *szFileName, DWORD dwStyle, DWORD dwTile); + + void Load(); + void Store(); +}; Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Sun Aug 16 19:52:37 2015 @@ -12,7 +12,6 @@ #include "precomp.h" #include "dialogs.h" -#include "registry.h" /* FUNCTIONS ********************************************************/ @@ -188,6 +187,7 @@ LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + GetWindowPlacement(&(registrySettings.WindowPlacement)); PostQuitMessage(0); /* send a WM_QUIT to the message queue */ return 0; } @@ -428,13 +428,13 @@ GlobalFree(pd.hDevNames); break; case IDM_FILEASWALLPAPERPLANE: - SetWallpaper(filepathname, 1, 1); + RegistrySettings::SetWallpaper(filepathname, 1, 1); break; case IDM_FILEASWALLPAPERCENTERED: - SetWallpaper(filepathname, 1, 0); + RegistrySettings::SetWallpaper(filepathname, 1, 0); break; case IDM_FILEASWALLPAPERSTRETCHED: - SetWallpaper(filepathname, 2, 0); + RegistrySettings::SetWallpaper(filepathname, 2, 0); break; case IDM_EDITUNDO: imageModel.Undo();

1 0

[ekohl] 68723: [WLNOTIFY] Register the notification functions.
by ekohl＠svn.reactos.org 16 Aug '15

16 Aug '15

Author: ekohl Date: Sun Aug 16 19:27:11 2015 New Revision: 68723 URL: http://svn.reactos.org/svn/reactos?rev=68723&view=rev Log: [WLNOTIFY] Register the notification functions. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Aug 16 19:27:11 2015 @@ -1103,6 +1103,11 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent" ; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"

1 0

[ekohl] 68722: [WLNOTIFY] Add the winlogon notification dll. Right now it exports only test functions for the winlogon notifications.
by ekohl＠svn.reactos.org 16 Aug '15

16 Aug '15

Author: ekohl Date: Sun Aug 16 19:11:21 2015 New Revision: 68722 URL: http://svn.reactos.org/svn/reactos?rev=68722&view=rev Log: [WLNOTIFY] Add the winlogon notification dll. Right now it exports only test functions for the winlogon notifications. Added: trunk/reactos/dll/win32/wlnotify/ (with props) trunk/reactos/dll/win32/wlnotify/CMakeLists.txt (with props) trunk/reactos/dll/win32/wlnotify/precomp.h (with props) trunk/reactos/dll/win32/wlnotify/test.c (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.c (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.rc (with props) trunk/reactos/dll/win32/wlnotify/wlnotify.spec (with props) Modified: trunk/reactos/cmake/baseaddress.cmake trunk/reactos/cmake/baseaddress_dwarf.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -40,6 +40,7 @@ set(baseaddress_cabinet 0x75ac0000) set(baseaddress_dsound 0x75a50000) set(baseaddress_glu32 0x75950000) +set(baseaddress_wlnotify 0x758f0000) set(baseaddress_opengl32 0x75720000) set(baseaddress_riched20 0x75690000) set(baseaddress_smdll 0x75670000) Modified: trunk/reactos/cmake/baseaddress_dwarf.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_dwarf.cm… ============================================================================== --- trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -40,6 +40,7 @@ set(baseaddress_cabinet 0x75290000) set(baseaddress_dsound 0x751f0000) set(baseaddress_glu32 0x750a0000) +set(baseaddress_wlnotify 0x75040000) set(baseaddress_opengl32 0x74d90000) set(baseaddress_riched20 0x74cd0000) set(baseaddress_smdll 0x74cb0000) Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 16 19:11:21 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/wlnotify/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/wlnotify/CMakeLists.txt [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,17 @@ + +spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + test.c + wlnotify.c + precomp.h) + +add_library(wlnotify SHARED + ${SOURCE} + wlnotify.rc + ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def) + +set_module_type(wlnotify win32dll UNICODE ENTRYPOINT DllMain 12) +add_importlibs(wlnotify kernel32 ntdll) +add_pch(wlnotify precomp.h SOURCE) +add_cd_file(TARGET wlnotify DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/precomp… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/precomp.h (added) +++ trunk/reactos/dll/win32/wlnotify/precomp.h [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,3 @@ +/**/ +#include <windows.h> +#include <winwlx.h> Propchange: trunk/reactos/dll/win32/wlnotify/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/test.c?… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/test.c (added) +++ trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wlnotify/test.c + * PURPOSE: Winlogon notifications + * PROGRAMMER: Eric Kohl + */ + +#include "precomp.h" + +#define _NDEBUG +#include <debug.h> + + +VOID +WINAPI +TestLogonEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT1("TestLogonEvent\n"); + DPRINT1("Size: %lu\n", pInfo->Size); + DPRINT1("Flags: %lx\n", pInfo->Flags); + DPRINT1("UserName: %S\n", pInfo->UserName); + DPRINT1("Domain: %S\n", pInfo->Domain); + DPRINT1("WindowStation: %S\n", pInfo->WindowStation); + DPRINT1("hToken: %p\n", pInfo->hToken); + DPRINT1("hDesktop: %p\n", pInfo->hDesktop); + DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestLogoffEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT1("TestLogoffEvent\n"); + DPRINT1("Size: %lu\n", pInfo->Size); + DPRINT1("Flags: %lx\n", pInfo->Flags); + DPRINT1("UserName: %S\n", pInfo->UserName); + DPRINT1("Domain: %S\n", pInfo->Domain); + DPRINT1("WindowStation: %S\n", pInfo->WindowStation); + DPRINT1("hToken: %p\n", pInfo->hToken); + DPRINT1("hDesktop: %p\n", pInfo->hDesktop); + DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/wlnotify/test.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.c (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.c [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wlnotify/wlnotify.c + * PURPOSE: Winlogon notifications + * PROGRAMMER: Eric Kohl + */ + +#include "precomp.h" + +#define _NDEBUG +#include <debug.h> + + +BOOL +WINAPI +DllMain( + HINSTANCE hInstance, + DWORD dwReason, + LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.rc (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.rc [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Common DLL to receive Winlogon notifications" +#define REACTOS_STR_INTERNAL_NAME "wlnotify" +#define REACTOS_STR_ORIGINAL_FILENAME "wlnotify.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wlnotify/wlnotify.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.spec (added) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] Sun Aug 16 19:11:21 2015 @@ -0,0 +1,2 @@ +@ stdcall TestLogonEvent(ptr) +@ stdcall TestLogoffEvent(ptr) Propchange: trunk/reactos/dll/win32/wlnotify/wlnotify.spec ------------------------------------------------------------------------------ svn:eol-style = native

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