Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[gadamopoulos] 68845: [SHELL32] - Sync control.c from wine and disable a large part of it that is not needed. Also update the definition of CPlApplet to match wine. - Make CControlPanel use the new...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 28 10:36:35 2015 New Revision: 68845 URL: http://svn.reactos.org/svn/reactos?rev=68845&view=rev Log: [SHELL32] - Sync control.c from wine and disable a large part of it that is not needed. Also update the definition of CPlApplet to match wine. - Make CControlPanel use the new definition of CPlApplet which lets us simplify loading the applets. - Make CControlPanel to only use unicode and use the new helper functions. - Simplify the code for the context menu of cpl items. Added: trunk/reactos/dll/win32/shell32/wine/cpanel.h - copied, changed from r68842, trunk/reactos/dll/win32/shell32/cpanel.h Removed: trunk/reactos/dll/win32/shell32/cpanel.h Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/wine/control.c trunk/reactos/dll/win32/shell32/wine/pidl.c trunk/reactos/dll/win32/shell32/wine/pidl.h Removed: trunk/reactos/dll/win32/shell32/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanel.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/cpanel.h (removed) @@ -1,50 +0,0 @@ -/* Control Panel management - * - * Copyright 2001 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_SHELL_CPANEL_H -#define __WINE_SHELL_CPANEL_H - -#include <cpl.h> - -typedef struct CPlApplet -{ - struct CPlApplet *next; /* linked list */ - HWND hWnd; - LPWSTR cmd; /* path to applet */ - unsigned count; /* number of subprograms */ - HMODULE hModule; /* module of loaded applet */ - APPLET_PROC proc; /* entry point address */ - NEWCPLINFOW info[1]; /* array of count information. - * dwSize field is 0 if entry is invalid */ -} CPlApplet; - -typedef struct CPanel -{ - CPlApplet *first; /* linked list */ - HWND hWnd; - unsigned status; - CPlApplet *clkApplet; - unsigned clkSP; -} CPanel; - - -EXTERN_C CPlApplet *Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel); -EXTERN_C CPlApplet *Control_UnloadApplet(CPlApplet* applet); - -#endif /* __WINE_SHELL_CPANEL_H */ 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] Fri Aug 28 10:36:35 2015 @@ -19,12 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* -TODO: -1. The selected items list should not be stored in CControlPanelFolder, it should - be a result returned by an internal method. -*/ - #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -40,9 +34,9 @@ CControlPanelEnum(); ~CControlPanelEnum(); HRESULT WINAPI Initialize(DWORD dwFlags); - BOOL RegisterCPanelApp(LPCSTR path); - int RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath); - int RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath); + BOOL RegisterCPanelApp(LPCWSTR path); + int RegisterRegistryCPanelApps(HKEY hkey_root, LPCWSTR szRepPath); + int RegisterCPanelFolders(HKEY hkey_root, LPCWSTR szRepPath); BOOL CreateCPanelEnumList(DWORD dwFlags); BEGIN_COM_MAP(CControlPanelEnum) @@ -76,7 +70,7 @@ return S_OK; } -static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR pszName, LPCSTR pszDisplayName, LPCSTR pszComment, int iIconIdx) +static LPITEMIDLIST _ILCreateCPanelApplet(LPCWSTR pszName, LPCWSTR pszDisplayName, LPCWSTR pszComment, int iIconIdx) { PIDLCPanelStruct *pCP; LPITEMIDLIST pidl; @@ -84,13 +78,13 @@ int cchName, cchDisplayName, cchComment, cbData; /* Calculate lengths of given strings */ - cchName = strlen(pszName); - cchDisplayName = strlen(pszDisplayName); - cchComment = strlen(pszComment); + cchName = wcslen(pszName); + cchDisplayName = wcslen(pszDisplayName); + cchComment = wcslen(pszComment); /* Allocate PIDL */ cbData = sizeof(pidl->mkid.cb) + sizeof(pData->type) + sizeof(pData->u.cpanel) - sizeof(pData->u.cpanel.szName) - + cchName + cchDisplayName + cchComment + 3; + + (cchName + cchDisplayName + cchComment + 3) * sizeof(WCHAR); pidl = (LPITEMIDLIST)SHAlloc(cbData + sizeof(WORD)); if (!pidl) return NULL; @@ -103,11 +97,11 @@ pCP = &pData->u.cpanel; pCP->dummy = 0; pCP->iconIdx = iIconIdx; - strcpy(pCP->szName, pszName); + wcscpy(pCP->szName, pszName); pCP->offsDispName = cchName + 1; - strcpy(pCP->szName + pCP->offsDispName, pszDisplayName); + wcscpy(pCP->szName + pCP->offsDispName, pszDisplayName); pCP->offsComment = pCP->offsDispName + cchDisplayName + 1; - strcpy(pCP->szName + pCP->offsComment, pszComment); + wcscpy(pCP->szName + pCP->offsComment, pszComment); /* Add PIDL NULL terminator */ *(WORD*)(pCP->szName + pCP->offsComment + cchComment + 1) = 0; @@ -131,40 +125,24 @@ return NULL; } -BOOL CControlPanelEnum::RegisterCPanelApp(LPCSTR path) -{ - LPITEMIDLIST pidl; - CPlApplet* applet; - CPanel panel; - CPLINFO info; - unsigned i; +BOOL CControlPanelEnum::RegisterCPanelApp(LPCWSTR wpath) +{ + CPlApplet* applet = Control_LoadApplet(0, wpath, NULL); int iconIdx; - char displayName[MAX_PATH]; - char comment[MAX_PATH]; - - WCHAR wpath[MAX_PATH]; - - MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH); - - panel.first = NULL; - applet = Control_LoadApplet(0, wpath, &panel); - if (applet) { - for (i = 0; i < applet->count; ++i) + for (UINT i = 0; i < applet->count; ++i) { - applet->proc(0, CPL_INQUIRE, i, (LPARAM)&info); - - LoadStringA(applet->hModule, info.idName, displayName, MAX_PATH); - LoadStringA(applet->hModule, info.idInfo, comment, MAX_PATH); - - if (info.idIcon > 0) - iconIdx = -info.idIcon; /* negative icon index instead of icon number */ + if (applet->info[i].idIcon > 0) + iconIdx = -applet->info[i].idIcon; /* negative icon index instead of icon number */ else iconIdx = 0; - pidl = _ILCreateCPanelApplet(path, displayName, comment, iconIdx); + LPITEMIDLIST pidl = _ILCreateCPanelApplet(wpath, + applet->info[i].name, + applet->info[i].info, + iconIdx); if (pidl) AddToEnumList(pidl); @@ -174,15 +152,15 @@ return TRUE; } -int CControlPanelEnum::RegisterRegistryCPanelApps(HKEY hkey_root, LPCSTR szRepPath) -{ - char name[MAX_PATH]; - char value[MAX_PATH]; +int CControlPanelEnum::RegisterRegistryCPanelApps(HKEY hkey_root, LPCWSTR szRepPath) +{ + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; HKEY hkey; int cnt = 0; - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) { int idx = 0; @@ -190,14 +168,14 @@ { DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; - char buffer[MAX_PATH]; - - if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + WCHAR buffer[MAX_PATH]; + + if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) break; - if (ExpandEnvironmentStringsA(value, buffer, MAX_PATH)) + if (ExpandEnvironmentStringsW(value, buffer, MAX_PATH)) { - strcpy(value, buffer); + wcscpy(value, buffer); } if (RegisterCPanelApp(value)) @@ -209,24 +187,23 @@ return cnt; } -int CControlPanelEnum::RegisterCPanelFolders(HKEY hkey_root, LPCSTR szRepPath) -{ - char name[MAX_PATH]; +int CControlPanelEnum::RegisterCPanelFolders(HKEY hkey_root, LPCWSTR szRepPath) +{ + WCHAR name[MAX_PATH]; HKEY hkey; int cnt = 0; - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) - { - int idx = 0; - for (; ; idx++) + if (RegOpenKeyW(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + { + for (int idx = 0; ; idx++) { - if (RegEnumKeyA(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS) + if (RegEnumKeyW(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS) break; if (*name == '{') { - LPITEMIDLIST pidl = _ILCreateGuidFromStrA(name); + LPITEMIDLIST pidl = _ILCreateGuidFromStrW(name); if (pidl && AddToEnumList(pidl)) ++cnt; @@ -244,27 +221,26 @@ */ BOOL CControlPanelEnum::CreateCPanelEnumList(DWORD dwFlags) { - CHAR szPath[MAX_PATH]; - WIN32_FIND_DATAA wfd; + WCHAR szPath[MAX_PATH]; + WIN32_FIND_DATAW wfd; HANDLE hFile; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - RegisterCPanelFolders(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + RegisterCPanelFolders(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS) { - LPSTR p; - - GetSystemDirectoryA(szPath, MAX_PATH); - p = PathAddBackslashA(szPath); - strcpy(p, "*.cpl"); - - TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n", this, debugstr_a(szPath)); - hFile = FindFirstFileA(szPath, &wfd); + LPWSTR p; + + GetSystemDirectoryW(szPath, MAX_PATH); + p = PathAddBackslashW(szPath); + wcscpy(p, L"*.cpl"); + + hFile = FindFirstFileW(szPath, &wfd); if (hFile != INVALID_HANDLE_VALUE) { @@ -274,16 +250,16 @@ continue; if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(p, wfd.cFileName); - if (strcmp(wfd.cFileName, "ncpa.cpl")) + wcscpy(p, wfd.cFileName); + if (wcscmp(wfd.cFileName, L"ncpa.cpl")) RegisterCPanelApp(szPath); } - } while(FindNextFileA(hFile, &wfd)); + } while(FindNextFileW(hFile, &wfd)); FindClose(hFile); } - RegisterRegistryCPanelApps(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - RegisterRegistryCPanelApps(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + RegisterRegistryCPanelApps(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + RegisterRegistryCPanelApps(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); } return TRUE; } @@ -576,10 +552,7 @@ if (pCPanel) { - /* copy display name from pidl - it was retrived from applet before; - SHGDN_FORPARSING does not need special handling */ - strRet->uType = STRRET_CSTR; - lstrcpyA(strRet->cStr, pCPanel->szName + pCPanel->offsDispName); + return SHSetStrRet(strRet, pCPanel->szName + pCPanel->offsDispName); } else if (_ILIsSpecialFolder(pidl)) { @@ -657,12 +630,8 @@ if (!pidl) { psd->fmt = ControlPanelSFHeader[iColumn].fmt; psd->cxChar = ControlPanelSFHeader[iColumn].cxChar; - psd->str.uType = STRRET_CSTR; - LoadStringA(shell32_hInstance, ControlPanelSFHeader[iColumn].colnameid, psd->str.cStr, MAX_PATH); - return S_OK; + return SHSetStrRet(&psd->str, shell32_hInstance, ControlPanelSFHeader[iColumn].colnameid); } else { - psd->str.cStr[0] = 0x00; - psd->str.uType = STRRET_CSTR; switch(iColumn) { case 0: /* name */ hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); @@ -671,13 +640,15 @@ { PIDLCPanelStruct* pCPanel = _ILGetCPanelPointer(pidl); if (pCPanel) - lstrcpyA(psd->str.cStr, pCPanel->szName + pCPanel->offsComment); + return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsComment); if (_ILIsSpecialFolder(pidl)) { HKEY hKey; GUID *pGuid = _ILGetGUIDPointer(pidl); if (HCR_RegOpenClassIDKey(*pGuid, &hKey)) { + psd->str.cStr[0] = 0x00; + psd->str.uType = STRRET_CSTR; RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); RegCloseKey(hKey); } @@ -745,7 +716,7 @@ if (!pcpanel) return E_INVALIDARG; - MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, szIconFile, cchMax); + wcsncpy(szIconFile, pcpanel->szName, cchMax); *piIndex = (int)pcpanel->iconIdx != -1 ? pcpanel->iconIdx : 0; return S_OK; @@ -780,47 +751,21 @@ UINT idCmdLast, UINT uFlags) { - WCHAR szBuffer[30] = {0}; - ULONG Count = 1; - - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", - this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - - if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, szBuffer, MFS_DEFAULT); //FIXME identifier - Count++; - } - - if (LoadStringW(shell32_hInstance, IDS_CREATELINK, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - if (Count) - { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_SEPARATOR, NULL, MFS_ENABLED); - } - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - - _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, szBuffer, MFS_ENABLED); //FIXME identifier - Count++; - } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, MAKEINTRESOURCEW(IDS_OPEN), MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 2); } EXTERN_C -void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow); +void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); /************************************************************************** * ICPanel_IContextMenu_InvokeCommand() */ HRESULT WINAPI CCPLItemMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { - WCHAR szPath[MAX_PATH]; - char szTarget[MAX_PATH]; - WCHAR* pszPath; - INT Length, cLength; - CComPtr<IPersistFile> ppf; - CComPtr<IShellLinkA> isl; HRESULT hResult; PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(m_apidl[0]); @@ -831,60 +776,38 @@ if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { - CHAR szParams[MAX_PATH]; - - strcpy(szParams, pCPanel->szName); - strcat(szParams, ","); - strcat(szParams, pCPanel->szName + pCPanel->offsDispName); - - Control_RunDLLA (NULL, NULL, szParams, SW_NORMAL); + WCHAR wszParams[MAX_PATH]; + + wcscpy(wszParams, pCPanel->szName); + wcscat(wszParams, L","); + wcscat(wszParams, pCPanel->szName + pCPanel->offsDispName); + + Control_RunDLLW (NULL, NULL, wszParams, SW_NORMAL); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { - if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) - return E_FAIL; - - pszPath = PathAddBackslashW(szPath); - if (!pszPath) - return E_FAIL; - - CHAR* pszDisplayName = pCPanel->szName + pCPanel->offsDispName; - - Length = MAX_PATH - (pszPath - szPath); - cLength = strlen(pszDisplayName); - if (Length < cLength + 5) - { - FIXME("\n"); - return E_FAIL; - } - - if (MultiByteToWideChar(CP_ACP, 0, pszDisplayName, cLength + 1, pszPath, Length)) - { - pszPath += cLength; - Length -= cLength; - } - - if (Length > 10) - { - wcscpy(pszPath, L" - "); - cLength = LoadStringW(shell32_hInstance, IDS_LNK_FILE, &pszPath[3], Length - 4) + 3; - if (cLength + 5 > Length) - cLength = Length - 5; - Length -= cLength; - pszPath += cLength; - } - wcscpy(pszPath, L".lnk"); - - strncpy(szTarget, pCPanel->szName, MAX_PATH); - - hResult = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkA, &isl)); - if (SUCCEEDED(hResult)) - { - isl->SetPath(szTarget); - if (SUCCEEDED(isl->QueryInterface(IID_PPV_ARG(IPersistFile,&ppf)))) - ppf->Save(szPath, TRUE); - } - return NOERROR; + CComPtr<IDataObject> pDataObj; + LPITEMIDLIST pidl = _ILCreateControlPanel(); + + hResult = SHCreateDataObject(pidl, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); + if (FAILED(hResult)) + return hResult; + + SHFree(pidl); + + //FIXME: Use SHCreateLinks + CComPtr<IShellFolder> psf; + CComPtr<IDropTarget> pDT; + + hResult = SHGetDesktopFolder(&psf); + if (FAILED(hResult)) + return hResult; + + hResult = psf->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pDT)); + if (FAILED(hResult)) + return hResult; + + SHSimulateDrop(pDT, pDataObj, MK_CONTROL|MK_SHIFT, NULL, NULL); } return S_OK; } Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Fri Aug 28 10:36:35 2015 @@ -42,7 +42,7 @@ #include "debughlp.h" #include "wine/shell32_main.h" #include "shresdef.h" -#include "cpanel.h" +#include "wine/cpanel.h" #include "CEnumIDListBase.h" #include "shfldr.h" #include "shellfolder.h" Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Fri Aug 28 10:36:35 2015 @@ -27,42 +27,39 @@ #include <winbase.h> #define NO_SHLWAPI_REG #include <shlwapi.h> +#include <shellapi.h> #include <wine/debug.h> #include "cpanel.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); -CPlApplet* Control_UnloadApplet(CPlApplet* applet) -{ - unsigned i; - CPlApplet* next; +void Control_UnloadApplet(CPlApplet* applet) +{ + unsigned i; for (i = 0; i < applet->count; i++) - { - if (!applet->info[i].dwSize) - continue; - applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].lData); - } - if (applet->proc) - applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); - + applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].data); + + if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); - next = applet->next; +#ifndef __REACTOS__ + list_remove( &applet->entry ); +#endif HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); - return next; -} - -CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) -{ - CPlApplet* applet; +} + +CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) +{ + CPlApplet* applet; DWORD len; - unsigned i; - CPLINFO info; + unsigned i; + CPLINFO info; NEWCPLINFOW newinfo; - if (!(applet = (CPlApplet *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) + if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; len = ExpandEnvironmentStringsW(cmd, NULL, 0); @@ -83,422 +80,775 @@ applet->hWnd = hWnd; - if (!(applet->hModule = LoadLibraryW(applet->cmd))) + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { + WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); + goto theError; + } + if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) { + WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd)); + goto theError; + } + if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) { + WARN("Init of applet has failed\n"); + goto theError; + } + if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) { + WARN("No subprogram in applet\n"); + applet->proc(applet->hWnd, CPL_EXIT, 0, 0); + goto theError; + } + + applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, + FIELD_OFFSET( CPlApplet, info[applet->count] )); + + for (i = 0; i < applet->count; i++) { + ZeroMemory(&newinfo, sizeof(newinfo)); + newinfo.dwSize = sizeof(NEWCPLINFOA); + applet->info[i].helpfile[0] = 0; + /* proc is supposed to return a null value upon success for + * CPL_INQUIRE and CPL_NEWINQUIRE + * However, real drivers don't seem to behave like this + * So, use introspection rather than return value + */ + applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); + applet->info[i].data = info.lData; +#if __REACTOS__ + applet->info[i].idIcon = info.idIcon; +#endif + + if (info.idIcon != CPL_DYNAMIC_RES) + applet->info[i].icon = LoadIconW(applet->hModule, MAKEINTRESOURCEW(info.idIcon)); + if (info.idName != CPL_DYNAMIC_RES) + LoadStringW(applet->hModule, info.idName, + applet->info[i].name, sizeof(applet->info[i].name) / sizeof(WCHAR)); + if (info.idInfo != CPL_DYNAMIC_RES) + LoadStringW(applet->hModule, info.idInfo, + applet->info[i].info, sizeof(applet->info[i].info) / sizeof(WCHAR)); + + /* some broken control panels seem to return incorrect values in CPL_INQUIRE, + but proper data in CPL_NEWINQUIRE. if we get an empty string or a null + icon, see what we can get from CPL_NEWINQUIRE */ + + if (!applet->info[i].name[0]) info.idName = CPL_DYNAMIC_RES; + + /* zero-length szInfo may not be a buggy applet, but it doesn't hurt for us + to check anyway */ + + if (!applet->info[i].info[0]) info.idInfo = CPL_DYNAMIC_RES; + + if (applet->info[i].icon == NULL) + info.idIcon = CPL_DYNAMIC_RES; + + if ((info.idIcon == CPL_DYNAMIC_RES) || (info.idName == CPL_DYNAMIC_RES) || + (info.idInfo == CPL_DYNAMIC_RES)) { + applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); + + applet->info[i].data = newinfo.lData; + if (info.idIcon == CPL_DYNAMIC_RES) { + if (!newinfo.hIcon) WARN("couldn't get icon for applet %u\n", i); + applet->info[i].icon = newinfo.hIcon; + } + if (newinfo.dwSize == sizeof(NEWCPLINFOW)) { + if (info.idName == CPL_DYNAMIC_RES) + memcpy(applet->info[i].name, newinfo.szName, sizeof(newinfo.szName)); + if (info.idInfo == CPL_DYNAMIC_RES) + memcpy(applet->info[i].info, newinfo.szInfo, sizeof(newinfo.szInfo)); + memcpy(applet->info[i].helpfile, newinfo.szHelpFile, sizeof(newinfo.szHelpFile)); + } else { + if (info.idName == CPL_DYNAMIC_RES) + MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szName, + sizeof(((LPNEWCPLINFOA)&newinfo)->szName) / sizeof(CHAR), + applet->info[i].name, sizeof(applet->info[i].name) / sizeof(WCHAR)); + if (info.idInfo == CPL_DYNAMIC_RES) + MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szInfo, + sizeof(((LPNEWCPLINFOA)&newinfo)->szInfo) / sizeof(CHAR), + applet->info[i].info, sizeof(applet->info[i].info) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szHelpFile, + sizeof(((LPNEWCPLINFOA)&newinfo)->szHelpFile) / sizeof(CHAR), + applet->info[i].helpfile, + sizeof(applet->info[i].helpfile) / sizeof(WCHAR)); + } + } + } + +#ifndef __REACTOS__ + list_add_head( &panel->applets, &applet->entry ); +#endif + + return applet; + + theError: + FreeLibrary(applet->hModule); + HeapFree(GetProcessHeap(), 0, applet->cmd); + HeapFree(GetProcessHeap(), 0, applet); + return NULL; +} + +#ifndef __REACTOS__ + +#define IDC_LISTVIEW 1000 +#define IDC_STATUSBAR 1001 + +#define NUM_COLUMNS 2 +#define LISTVIEW_DEFSTYLE (WS_CHILD | WS_VISIBLE | WS_TABSTOP |\ + LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL) + +static BOOL Control_CreateListView (CPanel *panel) +{ + RECT ws, sb; + WCHAR empty_string[] = {0}; + WCHAR buf[MAX_STRING_LEN]; + LVCOLUMNW lvc; + + /* Create list view */ + GetClientRect(panel->hWndStatusBar, &sb); + GetClientRect(panel->hWnd, &ws); + + panel->hWndListView = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, + empty_string, LISTVIEW_DEFSTYLE | LVS_ICON, + 0, 0, ws.right - ws.left, ws.bottom - ws.top - + (sb.bottom - sb.top), panel->hWnd, + (HMENU) IDC_LISTVIEW, panel->hInst, NULL); + + if (!panel->hWndListView) + return FALSE; + + /* Create image lists for list view */ + panel->hImageListSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 1, 1); + panel->hImageListLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), ILC_COLOR32 | ILC_MASK, 1, 1); + + SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)panel->hImageListSmall); + SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)panel->hImageListLarge); + + /* Create columns for list view */ + lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; + lvc.pszText = buf; + lvc.fmt = LVCFMT_LEFT; + + /* Name column */ + lvc.iSubItem = 0; + lvc.cx = (ws.right - ws.left) / 3; + LoadStringW(shell32_hInstance, IDS_CPANEL_NAME, buf, sizeof(buf) / sizeof(buf[0])); + + if (ListView_InsertColumnW(panel->hWndListView, 0, &lvc) == -1) + return FALSE; + + /* Description column */ + lvc.iSubItem = 1; + lvc.cx = ((ws.right - ws.left) / 3) * 2; + LoadStringW(shell32_hInstance, IDS_CPANEL_DESCRIPTION, buf, sizeof(buf) / + sizeof(buf[0])); + + if (ListView_InsertColumnW(panel->hWndListView, 1, &lvc) == -1) + return FALSE; + + return(TRUE); +} + +static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) +{ + CPanel* panel = cs->lpCreateParams; + HMENU hMenu, hSubMenu; + CPlApplet* applet; + MENUITEMINFOW mii; + unsigned int i; + int menucount, index; + CPlItem *item; + LVITEMW lvItem; + INITCOMMONCONTROLSEX icex; + INT sb_parts; + int itemidx; + + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); + panel->hWnd = hWnd; + + /* Initialise common control DLL */ + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; + InitCommonControlsEx(&icex); + + /* create the status bar */ + if (!(panel->hWndStatusBar = CreateStatusWindowW(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, NULL, hWnd, IDC_STATUSBAR))) + return; + + sb_parts = -1; + SendMessageW(panel->hWndStatusBar, SB_SETPARTS, 1, (LPARAM) &sb_parts); + + /* create the list view */ + if (!Control_CreateListView(panel)) + return; + + hMenu = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(MENU_CPANEL)); + + /* insert menu items for applets */ + hSubMenu = GetSubMenu(hMenu, 0); + menucount = 0; + + LIST_FOR_EACH_ENTRY( applet, &panel->applets, CPlApplet, entry ) + { + for (i = 0; i < applet->count; i++) { + /* set up a CPlItem for this particular subprogram */ + item = HeapAlloc(GetProcessHeap(), 0, sizeof(CPlItem)); + + if (!item) + continue; + + item->applet = applet; + item->id = i; + + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA; + mii.dwTypeData = applet->info[i].name; + mii.cch = sizeof(applet->info[i].name) / sizeof(WCHAR); + mii.wID = IDM_CPANEL_APPLET_BASE + menucount; + mii.dwItemData = (ULONG_PTR)item; + + if (InsertMenuItemW(hSubMenu, menucount, TRUE, &mii)) { + /* add the list view item */ + HICON icon = applet->info[i].icon; + if (!icon) icon = LoadImageW( 0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_SHARED ); + index = ImageList_AddIcon(panel->hImageListLarge, icon); + ImageList_AddIcon(panel->hImageListSmall, icon); + + lvItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; + lvItem.iItem = menucount; + lvItem.iSubItem = 0; + lvItem.pszText = applet->info[i].name; + lvItem.iImage = index; + lvItem.lParam = (LPARAM) item; + + itemidx = ListView_InsertItemW(panel->hWndListView, &lvItem); + + /* add the description */ + ListView_SetItemTextW(panel->hWndListView, itemidx, 1, applet->info[i].info); + + /* update menu bar, increment count */ + DrawMenuBar(hWnd); + menucount++; + } + } + } + + panel->total_subprogs = menucount; + + /* check the "large items" icon in the View menu */ + hSubMenu = GetSubMenu(hMenu, 1); + CheckMenuRadioItem(hSubMenu, FCIDM_SHVIEW_BIGICON, FCIDM_SHVIEW_REPORTVIEW, + FCIDM_SHVIEW_BIGICON, MF_BYCOMMAND); + + SetMenu(hWnd, hMenu); +} + +static void Control_FreeCPlItems(HWND hWnd, CPanel *panel) +{ + HMENU hMenu, hSubMenu; + MENUITEMINFOW mii; + unsigned int i; + + /* get the File menu */ + hMenu = GetMenu(hWnd); + + if (!hMenu) + return; + + hSubMenu = GetSubMenu(hMenu, 0); + + if (!hSubMenu) + return; + + /* loop and free the item data */ + for (i = IDM_CPANEL_APPLET_BASE; i <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs; i++) { - WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); - goto theError; - } - if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_DATA; + + if (!GetMenuItemInfoW(hSubMenu, i, FALSE, &mii)) + continue; + + HeapFree(GetProcessHeap(), 0, (LPVOID) mii.dwItemData); + } +} + +static void Control_UpdateListViewStyle(CPanel *panel, UINT style, UINT id) +{ + HMENU hMenu, hSubMenu; + + SetWindowLongW(panel->hWndListView, GWL_STYLE, LISTVIEW_DEFSTYLE | style); + + /* update the menu */ + hMenu = GetMenu(panel->hWnd); + hSubMenu = GetSubMenu(hMenu, 1); + + CheckMenuRadioItem(hSubMenu, FCIDM_SHVIEW_BIGICON, FCIDM_SHVIEW_REPORTVIEW, + id, MF_BYCOMMAND); +} + +static CPlItem* Control_GetCPlItem_From_MenuID(HWND hWnd, UINT id) +{ + HMENU hMenu, hSubMenu; + MENUITEMINFOW mii; + + /* retrieve the CPlItem structure from the menu item data */ + hMenu = GetMenu(hWnd); + + if (!hMenu) + return NULL; + + hSubMenu = GetSubMenu(hMenu, 0); + + if (!hSubMenu) + return NULL; + + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_DATA; + + if (!GetMenuItemInfoW(hSubMenu, id, FALSE, &mii)) + return NULL; + + return (CPlItem *) mii.dwItemData; +} + +static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel) +{ + LVITEMW lvItem; + int selitem; + + selitem = SendMessageW(panel->hWndListView, LVM_GETNEXTITEM, -1, LVNI_FOCUSED + | LVNI_SELECTED); + + if (selitem != -1) { - WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd)); - goto theError; - } - if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) + lvItem.iItem = selitem; + lvItem.mask = LVIF_PARAM; + + if (SendMessageW(panel->hWndListView, LVM_GETITEMW, 0, (LPARAM) &lvItem)) + return (CPlItem *) lvItem.lParam; + } + + return NULL; +} + +static void Control_StartApplet(HWND hWnd, CPlItem *item) +{ + WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; + WCHAR format[] = {'@','%','d',0}; + WCHAR param[MAX_PATH]; + + /* execute the applet if item is valid */ + if (item) { - WARN("Init of applet has failed\n"); - goto theError; - } - if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) - { - WARN("No subprogram in applet\n"); - goto theError; - } - - applet = (CPlApplet *)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, - sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); - - for (i = 0; i < applet->count; i++) - { - ZeroMemory(&newinfo, sizeof(newinfo)); - newinfo.dwSize = sizeof(NEWCPLINFOW); - applet->info[i].dwSize = sizeof(NEWCPLINFOW); - /* proc is supposed to return a null value upon success for - * CPL_INQUIRE and CPL_NEWINQUIRE - * However, real drivers don't seem to behave like this - * So, use introspection rather than return value - */ - applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); - if (newinfo.hIcon == 0) - { - applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); - if (info.idIcon == 0 || info.idName == 0) - { - WARN("Couldn't get info from sp %u\n", i); - applet->info[i].dwSize = 0; - } - else - { - /* convert the old data into the new structure */ - applet->info[i].dwFlags = 0; - applet->info[i].dwHelpContext = 0; - applet->info[i].lData = info.lData; - applet->info[i].hIcon = LoadIconW(applet->hModule, - MAKEINTRESOURCEW(info.idIcon)); - LoadStringW(applet->hModule, info.idName, - applet->info[i].szName, sizeof(applet->info[i].szName) / sizeof(WCHAR)); - LoadStringW(applet->hModule, info.idInfo, - applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); - applet->info[i].szHelpFile[0] = '\0'; - } - } - else - { - CopyMemory(&applet->info[i], &newinfo, newinfo.dwSize); - if (newinfo.dwSize != sizeof(NEWCPLINFOW)) - { - applet->info[i].dwSize = sizeof(NEWCPLINFOW); - lstrcpyW(applet->info[i].szName, newinfo.szName); - lstrcpyW(applet->info[i].szInfo, newinfo.szInfo); - lstrcpyW(applet->info[i].szHelpFile, newinfo.szHelpFile); - } - } - } - - applet->next = panel->first; - panel->first = applet; - - return applet; - - theError: - Control_UnloadApplet(applet); - return NULL; -} - -static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) -{ - CPanel* panel = (CPanel*)cs->lpCreateParams; - - SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); - panel->status = 0; - panel->hWnd = hWnd; -} - -#define XICON 32 -#define XSTEP 128 -#define YICON 32 -#define YSTEP 64 - -static BOOL Control_Localize(const CPanel* panel, int cx, int cy, - CPlApplet** papplet, unsigned* psp) -{ - unsigned int i; - int x = (XSTEP-XICON)/2, y = 0; - CPlApplet* applet; - RECT rc; - - GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet->next) - { - for (i = 0; i < applet->count; i++) - { - if (!applet->info[i].dwSize) - continue; - if (x + XSTEP >= rc.right - rc.left) - { - x = (XSTEP-XICON)/2; - y += YSTEP; - } - if (cx >= x && cx < x + XICON && cy >= y && cy < y + YSTEP) - { - *papplet = applet; - *psp = i; - return TRUE; - } - x += XSTEP; - } - } - return FALSE; -} - -static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam) -{ - HDC hdc; - PAINTSTRUCT ps; - RECT rc, txtRect; - unsigned int i; - int x = 0, y = 0; - CPlApplet* applet; - HGDIOBJ hOldFont; - - hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps); - hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT)); - GetClientRect(panel->hWnd, &rc); - - for (applet = panel->first; applet; applet = applet->next) - { - for (i = 0; i < applet->count; i++) - { - if (x + XSTEP >= rc.right - rc.left) - { - x = 0; - y += YSTEP; - } - if (!applet->info[i].dwSize) - continue; - DrawIcon(hdc, x + (XSTEP-XICON)/2, y, applet->info[i].hIcon); - txtRect.left = x; - txtRect.right = x + XSTEP; - txtRect.top = y + YICON; - txtRect.bottom = y + YSTEP; - DrawTextW(hdc, applet->info[i].szName, -1, &txtRect, - DT_CENTER | DT_VCENTER); - x += XSTEP; - } - } - - SelectObject(hdc, hOldFont); - if (!wParam) - EndPaint(panel->hWnd, &ps); - - return 0; -} - -static LRESULT Control_WndProc_LButton(CPanel* panel, LPARAM lParam, BOOL up) -{ - unsigned i; - CPlApplet* applet; - - if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) - { - if (up) - { - if (panel->clkApplet == applet && panel->clkSP == i) - { - applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData); - } - } - else - { - panel->clkApplet = applet; - panel->clkSP = i; - } - } - return 0; -} - -static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, - WPARAM lParam1, LPARAM lParam2) -{ - CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); - - if (panel || wMsg == WM_CREATE) - { - switch (wMsg) - { - case WM_CREATE: - Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); - return 0; - case WM_DESTROY: - { - CPlApplet *applet = panel->first; - while (applet) - applet = Control_UnloadApplet(applet); - - PostQuitMessage(0); - break; - } - case WM_PAINT: - return Control_WndProc_Paint(panel, lParam1); - case WM_LBUTTONUP: - return Control_WndProc_LButton(panel, lParam2, TRUE); - case WM_LBUTTONDOWN: - return Control_WndProc_LButton(panel, lParam2, FALSE); - /* EPP case WM_COMMAND: */ - /* EPP return Control_WndProc_Command(mwi, lParam1, lParam2); */ - } - } + wsprintfW(param, format, item->id); + ShellExecuteW(hWnd, verbOpen, item->applet->cmd, param, NULL, SW_SHOW); + } +} + +static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, + WPARAM lParam1, LPARAM lParam2) +{ + CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); + + if (panel || wMsg == WM_CREATE) { + switch (wMsg) { + case WM_CREATE: + Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); + return 0; + case WM_DESTROY: + { + CPlApplet *applet, *next; + LIST_FOR_EACH_ENTRY_SAFE( applet, next, &panel->applets, CPlApplet, entry ) + Control_UnloadApplet(applet); + } + Control_FreeCPlItems(hWnd, panel); + PostQuitMessage(0); + break; + case WM_COMMAND: + switch (LOWORD(lParam1)) + { + case IDM_CPANEL_EXIT: + SendMessageW(hWnd, WM_CLOSE, 0, 0); + return 0; + + case IDM_CPANEL_ABOUT: + { + WCHAR appName[MAX_STRING_LEN]; + HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), + IMAGE_ICON, 48, 48, LR_SHARED); + + LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, + sizeof(appName) / sizeof(appName[0])); + ShellAboutW(hWnd, appName, NULL, icon); + + return 0; + } + + case FCIDM_SHVIEW_BIGICON: + Control_UpdateListViewStyle(panel, LVS_ICON, FCIDM_SHVIEW_BIGICON); + return 0; + + case FCIDM_SHVIEW_SMALLICON: + Control_UpdateListViewStyle(panel, LVS_SMALLICON, FCIDM_SHVIEW_SMALLICON); + return 0; + + case FCIDM_SHVIEW_LISTVIEW: + Control_UpdateListViewStyle(panel, LVS_LIST, FCIDM_SHVIEW_LISTVIEW); + return 0; + + case FCIDM_SHVIEW_REPORTVIEW: + Control_UpdateListViewStyle(panel, LVS_REPORT, FCIDM_SHVIEW_REPORTVIEW); + return 0; + + default: + /* check if this is an applet */ + if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && + (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) + { + Control_StartApplet(hWnd, Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1))); + return 0; + } + + break; + } + + break; + + case WM_NOTIFY: + { + LPNMHDR nmh = (LPNMHDR) lParam2; + + switch (nmh->idFrom) + { + case IDC_LISTVIEW: + switch (nmh->code) + { + case NM_RETURN: + case NM_DBLCLK: + { + Control_StartApplet(hWnd, Control_GetCPlItem_From_ListView(panel)); + return 0; + } + case LVN_ITEMCHANGED: + { + CPlItem *item = Control_GetCPlItem_From_ListView(panel); + + /* update the status bar if item is valid */ + if (item) + SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].info); + else + SetWindowTextW(panel->hWndStatusBar, NULL); + + return 0; + } + } + + break; + } + + break; + } + + case WM_MENUSELECT: + /* check if this is an applet */ + if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && + (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) + { + CPlItem *item = Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)); + + /* update the status bar if item is valid */ + if (item) + SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].info); + } + else if ((HIWORD(lParam1) == 0xFFFF) && (lParam2 == 0)) + { + /* reset status bar description to that of the selected icon */ + CPlItem *item = Control_GetCPlItem_From_ListView(panel); + + if (item) + SetWindowTextW(panel->hWndStatusBar, item->applet->info[item->id].info); + else + SetWindowTextW(panel->hWndStatusBar, NULL); + + return 0; + } + else + SetWindowTextW(panel->hWndStatusBar, NULL); + + return 0; + + case WM_SIZE: + { + HDWP hdwp; + RECT sb; + + hdwp = BeginDeferWindowPos(2); + + if (hdwp == NULL) + break; + + GetClientRect(panel->hWndStatusBar, &sb); + + hdwp = DeferWindowPos(hdwp, panel->hWndListView, NULL, 0, 0, + LOWORD(lParam2), HIWORD(lParam2) - (sb.bottom - sb.top), + SWP_NOZORDER | SWP_NOMOVE); + + if (hdwp == NULL) + break; + + hdwp = DeferWindowPos(hdwp, panel->hWndStatusBar, NULL, 0, 0, + LOWORD(lParam2), LOWORD(lParam1), SWP_NOZORDER | SWP_NOMOVE); + + if (hdwp != NULL) + EndDeferWindowPos(hdwp); + + return 0; + } + } + } return DefWindowProcW(hWnd, wMsg, lParam1, lParam2); } -static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) -{ - WNDCLASSW wc; - MSG msg; - const WCHAR* appName = L"ReactOS Control Panel"; +static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) +{ + WNDCLASSEXW wc; + MSG msg; + WCHAR appName[MAX_STRING_LEN]; + const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', + 'l','_','W','n','d','C','l','a','s','s',0}; + + LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); + + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW|CS_VREDRAW; wc.lpfnWndProc = Control_WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); - wc.hInstance = hInst; - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); + wc.hInstance = panel->hInst = hInst; + wc.hIcon = LoadIconW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL) ); + wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); + wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; - wc.lpszClassName = L"Shell_Control_WndClass"; - - if (!RegisterClassW(&wc)) return; + wc.lpszClassName = className; + wc.hIconSm = LoadImageW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + if (!RegisterClassExW(&wc)) return; CreateWindowExW(0, wc.lpszClassName, appName, - WS_OVERLAPPEDWINDOW | WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - hWnd, NULL, hInst, panel); - - if (!panel->hWnd) - return; - - if (!panel->first) - { - /* FIXME appName & message should be localized */ - MessageBoxW(panel->hWnd, L"Cannot load any applets", appName, MB_OK); - return; - } - - while (GetMessageW(&msg, panel->hWnd, 0, 0)) - { + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, NULL, hInst, panel); + if (!panel->hWnd) return; + + while (GetMessageW(&msg, panel->hWnd, 0, 0)) { TranslateMessage(&msg); DispatchMessageW(&msg); } } -static void Control_DoWindow(CPanel *panel, HWND hWnd, HINSTANCE hInst) -{ - HANDLE hFind; - WIN32_FIND_DATAW wfd; - WCHAR wszPath[MAX_PATH]; - WCHAR *Ptr = wszPath; - - Ptr += GetSystemDirectoryW(wszPath, MAX_PATH); - *Ptr++ = '\\'; - wcscpy(Ptr, L"*.cpl"); - - hFind = FindFirstFileW(wszPath, &wfd); - if (hFind != INVALID_HANDLE_VALUE) +static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_root, LPCWSTR szRepPath) +{ + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; + HKEY hkey; + + if (RegOpenKeyW(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) { - do + int idx = 0; + + for(;; ++idx) { - wcscpy(Ptr, wfd.cFileName); - Control_LoadApplet(hWnd, wszPath, panel); - } while (FindNextFileW(hFind, &wfd)); - FindClose(hFind); - } + DWORD nameLen = MAX_PATH; + DWORD valueLen = MAX_PATH; + + if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS) + break; + + Control_LoadApplet(hWnd, value, panel); + } + RegCloseKey(hkey); + } +} + +static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) +{ + HANDLE h; + WIN32_FIND_DATAW fd; + WCHAR buffer[MAX_PATH]; + static const WCHAR wszAllCpl[] = {'*','.','c','p','l',0}; + static const WCHAR wszRegPath[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','C','p','l','s',0}; + WCHAR *p; + + /* first add .cpl files in the system directory */ + GetSystemDirectoryW( buffer, MAX_PATH ); + p = buffer + strlenW(buffer); + *p++ = '\\'; + lstrcpyW(p, wszAllCpl); + + if ((h = FindFirstFileW(buffer, &fd)) != INVALID_HANDLE_VALUE) { + do { + lstrcpyW(p, fd.cFileName); + Control_LoadApplet(hWnd, buffer, panel); + } while (FindNextFileW(h, &fd)); + FindClose(h); + } + + /* now check for cpls in the registry */ + Control_RegisterRegistryApplets(hWnd, panel, HKEY_LOCAL_MACHINE, wszRegPath); + Control_RegisterRegistryApplets(hWnd, panel, HKEY_CURRENT_USER, wszRegPath); Control_DoInterface(panel, hWnd, hInst); } -static void Control_DoLaunch(CPanel *pPanel, HWND hWnd, LPCWSTR pwszCmd) -{ - HANDLE hMutex; - - /* Make a pwszCmd copy so we can modify it */ - LPWSTR pwszCmdCopy = _wcsdup(pwszCmd); - - LPWSTR pwszPath = pwszCmdCopy, pwszArg = NULL, pwszArg2 = NULL; - if (!pwszCmdCopy) - return; - - /* Path can be quoted */ - if (pwszPath[0] == L'"') +#else +static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) +{ + ShellExecuteW(NULL, + L"open", + L"explorer.exe", + L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", + NULL, + SW_SHOWDEFAULT); +} +#endif + +static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) + /* forms to parse: + * foo.cpl,@sp,str + * foo.cpl,@sp + * foo.cpl,,str + * foo.cpl @sp + * foo.cpl str + * "a path\foo.cpl" + */ +{ + LPWSTR buffer; + LPWSTR beg = NULL; + LPWSTR end; + WCHAR ch; + LPWSTR ptr; + signed sp = -1; + LPWSTR extraPmtsBuf = NULL; + LPWSTR extraPmts = NULL; + BOOL quoted = FALSE; + CPlApplet *applet; + + buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); + if (!buffer) return; + + end = lstrcpyW(buffer, wszCmd); + + for (;;) { + ch = *end; + if (ch == '"') quoted = !quoted; + if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { + *end = '\0'; + if (beg) { + if (*beg == '@') { + sp = atoiW(beg + 1); + } else if (*beg == '\0') { + sp = -1; + } else { + extraPmtsBuf = beg; + } + } + if (ch == '\0') break; + beg = end + 1; + if (ch == ' ') while (end[1] == ' ') end++; + } + end++; + } + while ((ptr = StrChrW(buffer, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + + /* now check for any quotes in extraPmtsBuf and remove */ + if (extraPmtsBuf != NULL) { - ++pwszPath; - pwszArg = wcschr(pwszPath, L'"'); - if (pwszArg) - *(pwszArg++) = '\0'; - } - else - pwszArg = pwszCmdCopy; - - /* First argument starts after space or ','. Note: we ignore characters between '"' and ',' or ' '. */ - if (pwszArg) - pwszArg = wcspbrk(pwszArg, L" ,"); - if (pwszArg) + beg = end = extraPmtsBuf; + quoted = FALSE; + + for (;;) { + ch = *end; + if (ch == '"') quoted = !quoted; + if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { + *end = '\0'; + if (beg) { + if (*beg != '\0') { + extraPmts = beg; + } + } + if (ch == '\0') break; + beg = end + 1; + if (ch == ' ') while (end[1] == ' ') end++; + } + end++; + } + + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + + if (extraPmts == NULL) + extraPmts = extraPmtsBuf; + } + + /* Now check if there had been a numerical value in the extra params */ + if ((extraPmts) && (*extraPmts == '@') && (sp == -1)) { + sp = atoiW(extraPmts + 1); + } + + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); + + applet = Control_LoadApplet(hWnd, buffer, panel); + if (applet) { - /* NULL terminate path and find first character of arg */ - *(pwszArg++) = L'\0'; - if (pwszArg[0] == L'"') - { - ++pwszArg; - pwszArg2 = wcschr(pwszArg, L'"'); - if (pwszArg2) - *(pwszArg2++) = L'\0'; - } else - pwszArg2 = pwszArg; - - /* Second argument always starts with ','. Note: we ignore characters between '"' and ','. */ - if (pwszArg2) - pwszArg2 = wcschr(pwszArg2, L','); - } - - TRACE("Launch %ls, arg %ls, arg2 %ls\n", pwszPath, pwszArg, pwszArg2); - - /* Create a mutex to disallow running multiple instances */ - hMutex = CreateMutexW(NULL, TRUE, PathFindFileNameW(pwszPath)); - if (!hMutex || GetLastError() == ERROR_ALREADY_EXISTS) - { - TRACE("Next instance disallowed\n"); - if (hMutex) - CloseHandle(hMutex); - return; - } - - /* Load applet cpl */ - TRACE("Load applet %ls\n", pwszPath); - Control_LoadApplet(hWnd, pwszPath, pPanel); - if (pPanel->first) - { - INT i = 0; - /* First pPanel applet is the new one */ - CPlApplet *pApplet = pPanel->first; - assert(pApplet && pApplet->next == NULL); - TRACE("pApplet->count %d\n", pApplet->count); - - /* Note: if there is only one applet, first argument is ignored */ - if (pApplet->count > 1 && pwszArg && pwszArg[0]) - { - /* If arg begins with '@', number specifies applet index */ - if (pwszArg[0] == L'@') - i = _wtoi(pwszArg + 1); - else - { - /* Otherwise it's applet name */ - for (i = 0; i < (INT)pApplet->count; ++i) - if (!wcscmp(pwszArg, pApplet->info[i].szName)) - break; + /* we've been given a textual parameter (or none at all) */ + if (sp == -1) { + while ((++sp) != applet->count) { + TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].name)); + + if (StrCmpIW(extraPmts, applet->info[sp].name) == 0) + break; } } - if (i >= 0 && i < (INT)pApplet->count && pApplet->info[i].dwSize) - { - /* Start the applet */ - TRACE("Starting applet %d\n", i); - if (!pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSW, i, (LPARAM)pwszArg)) - pApplet->proc(pApplet->hWnd, CPL_DBLCLK, i, pApplet->info[i].lData); - } else - ERR("Applet not found: %ls\n", pwszArg ? pwszArg : L"NULL"); - - Control_UnloadApplet(pApplet); - } - else - ERR("Failed to load applet %ls\n", pwszPath); - - ReleaseMutex(hMutex); - CloseHandle(hMutex); - free(pwszCmdCopy); + if (sp >= applet->count) { + WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); + sp = 0; + } + + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) + applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); + + Control_UnloadApplet(applet); + } + + HeapFree(GetProcessHeap(), 0, buffer); } /************************************************************************* - * Control_RunDLLW [SHELL32.@] + * Control_RunDLLW [SHELL32.@] * */ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) { - CPanel Panel; + CPanel panel; TRACE("(%p, %p, %s, 0x%08x)\n", hWnd, hInst, debugstr_w(cmd), nCmdShow); - memset(&Panel, 0, sizeof(Panel)); - - if (!cmd || !*cmd) - { - TRACE("[shell32, Control_RunDLLW] Calling Control_DoWindow\n"); - Control_DoWindow(&Panel, hWnd, hInst); - } - else - { - TRACE("[shell32, Control_RunDLLW] Calling Control_DoLaunch\n"); - Control_DoLaunch(&Panel, hWnd, cmd); +#ifndef __REACTOS__ + memset(&panel, 0, sizeof(panel)); + list_init( &panel.applets ); +#endif + + if (!cmd || !*cmd) { + Control_DoWindow(&panel, hWnd, hInst); + } else { + Control_DoLaunch(&panel, hWnd, cmd); } } @@ -537,6 +887,7 @@ } +#ifdef __REACTOS__ /************************************************************************* * RunDll_CallEntry16 [SHELL32.122] * the name is OK (when written with Dll, and not DLL as in Wine!) @@ -544,35 +895,19 @@ void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) { -#if !defined(__CYGWIN__) && !defined (__MINGW32__) && !defined(_MSC_VER) - WORD args[5]; - SEGPTR cmdline_seg; - - TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", - proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); - - cmdline_seg = MapLS( cmdline ); - args[4] = HWND_16(hwnd); - args[3] = MapHModuleLS(inst); - args[2] = SELECTOROF(cmdline_seg); - args[1] = OFFSETOF(cmdline_seg); - args[0] = cmdshow; - WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); - UnMapLS( cmdline_seg ); -#else FIXME( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); +} #endif -} /************************************************************************* - * CallCPLEntry16 [SHELL32.166] + * CallCPLEntry16 [SHELL32.166] * * called by desk.cpl on "Advanced" with: * hMod("DeskCp16.Dll"), pFunc("CplApplet"), 0, 1, 0xc, 0 * */ -LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6) +DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) { FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; Copied: trunk/reactos/dll/win32/shell32/wine/cpanel.h (from r68842, trunk/reactos/dll/win32/shell32/cpanel.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cpa… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/cpanel.h [iso-8859-1] Fri Aug 28 10:36:35 2015 @@ -20,31 +20,62 @@ #ifndef __WINE_SHELL_CPANEL_H #define __WINE_SHELL_CPANEL_H +#ifdef __cplusplus +extern "C" { +#endif + #include <cpl.h> -typedef struct CPlApplet +struct applet_info { - struct CPlApplet *next; /* linked list */ - HWND hWnd; - LPWSTR cmd; /* path to applet */ - unsigned count; /* number of subprograms */ - HMODULE hModule; /* module of loaded applet */ - APPLET_PROC proc; /* entry point address */ - NEWCPLINFOW info[1]; /* array of count information. - * dwSize field is 0 if entry is invalid */ + LONG_PTR data; +#ifdef __REACTOS__ + int idIcon; +#endif + HICON icon; + WCHAR name[256]; + WCHAR info[256]; + WCHAR helpfile[128]; +}; + +typedef struct CPlApplet { +#ifndef __REACTOS__ + struct list entry; +#endif + HWND hWnd; + LPWSTR cmd; /* path to applet */ + unsigned count; /* number of subprograms */ + HMODULE hModule; /* module of loaded applet */ + APPLET_PROC proc; /* entry point address */ + struct applet_info info[1]; /* array of count information */ } CPlApplet; -typedef struct CPanel -{ - CPlApplet *first; /* linked list */ - HWND hWnd; - unsigned status; - CPlApplet *clkApplet; - unsigned clkSP; +#ifndef __REACTOS__ +typedef struct CPanel { + struct list applets; + HWND hWnd; + HINSTANCE hInst; + unsigned total_subprogs; + HWND hWndListView; + HIMAGELIST hImageListLarge; + HIMAGELIST hImageListSmall; + HWND hWndStatusBar; } CPanel; +/* structure to reference an individual control panel item */ +typedef struct CPlItem { + CPlApplet *applet; + unsigned id; +} CPlItem; +#else +typedef int CPanel; +#endif -EXTERN_C CPlApplet *Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel); -EXTERN_C CPlApplet *Control_UnloadApplet(CPlApplet* applet); +CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) DECLSPEC_HIDDEN; +void Control_UnloadApplet(CPlApplet* applet) DECLSPEC_HIDDEN; + +#ifdef __cplusplus +} /* extern "C" */ +#endif #endif /* __WINE_SHELL_CPANEL_H */ Modified: trunk/reactos/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/pid… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] Fri Aug 28 10:36:35 2015 @@ -2165,6 +2165,12 @@ case PT_VALUEW: return (LPWSTR)pdata->u.file.szNames; + +#ifdef __REACTOS__ /* r54423 */ + case PT_CPLAPPLET: + return pdata->u.cpanel.szName; +#endif + } return NULL; } @@ -2209,11 +2215,6 @@ case PT_NETPROVIDER: case PT_SHARE: return pdata->u.network.szNames; - -#ifdef __REACTOS__ /* r54423 */ - case PT_CPLAPPLET: - return pdata->u.cpanel.szName; -#endif } return NULL; } Modified: trunk/reactos/dll/win32/shell32/wine/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/pid… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/pidl.h [iso-8859-1] Fri Aug 28 10:36:35 2015 @@ -113,7 +113,7 @@ DWORD iconIdx; /*02 negative icon ID */ WORD offsDispName; /*06*/ WORD offsComment; /*08*/ - CHAR szName[1]; /*10*/ /* terminated by 0x00, followed by display name and comment string */ + WCHAR szName[1]; /*10*/ /* terminated by 0x00, followed by display name and comment string */ } PIDLCPanelStruct; #ifdef __REACTOS__

9 years, 3 months

[gadamopoulos] 68844: [SHELLUTILS] - Add a helper function SHSetStrRet that will simplify setting the contents of a STRRET.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 28 10:32:02 2015 New Revision: 68844 URL: http://svn.reactos.org/svn/reactos?rev=68844&view=rev Log: [SHELLUTILS] - Add a helper function SHSetStrRet that will simplify setting the contents of a STRRET. Modified: trunk/reactos/include/reactos/shellutils.h Modified: trunk/reactos/include/reactos/shellutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shellutils… ============================================================================== --- trunk/reactos/include/reactos/shellutils.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shellutils.h [iso-8859-1] Fri Aug 28 10:32:02 2015 @@ -485,6 +485,37 @@ return S_OK; } + +HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCSTR pstrValue) +{ + pStrRet->uType = STRRET_CSTR; + strcpy(pStrRet->cStr, pstrValue); + return S_OK; +} + +HRESULT inline SHSetStrRet(LPSTRRET pStrRet, LPCWSTR pwstrValue) +{ + ULONG cchr = wcslen(pwstrValue); + LPWSTR buffer = static_cast<LPWSTR>(CoTaskMemAlloc((cchr + 1) * sizeof(WCHAR))); + if (buffer == NULL) + return E_OUTOFMEMORY; + + pStrRet->uType = STRRET_WSTR; + pStrRet->pOleStr = buffer; + wcscpy(buffer, pwstrValue); + return S_OK; +} + +HRESULT inline SHSetStrRet(LPSTRRET pStrRet, HINSTANCE hInstance, DWORD resId) +{ + WCHAR Buffer[MAX_PATH]; + + if (!LoadStringW(hInstance, resId, Buffer, MAX_PATH)) + return E_FAIL; + + return SHSetStrRet(pStrRet, Buffer); +} + #endif /* __cplusplus */ #endif /* __ROS_SHELL_UTILS_H */

9 years, 3 months

[akhaldi] 68843: [CMAKE] Fix broken PCH handling since r67483.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 28 09:24:39 2015 New Revision: 68843 URL: http://svn.reactos.org/svn/reactos?rev=68843&view=rev Log: [CMAKE] Fix broken PCH handling since r67483. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68843&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Aug 28 09:24:39 2015 @@ -151,7 +151,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION MATCHES "ReactOS" AND MSVC_VERSION LESS 1900) + if(CMAKE_VERSION MATCHES "ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

9 years, 3 months

[pschweitzer] 68842: [NTOSKRNL] Fix build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Aug 28 06:19:31 2015 New Revision: 68842 URL: http://svn.reactos.org/svn/reactos?rev=68842&view=rev Log: [NTOSKRNL] Fix build Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 28 06:19:31 2015 @@ -1277,11 +1277,13 @@ TrapFrame); if (NT_SUCCESS(Status)) { +#ifdef _WINKD_ /* * We succeeded. Check whether the kernel debugger has * owed breakpoints to be inserted, then return. */ KdSetOwedBreakpoints(); +#endif KiEoiHelper(TrapFrame); }

9 years, 3 months

[hbelusca] 68841: [NTOS:KD] - Fix the condition check when setting twice (or more) the same breakpoint. - Implement support for deferred breakpoints. For more information, see: http://www.osronline...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 28 03:03:26 2015 New Revision: 68841 URL: http://svn.reactos.org/svn/reactos?rev=68841&view=rev Log: [NTOS:KD] - Fix the condition check when setting twice (or more) the same breakpoint. - Implement support for deferred breakpoints. For more information, see: http://www.osronline.com/article.cfm?article=541 (which also exposes an interesting problem about them). Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/ke/amd64/cpu.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -67,7 +67,7 @@ IN PROSSYM_INFO RosSymInfo, IN ULONG_PTR RelativeAddress, #ifdef __ROS_DWARF__ - IN PROSSYM_LINEINFO RosSymLineInfo + IN PROSSYM_LINEINFO RosSymLineInfo #else OUT PULONG LineNumber OPTIONAL, OUT PCH FileName OPTIONAL, Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -7,11 +7,6 @@ */ // -// Maximum supported number of breakpoints -// -#define KD_BREAKPOINT_MAX 32 - -// // Default size of the DbgPrint log buffer // #if DBG @@ -21,15 +16,29 @@ #endif // +// Maximum supported number of breakpoints +// +#define KD_BREAKPOINT_MAX 32 + +// +// Highest limit starting which we consider that breakpoint addresses +// are either in system space, or in user space but inside shared DLLs. +// +// I'm wondering whether this can be computed using MmHighestUserAddress +// or whether there is already some #define somewhere else... +// See http://www.drdobbs.com/windows/faster-dll-load-load/184416918 +// and http://www.drdobbs.com/rebasing-win32-dlls/184416272 +// for a tentative explanation. +// +#define KD_HIGHEST_USER_BREAKPOINT_ADDRESS (PVOID)0x60000000 // MmHighestUserAddress + +// // Breakpoint Status Flags // -typedef enum _KDP_BREAKPOINT_FLAGS -{ - KdpBreakpointActive = 1, - KdpBreakpointPending = 2, - KdpBreakpointSuspended = 4, - KdpBreakpointExpired = 8 -} KDP_BREAKPOINT_FLAGS; +#define KD_BREAKPOINT_ACTIVE 0x01 +#define KD_BREAKPOINT_PENDING 0x02 +#define KD_BREAKPOINT_SUSPENDED 0x04 +#define KD_BREAKPOINT_EXPIRED 0x08 // // Structure for Breakpoints @@ -37,7 +46,7 @@ typedef struct _BREAKPOINT_ENTRY { ULONG Flags; - PKPROCESS Process; + ULONG_PTR DirectoryTableBase; PVOID Address; KD_BREAKPOINT_TYPE Content; } BREAKPOINT_ENTRY, *PBREAKPOINT_ENTRY; @@ -280,6 +289,12 @@ NTAPI KdpAddBreakpoint( IN PVOID Address +); + +VOID +NTAPI +KdSetOwedBreakpoints( + VOID ); BOOLEAN Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -23,18 +23,18 @@ ULONG i; NTSTATUS Status; - /* Loop current breakpoints */ + /* Check whether we are not setting a breakpoint twice */ for (i = 0; i < KD_BREAKPOINT_MAX; i++) { /* Check if the breakpoint is valid */ - if ((KdpBreakpointTable[i].Flags & KdpBreakpointActive) && + if ((KdpBreakpointTable[i].Flags & KD_BREAKPOINT_ACTIVE) && (KdpBreakpointTable[i].Address == Address)) { - /* Check if it's pending */ - if ((KdpBreakpointTable[i].Flags & KdpBreakpointPending)) - { - /* It's not pending anymore now */ - KdpBreakpointTable[i].Flags &= ~KdpBreakpointPending; + /* Were we not able to remove it earlier? */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Just re-use it! */ + KdpBreakpointTable[i].Flags &= ~KD_BREAKPOINT_EXPIRED; return i + 1; } else @@ -46,33 +46,246 @@ } /* Find a free entry */ - for (i = 0; i < KD_BREAKPOINT_MAX; i++) if (!(KdpBreakpointTable[i].Flags)) break; + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + if (KdpBreakpointTable[i].Flags == 0) + break; + } /* Fail if no free entry was found */ if (i == KD_BREAKPOINT_MAX) return 0; - /* Save the old instruction */ + /* Save the breakpoint */ + KdpBreakpointTable[i].Address = Address; + + /* If we are setting the breakpoint in user space, save the active process context */ + if (Address < KD_HIGHEST_USER_BREAKPOINT_ADDRESS) + KdpBreakpointTable[i].DirectoryTableBase = KeGetCurrentThread()->ApcState.Process->DirectoryTableBase[0]; + + /* Try to save the old instruction */ Status = KdpCopyMemoryChunks((ULONG_PTR)Address, &Content, KD_BREAKPOINT_SIZE, 0, MMDBG_COPY_UNSAFE, NULL); - + if (NT_SUCCESS(Status)) + { + /* Memory accessible, set the breakpoint */ + KdpBreakpointTable[i].Content = Content; + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE; + + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); + } + } + else + { + /* Memory is inaccessible now, setting breakpoint is deferred */ + KdpDprintf("Failed to set breakpoint at address 0x%p, adding deferred breakpoint.\n", Address); + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE | KD_BREAKPOINT_PENDING; + KdpOweBreakpoint = TRUE; + } + + /* Return the breakpoint handle */ + return i + 1; +} + +VOID +NTAPI +KdSetOwedBreakpoints(VOID) +{ + BOOLEAN Enable; + KD_BREAKPOINT_TYPE Content; + ULONG i; + NTSTATUS Status; + + /* If we don't owe any breakpoints, just return */ + if (!KdpOweBreakpoint) return; + + /* Enter the debugger */ + Enable = KdEnterDebugger(NULL, NULL); + + /* + * Suppose we succeed in setting all the breakpoints. + * If we fail to do so, the flag will be set again. + */ + KdpOweBreakpoint = FALSE; + + /* Loop through current breakpoints and try to set or delete the pending ones */ + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + if (KdpBreakpointTable[i].Flags & (KD_BREAKPOINT_PENDING | KD_BREAKPOINT_EXPIRED)) + { + /* + * Set the breakpoint only if it is in kernel space, or if it is + * in user space and the active process context matches. + */ + if (KdpBreakpointTable[i].Address < KD_HIGHEST_USER_BREAKPOINT_ADDRESS && + KdpBreakpointTable[i].DirectoryTableBase != KeGetCurrentThread()->ApcState.Process->DirectoryTableBase[0]) + { + KdpOweBreakpoint = TRUE; + continue; + } + + /* Try to save the old instruction */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Memory is still inaccessible, breakpoint setting will be deferred again */ + // KdpDprintf("Failed to set deferred breakpoint at address 0x%p\n", + // KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + continue; + } + + /* Check if we need to write the breakpoint */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_PENDING) + { + /* Memory accessible, set the breakpoint */ + KdpBreakpointTable[i].Content = Content; + + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write deferred breakpoint to address 0x%p\n", + KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + } + else + { + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE; + } + + continue; + } + + /* Check if we need to restore the original instruction */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Write it back */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &KdpBreakpointTable[i].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Failed to delete deferred breakpoint at address 0x%p\n", + KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + } + else + { + /* Check if the breakpoint is suspended */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_SUSPENDED) + { + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_SUSPENDED | KD_BREAKPOINT_ACTIVE; + } + else + { + /* Invalidate it */ + KdpBreakpointTable[i].Flags = 0; + } + } + + continue; + } + } + } + + /* Exit the debugger */ + KdExitDebugger(Enable); +} + +BOOLEAN +NTAPI +KdpLowWriteContent(IN ULONG BpIndex) +{ + NTSTATUS Status; + + /* Make sure that the breakpoint is actually active */ + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_PENDING) + { + /* So we have a valid breakpoint, but it hasn't been used yet... */ + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_PENDING; + return TRUE; + } + + /* Is the original instruction a breakpoint anyway? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Then leave it that way... */ + return TRUE; + } + + /* We have an active breakpoint with an instruction to bring back. Do it. */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex].Address, + &KdpBreakpointTable[BpIndex].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); if (!NT_SUCCESS(Status)) { - /* TODO: Set it as a owed breakpoint */ - KdpDprintf("Failed to set breakpoint at address 0x%p\n", Address); - return 0; - } - - /* Write the entry */ - KdpBreakpointTable[i].Address = Address; - KdpBreakpointTable[i].Content = Content; - KdpBreakpointTable[i].Flags = KdpBreakpointActive; - - /* Write the breakpoint */ - Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + /* Memory is inaccessible now, restoring original instruction is deferred */ + KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_EXPIRED; + KdpOweBreakpoint = TRUE; + return FALSE; + } + + /* Everything went fine, return */ + return TRUE; +} + +BOOLEAN +NTAPI +KdpLowRestoreBreakpoint(IN ULONG BpIndex) +{ + NTSTATUS Status; + + /* Were we not able to remove it earlier? */ + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Just re-use it! */ + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_EXPIRED; + return TRUE; + } + + /* Are we merely writing a breakpoint on top of another breakpoint? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Nothing to do */ + return TRUE; + } + + /* Ok, we actually have to overwrite the instruction now */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex].Address, &KdpBreakpointInstruction, KD_BREAKPOINT_SIZE, 0, @@ -80,94 +293,15 @@ NULL); if (!NT_SUCCESS(Status)) { - /* This should never happen */ - KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); - } - - /* Return the breakpoint handle */ - return i + 1; -} - -BOOLEAN -NTAPI -KdpLowWriteContent(IN ULONG BpIndex) -{ - NTSTATUS Status; - - /* Make sure that the breakpoint is actually active */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointPending) - { - /* So we have a valid breakpoint, but it hasn't been used yet... */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; - return TRUE; - } - - /* Is the original instruction a breakpoint anyway? */ - if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) - { - /* Then leave it that way... */ - return TRUE; - } - - /* We have an active breakpoint with an instruction to bring back. Do it. */ - Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. - Address, - &KdpBreakpointTable[BpIndex].Content, - KD_BREAKPOINT_SIZE, - 0, - MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, - NULL); - if (!NT_SUCCESS(Status)) - { - /* TODO: Set it as a owed breakpoint */ - KdpDprintf("Failed to delete breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); - return FALSE; - } - - /* Everything went fine, return */ - return TRUE; -} - -BOOLEAN -NTAPI -KdpLowRestoreBreakpoint(IN ULONG BpIndex) -{ - NTSTATUS Status; - - /* Were we not able to remove it earlier? */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired) - { - /* Well then, we'll just re-use it and return success! */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointExpired; - return TRUE; - } - - /* Are we merely writing a breakpoint on top of another breakpoint? */ - if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) - { - /* Nothing to do then... */ - return TRUE; - } - - /* Ok, we actually have to overwrite the instruction now */ - Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. - Address, - &KdpBreakpointInstruction, - KD_BREAKPOINT_SIZE, - 0, - MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, - NULL); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Set it as a owed breakpoint */ KdpDprintf("Failed to restore breakpoint at address 0x%p\n", KdpBreakpointTable[BpIndex].Address); + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_PENDING; + KdpOweBreakpoint = TRUE; return FALSE; } /* Clear any possible previous pending flag and return success */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_PENDING; return TRUE; } @@ -178,16 +312,16 @@ ULONG BpIndex = BpEntry - 1; /* Check for invalid breakpoint entry */ - if (!(BpEntry) || (BpEntry > KD_BREAKPOINT_MAX)) return FALSE; + if (!BpEntry || (BpEntry > KD_BREAKPOINT_MAX)) return FALSE; /* If the specified breakpoint table entry is not valid, then return FALSE. */ if (!KdpBreakpointTable[BpIndex].Flags) return FALSE; /* Check if the breakpoint is suspended */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended) - { - /* Check if breakpoint is not ...? */ - if (!(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired)) + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED) + { + /* Check if breakpoint is not being deleted */ + if (!(KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_EXPIRED)) { /* Invalidate it and return success */ KdpBreakpointTable[BpIndex].Flags = 0; @@ -215,7 +349,7 @@ for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Make sure that the breakpoint is active and matches the range. */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && ((KdpBreakpointTable[BpIndex].Address >= Base) && (KdpBreakpointTable[BpIndex].Address <= Limit))) { @@ -241,11 +375,11 @@ for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Check if they are valid, suspended breakpoints */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && - (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && + (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED)) { /* Unsuspend them */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointSuspended; + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_SUSPENDED; KdpLowRestoreBreakpoint(BpIndex); } } @@ -258,11 +392,11 @@ ULONG BpIndex = BpEntry - 1; /* Check if this is a valid, unsuspended breakpoint */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && - !(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && + !(KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED)) { /* Suspend it */ - KdpBreakpointTable[BpIndex].Flags |= KdpBreakpointSuspended; + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_SUSPENDED; KdpLowWriteContent(BpIndex); } } Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -281,7 +281,7 @@ KdDebuggerDataBlock.KernBase = (ULONG_PTR)KdVersionBlock.KernBase; /* Initialize the debugger if requested */ - if ((EnableKd) && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) + if (EnableKd && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) { /* Now set our real KD routine */ KiDebugRoutine = KdpTrap; @@ -289,9 +289,18 @@ /* Check if we've already initialized our structures */ if (!KdpDebuggerStructuresInitialized) { - /* Set the Debug Switch Routine and Retries*/ + /* Set the Debug Switch Routine and Retries */ KdpContext.KdpDefaultRetries = 20; KiDebugSwitchRoutine = KdpSwitchProcessor; + + /* Initialize breakpoints owed flag and table */ + KdpOweBreakpoint = FALSE; + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + KdpBreakpointTable[i].Flags = 0; + KdpBreakpointTable[i].DirectoryTableBase = 0; + KdpBreakpointTable[i].Address = NULL; + } /* Initialize the Time Slip DPC */ KeInitializeDpc(&KdpTimeSlipDpc, KdpTimeSlipDpcRoutine, NULL); Modified: trunk/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/cpu.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -136,7 +136,7 @@ { PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; - ULONG FeatureBits = KF_WORKING_PTE;; + ULONG FeatureBits = KF_WORKING_PTE; CPU_INFO CpuInfo; /* Get the Vendor ID */ Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -15,6 +15,7 @@ EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC +EXTERN KdSetOwedBreakpoints:PROC EXTERN KiSystemFatalException:PROC EXTERN KiNpxNotAvailableFaultHandler:PROC EXTERN KiGeneralProtectionFaultHandler:PROC @@ -508,8 +509,16 @@ /* Check for success */ test eax, eax - jge PageFaultReturn - + jl PageFaultError + + /* + * We succeeded. Check whether the kernel debugger has + * owed breakpoints to be inserted, then return. + */ + call KdSetOwedBreakpoints + jmp PageFaultReturn + +PageFaultError: /* Disable interrupts again for the debugger */ cli @@ -527,7 +536,6 @@ je SpecialCode InPageException: - /* Dispatch in-page exception */ mov r11d, eax // Param3 = Status mov eax, STATUS_IN_PAGE_ERROR // ExceptionCode Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -1275,7 +1275,15 @@ (PVOID)Cr2, KiUserTrap(TrapFrame), TrapFrame); - if (NT_SUCCESS(Status)) KiEoiHelper(TrapFrame); + if (NT_SUCCESS(Status)) + { + /* + * We succeeded. Check whether the kernel debugger has + * owed breakpoints to be inserted, then return. + */ + KdSetOwedBreakpoints(); + KiEoiHelper(TrapFrame); + } /* Check for syscall fault */ #if 0

9 years, 3 months

[akhaldi] 68840: [CMAKE] Introduce a way to use auto generation using bison and flex. Dedicated to Eric Kohl. CORE-10055

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 27 23:00:49 2015 New Revision: 68840 URL: http://svn.reactos.org/svn/reactos?rev=68840&view=rev Log: [CMAKE] Introduce a way to use auto generation using bison and flex. Dedicated to Eric Kohl. CORE-10055 Added: trunk/reactos/cmake/bison-flex.cmake (with props) Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68840&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 27 23:00:49 2015 @@ -74,6 +74,9 @@ if(NOT MSVC_IDE) unset(CMAKE_IMPORT_LIBRARY_SUFFIX) endif() + +# Bison and Flex support +# include(cmake/bison-flex.cmake) if(NOT CMAKE_CROSSCOMPILING) Added: trunk/reactos/cmake/bison-flex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/bison-flex.cmake?rev… ============================================================================== --- trunk/reactos/cmake/bison-flex.cmake (added) +++ trunk/reactos/cmake/bison-flex.cmake [iso-8859-1] Thu Aug 27 23:00:49 2015 @@ -0,0 +1,27 @@ + +# Simply use : +# add_bison_files(foo.y) +# and +# add_flex_files(foo.l) +# then add ${CMAKE_CURRENT_BINARY_DIR}/foo.tab.c +# and ${CMAKE_CURRENT_BINARY_DIR}/foo.yy.c to the source list + +function(add_bison_files) + foreach(_file ${ARGN}) + get_filename_component(_name ${_file} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.c ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.h + COMMAND bison -p ${_name}_ -o ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.c --defines=${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.h ${CMAKE_CURRENT_SOURCE_DIR}/${_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + endforeach() +endfunction() + +function(add_flex_files) + foreach(_file ${ARGN}) + get_filename_component(_name ${_file} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.c ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.h + COMMAND flex -o ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.c --header-file=${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.h ${CMAKE_CURRENT_SOURCE_DIR}/${_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + endforeach() +endfunction() Propchange: trunk/reactos/cmake/bison-flex.cmake ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[akhaldi] 68839: [CMAKE] Add and use baseaddress_msvc.cmake.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 27 22:35:06 2015 New Revision: 68839 URL: http://svn.reactos.org/svn/reactos?rev=68839&view=rev Log: [CMAKE] Add and use baseaddress_msvc.cmake. Added: trunk/reactos/cmake/baseaddress_msvc.cmake (with props) Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68839&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 27 22:35:06 2015 @@ -237,6 +237,8 @@ if(NO_ROSSYM) include(cmake/baseaddress_dwarf.cmake) + elseif(MSVC) + include(cmake/baseaddress_msvc.cmake) else() include(cmake/baseaddress.cmake) endif() Added: trunk/reactos/cmake/baseaddress_msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_msvc.cma… ============================================================================== --- trunk/reactos/cmake/baseaddress_msvc.cmake (added) +++ trunk/reactos/cmake/baseaddress_msvc.cmake [iso-8859-1] Thu Aug 27 22:35:06 2015 @@ -0,0 +1,346 @@ +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c7c0000) +set(baseaddress_msvcrt 0x7c750000) +set(baseaddress_advapi32 0x7c6e0000) +set(baseaddress_gdi32 0x7c690000) +set(baseaddress_user32 0x7c570000) +set(baseaddress_dhcpcsvc 0x7c530000) +set(baseaddress_dnsapi 0x7c4f0000) +set(baseaddress_icmp 0x7c4d0000) +set(baseaddress_iphlpapi 0x7c4a0000) +set(baseaddress_ws2_32 0x7c470000) +set(baseaddress_ws2help 0x7c450000) +set(baseaddress_shlwapi 0x7c3e0000) +set(baseaddress_rpcrt4 0x7c350000) +set(baseaddress_comctl32 0x7c250000) +set(baseaddress_ole32 0x7c150000) +set(baseaddress_winspool.drv 0x7c130000) +set(baseaddress_winmm 0x7c090000) +set(baseaddress_comdlg32 0x7bfc0000) +set(baseaddress_shell32 0x7b290000) +set(baseaddress_lz32 0x7b270000) +set(baseaddress_version 0x7b250000) +set(baseaddress_oleaut32 0x7b140000) +set(baseaddress_setupapi 0x7afc0000) +set(baseaddress_mpr 0x7af90000) +set(baseaddress_crypt32 0x7aed0000) +set(baseaddress_wininet 0x7ae50000) +set(baseaddress_urlmon 0x7adb0000) +set(baseaddress_psapi 0x7ad90000) +set(baseaddress_imm32 0x7ad60000) +set(baseaddress_msvfw32 0x7ad30000) +set(baseaddress_dbghelp 0x7acc0000) +set(baseaddress_devmgr 0x7ac40000) +set(baseaddress_msacm32 0x7ac10000) +set(baseaddress_netapi32 0x7abc0000) +set(baseaddress_powrprof 0x7aba0000) +set(baseaddress_secur32 0x7ab70000) +set(baseaddress_wintrust 0x7ab30000) +set(baseaddress_avicap32 0x7ab10000) +set(baseaddress_cabinet 0x7aad0000) +set(baseaddress_dsound 0x7aa70000) +set(baseaddress_glu32 0x7a9e0000) +set(baseaddress_opengl32 0x7a850000) +set(baseaddress_riched20 0x7a7d0000) +set(baseaddress_smdll 0x7a7b0000) +set(baseaddress_userenv 0x7a770000) +set(baseaddress_uxtheme 0x7a730000) +set(baseaddress_cryptui 0x7a6a0000) +set(baseaddress_csrsrv 0x7a670000) +set(baseaddress_basesrv 0x7a650000) +set(baseaddress_consrv 0x7a630000) +set(baseaddress_winsrv 0x7a590000) +set(baseaddress_dplayx 0x7a540000) +set(baseaddress_gdiplus 0x7a4c0000) +set(baseaddress_msimg32 0x7a4a0000) +set(baseaddress_mswsock 0x7a480000) +set(baseaddress_oledlg 0x7a440000) +set(baseaddress_rasapi32 0x7a420000) +set(baseaddress_rsaenh 0x7a3d0000) +set(baseaddress_samlib 0x7a3a0000) +set(baseaddress_sensapi 0x7a380000) +set(baseaddress_sfc_os 0x7a360000) +set(baseaddress_snmpapi 0x7a340000) +set(baseaddress_spoolss 0x7a310000) +set(baseaddress_usp10 0x7a2b0000) +set(baseaddress_acledit 0x7a290000) +set(baseaddress_aclui 0x7a260000) +set(baseaddress_activeds 0x7a240000) +set(baseaddress_actxprxy 0x7a140000) +set(baseaddress_advpack 0x7a110000) +set(baseaddress_amstream 0x7a0d0000) +set(baseaddress_atl 0x7a0a0000) +set(baseaddress_atl100 0x7a070000) +set(baseaddress_atl80 0x7a040000) +set(baseaddress_authz 0x7a020000) +set(baseaddress_avifil32 0x79fd0000) +set(baseaddress_batt 0x79fa0000) +set(baseaddress_bcrypt 0x79f80000) +set(baseaddress_beepmidi 0x79f60000) +set(baseaddress_browseui 0x79ee0000) +set(baseaddress_cards 0x79e20000) +set(baseaddress_cfgmgr32 0x79e00000) +set(baseaddress_clusapi 0x79de0000) +set(baseaddress_comcat 0x79dc0000) +set(baseaddress_compstui 0x79da0000) +set(baseaddress_console 0x79d30000) +set(baseaddress_credui 0x79cf0000) +set(baseaddress_crtdll 0x79ca0000) +set(baseaddress_cryptdlg 0x79c70000) +set(baseaddress_cryptdll 0x79c50000) +set(baseaddress_cryptnet 0x79c30000) +set(baseaddress_d3d8 0x79bf0000) +set(baseaddress_d3d8thk 0x79bd0000) +set(baseaddress_d3d9 0x79b80000) +set(baseaddress_d3dcompiler_43 0x79af0000) +set(baseaddress_d3drm 0x79a90000) +set(baseaddress_d3dwine 0x798c0000) +set(baseaddress_d3dx9_24 0x798a0000) +set(baseaddress_d3dx9_25 0x79870000) +set(baseaddress_d3dx9_26 0x79850000) +set(baseaddress_d3dx9_27 0x79830000) +set(baseaddress_d3dx9_28 0x79810000) +set(baseaddress_d3dx9_29 0x797f0000) +set(baseaddress_d3dx9_30 0x797d0000) +set(baseaddress_d3dx9_31 0x797b0000) +set(baseaddress_d3dx9_32 0x79790000) +set(baseaddress_d3dx9_33 0x79770000) +set(baseaddress_d3dx9_34 0x79750000) +set(baseaddress_d3dx9_35 0x79730000) +set(baseaddress_d3dx9_36 0x79690000) +set(baseaddress_d3dx9_37 0x79670000) +set(baseaddress_d3dx9_38 0x79650000) +set(baseaddress_d3dx9_39 0x79630000) +set(baseaddress_d3dx9_40 0x79610000) +set(baseaddress_d3dx9_41 0x795f0000) +set(baseaddress_d3dx9_42 0x795d0000) +set(baseaddress_d3dx9_43 0x795b0000) +set(baseaddress_d3dxof 0x79580000) +set(baseaddress_dciman32 0x79560000) +set(baseaddress_ddraw 0x794e0000) +set(baseaddress_deskadp 0x794b0000) +set(baseaddress_deskmon 0x79480000) +set(baseaddress_devcpux 0x79460000) +set(baseaddress_devenum 0x79430000) +set(baseaddress_dinput 0x793f0000) +set(baseaddress_dinput8 0x793d0000) +set(baseaddress_dmusic 0x79390000) +set(baseaddress_dplay 0x79370000) +set(baseaddress_dwmapi 0x79350000) +set(baseaddress_dxdiagn 0x79320000) +set(baseaddress_dxgi 0x792f0000) +set(baseaddress_faultrep 0x792d0000) +set(baseaddress_fltlib 0x792b0000) +set(baseaddress_fmifs 0x79290000) +set(baseaddress_fontext 0x79270000) +set(baseaddress_framebuf 0x79250000) +set(baseaddress_framebuf_new 0x79230000) +set(baseaddress_framedyn 0x79210000) +set(baseaddress_genincdata 0x791e0000) +set(baseaddress_getuname 0x78f10000) +set(baseaddress_hid 0x78ef0000) +set(baseaddress_hlink 0x78ec0000) +set(baseaddress_hnetcfg 0x78e90000) +set(baseaddress_httpapi 0x78e70000) +set(baseaddress_iccvid 0x78e50000) +set(baseaddress_ieframe 0x78dd0000) +set(baseaddress_iernonce 0x78db0000) +set(baseaddress_imagehlp 0x78d90000) +set(baseaddress_inetcomm 0x78d50000) +set(baseaddress_inetmib1 0x78d30000) +set(baseaddress_initpki 0x78d10000) +set(baseaddress_input 0x78cc0000) +set(baseaddress_inseng 0x78ca0000) +set(baseaddress_iologmsg 0x78c80000) +set(baseaddress_itircl 0x78c60000) +set(baseaddress_itss 0x78c30000) +set(baseaddress_jscript 0x78ba0000) +set(baseaddress_jsproxy 0x78b80000) +set(baseaddress_kbsdll 0x78b60000) +set(baseaddress_kdvbox 0x78b20000) +set(baseaddress_kernel32_vista 0x78b00000) +set(baseaddress_ksuser 0x78ae0000) +set(baseaddress_libjpeg 0x78a80000) +set(baseaddress_libpng 0x78a20000) +set(baseaddress_libtiff 0x78970000) +set(baseaddress_libxslt 0x787d0000) +set(baseaddress_loadperf 0x787b0000) +set(baseaddress_localspl 0x78780000) +set(baseaddress_localui 0x78750000) +set(baseaddress_lpk 0x78730000) +set(baseaddress_lsasrv 0x786f0000) +set(baseaddress_mapi32 0x786c0000) +set(baseaddress_mciavi32 0x78690000) +set(baseaddress_mcicda 0x78670000) +set(baseaddress_mciqtz32 0x78640000) +set(baseaddress_mciseq 0x78610000) +set(baseaddress_mciwave 0x785e0000) +set(baseaddress_mgmtapi 0x785c0000) +set(baseaddress_midimap 0x785a0000) +set(baseaddress_mlang 0x78570000) +set(baseaddress_mmdevapi 0x78540000) +set(baseaddress_mmdrv 0x78520000) +set(baseaddress_modemui 0x784b0000) +set(baseaddress_mprapi 0x78480000) +set(baseaddress_msafd 0x78450000) +set(baseaddress_mscat32 0x78430000) +set(baseaddress_mscms 0x78400000) +set(baseaddress_mscoree 0x783c0000) +set(baseaddress_msctf 0x78380000) +set(baseaddress_msdmo 0x78360000) +set(baseaddress_msftedit 0x78340000) +set(baseaddress_msgina 0x782c0000) +set(baseaddress_mshtml 0x78150000) +set(baseaddress_msi 0x78080000) +set(baseaddress_msimtf 0x78060000) +set(baseaddress_msisip 0x78040000) +set(baseaddress_mspatcha 0x78020000) +set(baseaddress_msports 0x77ff0000) +set(baseaddress_msrle32 0x77fc0000) +set(baseaddress_mssign32 0x77fa0000) +set(baseaddress_mssip32 0x77f80000) +set(baseaddress_mstask 0x77f50000) +set(baseaddress_msv1_0 0x77f30000) +set(baseaddress_msvcrt20 0x77eb0000) +set(baseaddress_msvcrt40 0x77e30000) +set(baseaddress_msvidc32 0x77e10000) +set(baseaddress_msxml 0x77de0000) +set(baseaddress_msxml2 0x77db0000) +set(baseaddress_msxml3 0x77b90000) +set(baseaddress_msxml4 0x77b50000) +set(baseaddress_msxml6 0x77b10000) +set(baseaddress_mycomput 0x77af0000) +set(baseaddress_nddeapi 0x77ad0000) +set(baseaddress_netcfgx 0x77a60000) +set(baseaddress_netevent 0x77a40000) +set(baseaddress_netid 0x77a00000) +set(baseaddress_netshell 0x779a0000) +set(baseaddress_newdev 0x77950000) +set(baseaddress_npptools 0x77930000) +set(baseaddress_ntdsapi 0x77910000) +set(baseaddress_ntlanman 0x778f0000) +set(baseaddress_ntmarta 0x778d0000) +set(baseaddress_ntobjshex 0x77850000) +set(baseaddress_ntprint 0x77830000) +set(baseaddress_objsel 0x77810000) +set(baseaddress_odbc32 0x777e0000) +set(baseaddress_odbccp32 0x777c0000) +set(baseaddress_oleacc 0x77770000) +set(baseaddress_olecli32 0x77750000) +set(baseaddress_olepro32 0x77730000) +set(baseaddress_olesvr32 0x77710000) +set(baseaddress_olethk32 0x776f0000) +set(baseaddress_pdh 0x776c0000) +set(baseaddress_pidgen 0x776a0000) +set(baseaddress_printui 0x77680000) +set(baseaddress_propsys 0x77650000) +set(baseaddress_pstorec 0x77630000) +set(baseaddress_qedit 0x77600000) +set(baseaddress_qmgr 0x775d0000) +set(baseaddress_qmgrprxy 0x77590000) +set(baseaddress_quartz 0x774b0000) +set(baseaddress_query 0x77490000) +set(baseaddress_rasadhlp 0x77470000) +set(baseaddress_rasdlg 0x772a0000) +set(baseaddress_rasman 0x77270000) +set(baseaddress_resutils 0x77250000) +set(baseaddress_riched32 0x77230000) +set(baseaddress_rsabase 0x77210000) +set(baseaddress_rshell 0x771c0000) +set(baseaddress_samsrv 0x77170000) +set(baseaddress_sccbase 0x77150000) +set(baseaddress_schannel 0x77120000) +set(baseaddress_schedsvc 0x77100000) +set(baseaddress_scrrun 0x770c0000) +set(baseaddress_security 0x770a0000) +set(baseaddress_serialui 0x77080000) +set(baseaddress_sfc 0x77060000) +set(baseaddress_shdoclc 0x77020000) +set(baseaddress_shdocvw 0x76fe0000) +set(baseaddress_shfolder 0x76fc0000) +set(baseaddress_shimgvw 0x76f80000) +set(baseaddress_slayer 0x76f50000) +set(baseaddress_slbcsp 0x76f30000) +set(baseaddress_sndblst 0x76f10000) +set(baseaddress_softpub 0x76ef0000) +set(baseaddress_srclient 0x76ed0000) +set(baseaddress_srvsvc 0x76ea0000) +set(baseaddress_sti 0x76e70000) +set(baseaddress_stobject 0x76e20000) +set(baseaddress_streamci 0x76e00000) +set(baseaddress_sxs 0x76de0000) +set(baseaddress_syssetup 0x76d40000) +set(baseaddress_t2embed 0x76d20000) +set(baseaddress_tapi32 0x76cf0000) +set(baseaddress_tapiui 0x76c70000) +set(baseaddress_testvdd 0x76c50000) +set(baseaddress_themeui 0x76c30000) +set(baseaddress_traffic 0x76c10000) +set(baseaddress_twain_32 0x76bf0000) +set(baseaddress_uext2 0x76bc0000) +set(baseaddress_ufat 0x76ba0000) +set(baseaddress_ufatx 0x76b80000) +set(baseaddress_umpnpmgr 0x76b50000) +set(baseaddress_untfs 0x76b30000) +set(baseaddress_updspapi 0x76b10000) +set(baseaddress_url 0x76af0000) +set(baseaddress_vbscript 0x76a90000) +set(baseaddress_vdmdbg 0x76a70000) +set(baseaddress_wbemdisp 0x76a40000) +set(baseaddress_wbemprox 0x76a00000) +set(baseaddress_windowscodecs 0x76960000) +set(baseaddress_windowscodecsext 0x76940000) +set(baseaddress_winfax 0x76920000) +set(baseaddress_wing32 0x76900000) +set(baseaddress_winhttp 0x768c0000) +set(baseaddress_winscard 0x768a0000) +set(baseaddress_winsta 0x76870000) +set(baseaddress_wkssvc 0x76850000) +set(baseaddress_wlanapi 0x76830000) +set(baseaddress_wldap32 0x76800000) +set(baseaddress_wlnotify 0x767e0000) +set(baseaddress_wmi 0x767c0000) +set(baseaddress_wmisvc 0x767a0000) +set(baseaddress_wmiutils 0x76770000) +set(baseaddress_ws2_32_new 0x76740000) +set(baseaddress_wshirda 0x76720000) +set(baseaddress_wshtcpip 0x76700000) +set(baseaddress_wsock32 0x766e0000) +set(baseaddress_wtsapi32 0x766c0000) +set(baseaddress_wuapi 0x76690000) +set(baseaddress_xinput1_1 0x76670000) +set(baseaddress_xinput1_2 0x76650000) +set(baseaddress_xinput1_3 0x76630000) +set(baseaddress_xinput9_1_0 0x76610000) +set(baseaddress_xmllite 0x765e0000) +set(baseaddress_access 0x76570000) +set(baseaddress_appwiz 0x76500000) +set(baseaddress_cmicpl 0x764d0000) +set(baseaddress_desk 0x76450000) +set(baseaddress_hdwwiz 0x763d0000) +set(baseaddress_hhctrl 0x76390000) +set(baseaddress_imaadp32.acm 0x76370000) +set(baseaddress_inetcpl 0x762f0000) +set(baseaddress_intl 0x76290000) +set(baseaddress_joy 0x76250000) +set(baseaddress_main 0x761b0000) +set(baseaddress_mmsys 0x760c0000) +set(baseaddress_msacm32.drv 0x76090000) +set(baseaddress_msadp32.acm 0x76070000) +set(baseaddress_msg711.acm 0x76050000) +set(baseaddress_msgsm32.acm 0x76030000) +set(baseaddress_msisys 0x76010000) +set(baseaddress_ncpa 0x75ff0000) +set(baseaddress_odbccp32i 0x75fd0000) +set(baseaddress_powercfg 0x75f70000) +set(baseaddress_sysdm 0x75ea0000) +set(baseaddress_telephon 0x75e80000) +set(baseaddress_timedate 0x75e30000) +set(baseaddress_usrmgr 0x75de0000) +set(baseaddress_wdmaud.drv 0x75c40000) +set(baseaddress_wined3dcfg 0x75c10000) +set(baseaddress_winemp3.acm 0x75ba0000) +set(baseaddress_wshom 0x75b70000) +set(baseaddress_fusion 0x75a00000) +set(baseaddress_fusion_1_1 0x759e0000) +set(baseaddress_fusion_2_0 0x759b0000) Propchange: trunk/reactos/cmake/baseaddress_msvc.cmake ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[akhaldi] 68838: [CMAKE] Update baseaddress.cmake.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 27 22:33:07 2015 New Revision: 68838 URL: http://svn.reactos.org/svn/reactos?rev=68838&view=rev Log: [CMAKE] Update baseaddress.cmake. Modified: trunk/reactos/cmake/baseaddress.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] Thu Aug 27 22:33:07 2015 @@ -1,324 +1,345 @@ set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x77d80000) -set(baseaddress_msvcrt 0x77cd0000) -set(baseaddress_advapi32 0x77c20000) -set(baseaddress_gdi32 0x77bb0000) -set(baseaddress_user32 0x77a20000) -set(baseaddress_dhcpcsvc 0x779d0000) -set(baseaddress_dnsapi 0x77980000) -set(baseaddress_icmp 0x77950000) -set(baseaddress_iphlpapi 0x77910000) -set(baseaddress_ws2_32 0x778d0000) -set(baseaddress_ws2help 0x778a0000) -set(baseaddress_shlwapi 0x77800000) -set(baseaddress_rpcrt4 0x77740000) -set(baseaddress_comctl32 0x775c0000) -set(baseaddress_ole32 0x77400000) -set(baseaddress_winspool.drv 0x773c0000) -set(baseaddress_winmm 0x77320000) -set(baseaddress_comdlg32 0x77230000) -set(baseaddress_shell32 0x76540000) -set(baseaddress_lz32 0x76520000) -set(baseaddress_version 0x764f0000) -set(baseaddress_oleaut32 0x76340000) -set(baseaddress_setupapi 0x76170000) -set(baseaddress_mpr 0x76130000) -set(baseaddress_crypt32 0x76030000) -set(baseaddress_wininet 0x75f80000) -set(baseaddress_urlmon 0x75e90000) -set(baseaddress_psapi 0x75e60000) -set(baseaddress_imm32 0x75e20000) -set(baseaddress_msvfw32 0x75de0000) -set(baseaddress_dbghelp 0x75d30000) -set(baseaddress_devmgr 0x75cb0000) -set(baseaddress_msacm32 0x75c70000) -set(baseaddress_netapi32 0x75c00000) -set(baseaddress_powrprof 0x75bd0000) -set(baseaddress_secur32 0x75ba0000) -set(baseaddress_wintrust 0x75b40000) -set(baseaddress_avicap32 0x75b10000) -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) -set(baseaddress_userenv 0x75620000) -set(baseaddress_uxtheme 0x755c0000) -set(baseaddress_cryptui 0x75520000) -set(baseaddress_csrsrv 0x754f0000) -set(baseaddress_basesrv 0x754c0000) -set(baseaddress_consrv 0x754a0000) -set(baseaddress_winsrv 0x753e0000) -set(baseaddress_dplayx 0x75370000) -set(baseaddress_gdiplus 0x752b0000) -set(baseaddress_msimg32 0x75280000) -set(baseaddress_mswsock 0x75250000) -set(baseaddress_oledlg 0x75200000) -set(baseaddress_rasapi32 0x751d0000) -set(baseaddress_rsaenh 0x75160000) -set(baseaddress_samlib 0x75120000) -set(baseaddress_sensapi 0x750f0000) -set(baseaddress_sfc_os 0x750c0000) -set(baseaddress_snmpapi 0x75090000) -set(baseaddress_spoolss 0x75060000) -set(baseaddress_usp10 0x74ff0000) -set(baseaddress_acledit 0x74fc0000) -set(baseaddress_aclui 0x74f80000) -set(baseaddress_activeds 0x74f50000) -set(baseaddress_actxprxy 0x74da0000) -set(baseaddress_advpack 0x74d60000) -set(baseaddress_amstream 0x74d10000) -set(baseaddress_atl100 0x74cd0000) -set(baseaddress_atl80 0x74ca0000) -set(baseaddress_atl 0x74c70000) -set(baseaddress_authz 0x74c40000) -set(baseaddress_avifil32 0x74bd0000) -set(baseaddress_batt 0x74ba0000) -set(baseaddress_bcrypt 0x74b70000) -set(baseaddress_beepmidi 0x74b40000) -set(baseaddress_browseui 0x74a70000) -set(baseaddress_cards 0x749c0000) -set(baseaddress_cfgmgr32 0x74990000) -set(baseaddress_clusapi 0x74960000) -set(baseaddress_comcat 0x74930000) -set(baseaddress_compstui 0x74900000) -set(baseaddress_console 0x74880000) -set(baseaddress_credui 0x74840000) -set(baseaddress_crtdll 0x747e0000) -set(baseaddress_cryptdlg 0x747b0000) -set(baseaddress_cryptdll 0x74780000) -set(baseaddress_cryptnet 0x74750000) -set(baseaddress_d3d8 0x746f0000) -set(baseaddress_d3d8thk 0x746d0000) -set(baseaddress_d3d9 0x74670000) -set(baseaddress_d3dcompiler_43 0x745c0000) -set(baseaddress_d3dx9_24 0x74590000) -set(baseaddress_d3dx9_25 0x74560000) -set(baseaddress_d3dx9_26 0x74530000) -set(baseaddress_d3dx9_27 0x74500000) -set(baseaddress_d3dx9_28 0x744d0000) -set(baseaddress_d3dx9_29 0x744a0000) -set(baseaddress_d3dx9_30 0x74470000) -set(baseaddress_d3dx9_31 0x74440000) -set(baseaddress_d3dx9_32 0x74410000) -set(baseaddress_d3dx9_33 0x743e0000) -set(baseaddress_d3dx9_34 0x743b0000) -set(baseaddress_d3dx9_35 0x74380000) -set(baseaddress_d3dx9_36 0x742b0000) -set(baseaddress_d3dx9_37 0x74280000) -set(baseaddress_d3dx9_38 0x74250000) -set(baseaddress_d3dx9_39 0x74220000) -set(baseaddress_d3dx9_40 0x741f0000) -set(baseaddress_d3dx9_41 0x741c0000) -set(baseaddress_d3dx9_42 0x74190000) -set(baseaddress_d3dx9_43 0x74160000) -set(baseaddress_d3dxof 0x74110000) -set(baseaddress_dciman32 0x740e0000) -set(baseaddress_ddraw 0x74030000) -set(baseaddress_deskadp 0x74000000) -set(baseaddress_deskmon 0x73fd0000) -set(baseaddress_devcpux 0x73fa0000) -set(baseaddress_devenum 0x73f50000) -set(baseaddress_dinput8 0x73f20000) -set(baseaddress_dinput 0x73ec0000) -set(baseaddress_dmusic 0x73e70000) -set(baseaddress_dplay 0x73e40000) -set(baseaddress_dwmapi 0x73e10000) -set(baseaddress_dxdiagn 0x73dc0000) -set(baseaddress_dxgi 0x73d80000) -set(baseaddress_faultrep 0x73d50000) -set(baseaddress_fmifs 0x73d30000) -set(baseaddress_fontext 0x73d00000) -set(baseaddress_framebuf 0x73ce0000) -set(baseaddress_framebuf_new 0x73cc0000) -set(baseaddress_framedyn 0x73c80000) -set(baseaddress_genincdata 0x73c50000) -set(baseaddress_getuname 0x73ae0000) -set(baseaddress_hid 0x73ab0000) -set(baseaddress_hlink 0x73a70000) -set(baseaddress_hnetcfg 0x73a30000) -set(baseaddress_httpapi 0x73a00000) -set(baseaddress_iccvid 0x739d0000) -set(baseaddress_ieframe 0x73930000) -set(baseaddress_iernonce 0x73900000) -set(baseaddress_imagehlp 0x738d0000) -set(baseaddress_inetcomm 0x73870000) -set(baseaddress_inetmib1 0x73840000) -set(baseaddress_initpki 0x73810000) -set(baseaddress_input 0x737b0000) -set(baseaddress_inseng 0x73780000) -set(baseaddress_iologmsg 0x73760000) -set(baseaddress_itircl 0x73730000) -set(baseaddress_itss 0x736f0000) -set(baseaddress_jscript 0x73600000) -set(baseaddress_kbsdll 0x735d0000) -set(baseaddress_ksuser 0x735a0000) -set(baseaddress_libjpeg 0x73510000) -set(baseaddress_libpng 0x73490000) -set(baseaddress_libtiff 0x733a0000) -set(baseaddress_libxslt 0x730f0000) -set(baseaddress_loadperf 0x730c0000) -set(baseaddress_localspl 0x73080000) -set(baseaddress_localui 0x73050000) -set(baseaddress_lpk 0x73020000) -set(baseaddress_lsasrv 0x72fc0000) -set(baseaddress_mapi32 0x72f80000) -set(baseaddress_mciavi32 0x72f40000) -set(baseaddress_mcicda 0x72f10000) -set(baseaddress_mciqtz32 0x72ed0000) -set(baseaddress_mciseq 0x72ea0000) -set(baseaddress_mciwave 0x72e70000) -set(baseaddress_midimap 0x72e40000) -set(baseaddress_mlang 0x72e00000) -set(baseaddress_mmdevapi 0x72dc0000) -set(baseaddress_mmdrv 0x72d90000) -set(baseaddress_modemui 0x72d20000) -set(baseaddress_mprapi 0x72cf0000) -set(baseaddress_msafd 0x72cb0000) -set(baseaddress_mscat32 0x72c80000) -set(baseaddress_mscms 0x72c50000) -set(baseaddress_mscoree 0x72c00000) -set(baseaddress_msctf 0x72bb0000) -set(baseaddress_msdmo 0x72b80000) -set(baseaddress_msftedit 0x72b50000) -set(baseaddress_msgina 0x72ae0000) -set(baseaddress_mshtml 0x72910000) -set(baseaddress_msi 0x727b0000) -set(baseaddress_msimtf 0x72780000) -set(baseaddress_msisip 0x72750000) -set(baseaddress_msports 0x72720000) -set(baseaddress_msrle32 0x726e0000) -set(baseaddress_mssign32 0x726b0000) -set(baseaddress_mssip32 0x72680000) -set(baseaddress_mstask 0x72650000) -set(baseaddress_msv1_0 0x72620000) -set(baseaddress_msvcrt20 0x72560000) -set(baseaddress_msvcrt40 0x724a0000) -set(baseaddress_msvidc32 0x72470000) -set(baseaddress_msxml2 0x72440000) -set(baseaddress_msxml3 0x72110000) -set(baseaddress_msxml4 0x720d0000) -set(baseaddress_msxml6 0x72090000) -set(baseaddress_msxml 0x72060000) -set(baseaddress_nddeapi 0x72030000) -set(baseaddress_netcfgx 0x71fa0000) -set(baseaddress_netevent 0x71f80000) -set(baseaddress_netid 0x71f30000) -set(baseaddress_netshell 0x71ea0000) -set(baseaddress_newdev 0x71e40000) -set(baseaddress_notifyhook 0x71e10000) -set(baseaddress_ntdsapi 0x71de0000) -set(baseaddress_ntlanman 0x71db0000) -set(baseaddress_ntmarta 0x71d80000) -set(baseaddress_ntprint 0x71d50000) -set(baseaddress_objsel 0x71d20000) -set(baseaddress_odbc32 0x71ce0000) -set(baseaddress_odbccp32 0x71cb0000) -set(baseaddress_oleacc 0x71c80000) -set(baseaddress_olecli32 0x71c50000) -set(baseaddress_olepro32 0x71c20000) -set(baseaddress_olesvr32 0x71bf0000) -set(baseaddress_olethk32 0x71bc0000) -set(baseaddress_pdh 0x71b80000) -set(baseaddress_pidgen 0x71b50000) -set(baseaddress_printui 0x71b20000) -set(baseaddress_propsys 0x71ae0000) -set(baseaddress_pstorec 0x71ab0000) -set(baseaddress_qedit 0x71a60000) -set(baseaddress_qmgr 0x71a20000) -set(baseaddress_qmgrprxy 0x719d0000) -set(baseaddress_quartz 0x71860000) -set(baseaddress_query 0x71830000) -set(baseaddress_rasadhlp 0x71800000) -set(baseaddress_rasdlg 0x71670000) -set(baseaddress_rasman 0x71640000) -set(baseaddress_resutils 0x71610000) -set(baseaddress_riched32 0x715e0000) -set(baseaddress_rsabase 0x715c0000) -set(baseaddress_samsrv 0x71550000) -set(baseaddress_sccbase 0x71520000) -set(baseaddress_schannel 0x714f0000) -set(baseaddress_scrrun 0x714b0000) -set(baseaddress_security 0x71490000) -set(baseaddress_serialui 0x71460000) -set(baseaddress_sfc 0x71430000) -set(baseaddress_shdoclc 0x713f0000) -set(baseaddress_shdocvw 0x713a0000) -set(baseaddress_shfolder 0x71380000) -set(baseaddress_shimgvw 0x71340000) -set(baseaddress_slayer 0x71310000) -set(baseaddress_slbcsp 0x712e0000) -set(baseaddress_sndblst 0x712b0000) -set(baseaddress_softpub 0x71290000) -set(baseaddress_srclient 0x71260000) -set(baseaddress_sti 0x71220000) -set(baseaddress_sxs 0x711f0000) -set(baseaddress_syssetup 0x71140000) -set(baseaddress_t2embed 0x71110000) -set(baseaddress_tapi32 0x710d0000) -set(baseaddress_tapiui 0x71070000) -set(baseaddress_traffic 0x71040000) -set(baseaddress_twain_32 0x71010000) -set(baseaddress_uext2 0x70fd0000) -set(baseaddress_ufat 0x70fa0000) -set(baseaddress_ufatx 0x70f70000) -set(baseaddress_untfs 0x70f10000) -set(baseaddress_updspapi 0x70ee0000) -set(baseaddress_url 0x70eb0000) -set(baseaddress_vbscript 0x70e30000) -set(baseaddress_vdmdbg 0x70e00000) -set(baseaddress_wbemdisp 0x70cd0000) -set(baseaddress_wbemprox 0x70c70000) -set(baseaddress_windowscodecs 0x70b60000) -set(baseaddress_windowscodecsext 0x70b30000) -set(baseaddress_d3dwine 0x70960000) -set(baseaddress_winfax 0x70930000) -set(baseaddress_wing32 0x70900000) -set(baseaddress_winhttp 0x708a0000) -set(baseaddress_winsta 0x70870000) -set(baseaddress_wlanapi 0x70840000) -set(baseaddress_wldap32 0x70800000) -set(baseaddress_wmi 0x707e0000) -set(baseaddress_ws2_32_new 0x70790000) -set(baseaddress_wshirda 0x70760000) -set(baseaddress_wshtcpip 0x70730000) -set(baseaddress_wsock32 0x70700000) -set(baseaddress_wtsapi32 0x706d0000) -set(baseaddress_wuapi 0x70690000) -set(baseaddress_xinput1_1 0x70660000) -set(baseaddress_xinput1_2 0x70630000) -set(baseaddress_xinput1_3 0x70600000) -set(baseaddress_xinput9_1_0 0x705d0000) -set(baseaddress_xmllite 0x70590000) -set(baseaddress_access 0x70510000) -set(baseaddress_appwiz 0x704b0000) -set(baseaddress_cmicpl 0x70470000) -set(baseaddress_desk 0x703d0000) -set(baseaddress_hdwwiz 0x70340000) -set(baseaddress_hhctrl 0x702f0000) -set(baseaddress_imaadp32.acm 0x702c0000) -set(baseaddress_inetcpl 0x70260000) -set(baseaddress_intl 0x70200000) -set(baseaddress_joy 0x701c0000) -set(baseaddress_main 0x70110000) -set(baseaddress_mmsys 0x70010000) -set(baseaddress_msacm32.drv 0x6ffe0000) -set(baseaddress_msadp32.acm 0x6ffb0000) -set(baseaddress_msg711.acm 0x6ff80000) -set(baseaddress_msgsm32.acm 0x6ff50000) -set(baseaddress_msisys 0x6ff20000) -set(baseaddress_ncpa 0x6fef0000) -set(baseaddress_odbccp32i 0x6fec0000) -set(baseaddress_powercfg 0x6fe50000) -set(baseaddress_sysdm 0x6fd80000) -set(baseaddress_telephon 0x6fd50000) -set(baseaddress_timedate 0x6fcf0000) -set(baseaddress_usrmgr 0x6fc90000) -set(baseaddress_wdmaud.drv 0x6fad0000) -set(baseaddress_wined3dcfg 0x6faa0000) -set(baseaddress_winemp3.acm 0x6fa20000) -set(baseaddress_fusion 0x6fa10000) -set(baseaddress_fusion_1_1 0x6f9f0000) -set(baseaddress_fusion_2_0 0x6f9c0000) +set(baseaddress_kernel32 0x7c770000) +set(baseaddress_msvcrt 0x7c6c0000) +set(baseaddress_advapi32 0x7c610000) +set(baseaddress_gdi32 0x7c570000) +set(baseaddress_user32 0x7c3d0000) +set(baseaddress_dhcpcsvc 0x7c380000) +set(baseaddress_dnsapi 0x7c330000) +set(baseaddress_icmp 0x7c300000) +set(baseaddress_iphlpapi 0x7c2b0000) +set(baseaddress_ws2_32 0x7c270000) +set(baseaddress_ws2help 0x7c240000) +set(baseaddress_shlwapi 0x7c190000) +set(baseaddress_rpcrt4 0x7c0d0000) +set(baseaddress_comctl32 0x7bf40000) +set(baseaddress_ole32 0x7bd70000) +set(baseaddress_winspool.drv 0x7bd40000) +set(baseaddress_winmm 0x7bc90000) +set(baseaddress_comdlg32 0x7bba0000) +set(baseaddress_shell32 0x7adb0000) +set(baseaddress_lz32 0x7ad90000) +set(baseaddress_version 0x7ad60000) +set(baseaddress_oleaut32 0x7ab90000) +set(baseaddress_setupapi 0x7a9c0000) +set(baseaddress_mpr 0x7a980000) +set(baseaddress_crypt32 0x7a870000) +set(baseaddress_wininet 0x7a7b0000) +set(baseaddress_urlmon 0x7a6b0000) +set(baseaddress_psapi 0x7a680000) +set(baseaddress_imm32 0x7a640000) +set(baseaddress_msvfw32 0x7a600000) +set(baseaddress_dbghelp 0x7a550000) +set(baseaddress_devmgr 0x7a4c0000) +set(baseaddress_msacm32 0x7a480000) +set(baseaddress_netapi32 0x7a410000) +set(baseaddress_powrprof 0x7a3e0000) +set(baseaddress_secur32 0x7a3a0000) +set(baseaddress_wintrust 0x7a340000) +set(baseaddress_avicap32 0x7a310000) +set(baseaddress_cabinet 0x7a2c0000) +set(baseaddress_dsound 0x7a240000) +set(baseaddress_glu32 0x7a140000) +set(baseaddress_opengl32 0x79f30000) +set(baseaddress_riched20 0x79e70000) +set(baseaddress_smdll 0x79e50000) +set(baseaddress_userenv 0x79e00000) +set(baseaddress_uxtheme 0x79da0000) +set(baseaddress_cryptui 0x79cf0000) +set(baseaddress_csrsrv 0x79cc0000) +set(baseaddress_basesrv 0x79c90000) +set(baseaddress_consrv 0x79c70000) +set(baseaddress_winsrv 0x79ba0000) +set(baseaddress_dplayx 0x79b30000) +set(baseaddress_gdiplus 0x79a60000) +set(baseaddress_msimg32 0x79a30000) +set(baseaddress_mswsock 0x79a00000) +set(baseaddress_oledlg 0x799b0000) +set(baseaddress_rasapi32 0x79980000) +set(baseaddress_rsaenh 0x79910000) +set(baseaddress_samlib 0x798d0000) +set(baseaddress_sensapi 0x798a0000) +set(baseaddress_sfc_os 0x79870000) +set(baseaddress_snmpapi 0x79840000) +set(baseaddress_spoolss 0x79810000) +set(baseaddress_usp10 0x79790000) +set(baseaddress_acledit 0x79760000) +set(baseaddress_aclui 0x79720000) +set(baseaddress_activeds 0x796f0000) +set(baseaddress_actxprxy 0x79500000) +set(baseaddress_advpack 0x794c0000) +set(baseaddress_amstream 0x79470000) +set(baseaddress_atl 0x79430000) +set(baseaddress_atl100 0x793f0000) +set(baseaddress_atl80 0x793b0000) +set(baseaddress_authz 0x79380000) +set(baseaddress_avifil32 0x79310000) +set(baseaddress_batt 0x792e0000) +set(baseaddress_bcrypt 0x792b0000) +set(baseaddress_beepmidi 0x79280000) +set(baseaddress_browseui 0x79180000) +set(baseaddress_cards 0x790c0000) +set(baseaddress_cfgmgr32 0x79090000) +set(baseaddress_clusapi 0x79060000) +set(baseaddress_comcat 0x79030000) +set(baseaddress_compstui 0x79000000) +set(baseaddress_console 0x78f80000) +set(baseaddress_credui 0x78f40000) +set(baseaddress_crtdll 0x78ee0000) +set(baseaddress_cryptdlg 0x78eb0000) +set(baseaddress_cryptdll 0x78e80000) +set(baseaddress_cryptnet 0x78e50000) +set(baseaddress_d3d8 0x78df0000) +set(baseaddress_d3d8thk 0x78dd0000) +set(baseaddress_d3d9 0x78d60000) +set(baseaddress_d3dcompiler_43 0x78cb0000) +set(baseaddress_d3drm 0x78c30000) +set(baseaddress_d3dwine 0x78a30000) +set(baseaddress_d3dx9_24 0x78a00000) +set(baseaddress_d3dx9_25 0x789c0000) +set(baseaddress_d3dx9_26 0x78990000) +set(baseaddress_d3dx9_27 0x78960000) +set(baseaddress_d3dx9_28 0x78930000) +set(baseaddress_d3dx9_29 0x78900000) +set(baseaddress_d3dx9_30 0x788d0000) +set(baseaddress_d3dx9_31 0x788a0000) +set(baseaddress_d3dx9_32 0x78870000) +set(baseaddress_d3dx9_33 0x78840000) +set(baseaddress_d3dx9_34 0x78810000) +set(baseaddress_d3dx9_35 0x787e0000) +set(baseaddress_d3dx9_36 0x78700000) +set(baseaddress_d3dx9_37 0x786d0000) +set(baseaddress_d3dx9_38 0x786a0000) +set(baseaddress_d3dx9_39 0x78670000) +set(baseaddress_d3dx9_40 0x78640000) +set(baseaddress_d3dx9_41 0x78610000) +set(baseaddress_d3dx9_42 0x785e0000) +set(baseaddress_d3dx9_43 0x785b0000) +set(baseaddress_d3dxof 0x78570000) +set(baseaddress_dciman32 0x78540000) +set(baseaddress_ddraw 0x78480000) +set(baseaddress_deskadp 0x78440000) +set(baseaddress_deskmon 0x78400000) +set(baseaddress_devcpux 0x783d0000) +set(baseaddress_devenum 0x78380000) +set(baseaddress_dinput 0x78320000) +set(baseaddress_dinput8 0x782f0000) +set(baseaddress_dmusic 0x782a0000) +set(baseaddress_dplay 0x78270000) +set(baseaddress_dwmapi 0x78240000) +set(baseaddress_dxdiagn 0x781f0000) +set(baseaddress_dxgi 0x781b0000) +set(baseaddress_faultrep 0x78180000) +set(baseaddress_fltlib 0x78150000) +set(baseaddress_fmifs 0x78130000) +set(baseaddress_fontext 0x78100000) +set(baseaddress_framebuf 0x780e0000) +set(baseaddress_framebuf_new 0x780c0000) +set(baseaddress_framedyn 0x78080000) +set(baseaddress_genincdata 0x78050000) +set(baseaddress_getuname 0x77d80000) +set(baseaddress_hid 0x77d50000) +set(baseaddress_hlink 0x77d10000) +set(baseaddress_hnetcfg 0x77cd0000) +set(baseaddress_httpapi 0x77ca0000) +set(baseaddress_iccvid 0x77c70000) +set(baseaddress_ieframe 0x77b80000) +set(baseaddress_iernonce 0x77b50000) +set(baseaddress_imagehlp 0x77b20000) +set(baseaddress_inetcomm 0x77ac0000) +set(baseaddress_inetmib1 0x77a90000) +set(baseaddress_initpki 0x77a60000) +set(baseaddress_input 0x77a00000) +set(baseaddress_inseng 0x779d0000) +set(baseaddress_iologmsg 0x779b0000) +set(baseaddress_itircl 0x77980000) +set(baseaddress_itss 0x77940000) +set(baseaddress_jscript 0x77830000) +set(baseaddress_jsproxy 0x77800000) +set(baseaddress_kbsdll 0x777d0000) +set(baseaddress_kernel32_vista 0x777a0000) +set(baseaddress_ksuser 0x77770000) +set(baseaddress_libjpeg 0x776e0000) +set(baseaddress_libpng 0x77650000) +set(baseaddress_libtiff 0x77570000) +set(baseaddress_libxslt 0x772a0000) +set(baseaddress_loadperf 0x77270000) +set(baseaddress_localspl 0x77230000) +set(baseaddress_localui 0x77200000) +set(baseaddress_lpk 0x771d0000) +set(baseaddress_lsasrv 0x77170000) +set(baseaddress_mapi32 0x77130000) +set(baseaddress_mciavi32 0x770f0000) +set(baseaddress_mcicda 0x770c0000) +set(baseaddress_mciqtz32 0x77080000) +set(baseaddress_mciseq 0x77050000) +set(baseaddress_mciwave 0x77020000) +set(baseaddress_mgmtapi 0x76ff0000) +set(baseaddress_midimap 0x76fc0000) +set(baseaddress_mlang 0x76f80000) +set(baseaddress_mmdevapi 0x76f40000) +set(baseaddress_mmdrv 0x76f10000) +set(baseaddress_modemui 0x76ea0000) +set(baseaddress_mprapi 0x76e70000) +set(baseaddress_msafd 0x76e30000) +set(baseaddress_mscat32 0x76e00000) +set(baseaddress_mscms 0x76dd0000) +set(baseaddress_mscoree 0x76d80000) +set(baseaddress_msctf 0x76d20000) +set(baseaddress_msdmo 0x76cf0000) +set(baseaddress_msftedit 0x76cc0000) +set(baseaddress_msgina 0x76c30000) +set(baseaddress_mshtml 0x76950000) +set(baseaddress_msi 0x767e0000) +set(baseaddress_msimtf 0x767b0000) +set(baseaddress_msisip 0x76780000) +set(baseaddress_mspatcha 0x76750000) +set(baseaddress_msports 0x76720000) +set(baseaddress_msrle32 0x766f0000) +set(baseaddress_mssign32 0x766c0000) +set(baseaddress_mssip32 0x76690000) +set(baseaddress_mstask 0x76650000) +set(baseaddress_msv1_0 0x76620000) +set(baseaddress_msvcrt20 0x76560000) +set(baseaddress_msvcrt40 0x76490000) +set(baseaddress_msvidc32 0x76460000) +set(baseaddress_msxml 0x76430000) +set(baseaddress_msxml2 0x76400000) +set(baseaddress_msxml3 0x76040000) +set(baseaddress_msxml4 0x76000000) +set(baseaddress_msxml6 0x75fc0000) +set(baseaddress_mycomput 0x75fa0000) +set(baseaddress_nddeapi 0x75f70000) +set(baseaddress_netcfgx 0x75ee0000) +set(baseaddress_netevent 0x75ec0000) +set(baseaddress_netid 0x75e70000) +set(baseaddress_netshell 0x75de0000) +set(baseaddress_newdev 0x75d80000) +set(baseaddress_npptools 0x75d50000) +set(baseaddress_ntdsapi 0x75d20000) +set(baseaddress_ntlanman 0x75cf0000) +set(baseaddress_ntmarta 0x75cc0000) +set(baseaddress_ntobjshex 0x75c10000) +set(baseaddress_ntprint 0x75be0000) +set(baseaddress_objsel 0x75bb0000) +set(baseaddress_odbc32 0x75b70000) +set(baseaddress_odbccp32 0x75b40000) +set(baseaddress_oleacc 0x75ab0000) +set(baseaddress_olecli32 0x75a80000) +set(baseaddress_olepro32 0x75a50000) +set(baseaddress_olesvr32 0x75a20000) +set(baseaddress_olethk32 0x759f0000) +set(baseaddress_pdh 0x759b0000) +set(baseaddress_pidgen 0x75980000) +set(baseaddress_printui 0x75950000) +set(baseaddress_propsys 0x75910000) +set(baseaddress_pstorec 0x758e0000) +set(baseaddress_qedit 0x75890000) +set(baseaddress_qmgr 0x75850000) +set(baseaddress_qmgrprxy 0x757f0000) +set(baseaddress_quartz 0x75680000) +set(baseaddress_query 0x75650000) +set(baseaddress_rasadhlp 0x75620000) +set(baseaddress_rasdlg 0x75450000) +set(baseaddress_rasman 0x75420000) +set(baseaddress_resutils 0x753f0000) +set(baseaddress_riched32 0x753c0000) +set(baseaddress_rsabase 0x753a0000) +set(baseaddress_rshell 0x75310000) +set(baseaddress_samsrv 0x752a0000) +set(baseaddress_sccbase 0x75270000) +set(baseaddress_schannel 0x75230000) +set(baseaddress_schedsvc 0x75200000) +set(baseaddress_scrrun 0x751a0000) +set(baseaddress_security 0x75180000) +set(baseaddress_serialui 0x75150000) +set(baseaddress_sfc 0x75120000) +set(baseaddress_shdoclc 0x750e0000) +set(baseaddress_shdocvw 0x75090000) +set(baseaddress_shfolder 0x75070000) +set(baseaddress_shimgvw 0x75020000) +set(baseaddress_slayer 0x74ff0000) +set(baseaddress_slbcsp 0x74fc0000) +set(baseaddress_sndblst 0x74f90000) +set(baseaddress_softpub 0x74f70000) +set(baseaddress_srclient 0x74f40000) +set(baseaddress_srvsvc 0x74f10000) +set(baseaddress_sti 0x74ed0000) +set(baseaddress_stobject 0x74e60000) +set(baseaddress_streamci 0x74e30000) +set(baseaddress_sxs 0x74e00000) +set(baseaddress_syssetup 0x74d50000) +set(baseaddress_t2embed 0x74d20000) +set(baseaddress_tapi32 0x74ce0000) +set(baseaddress_tapiui 0x74c60000) +set(baseaddress_testvdd 0x74c30000) +set(baseaddress_themeui 0x74c10000) +set(baseaddress_traffic 0x74be0000) +set(baseaddress_twain_32 0x74bb0000) +set(baseaddress_uext2 0x74b70000) +set(baseaddress_ufat 0x74b50000) +set(baseaddress_ufatx 0x74b30000) +set(baseaddress_umpnpmgr 0x74b00000) +set(baseaddress_untfs 0x74ae0000) +set(baseaddress_updspapi 0x74ab0000) +set(baseaddress_url 0x74a80000) +set(baseaddress_vbscript 0x749e0000) +set(baseaddress_vdmdbg 0x749b0000) +set(baseaddress_wbemdisp 0x74970000) +set(baseaddress_wbemprox 0x74910000) +set(baseaddress_windowscodecs 0x747f0000) +set(baseaddress_windowscodecsext 0x747c0000) +set(baseaddress_winfax 0x74790000) +set(baseaddress_wing32 0x74760000) +set(baseaddress_winhttp 0x74700000) +set(baseaddress_winscard 0x746d0000) +set(baseaddress_winsta 0x746a0000) +set(baseaddress_wkssvc 0x74670000) +set(baseaddress_wlanapi 0x74640000) +set(baseaddress_wldap32 0x74600000) +set(baseaddress_wlnotify 0x745e0000) +set(baseaddress_wmi 0x745c0000) +set(baseaddress_wmisvc 0x74590000) +set(baseaddress_wmiutils 0x74550000) +set(baseaddress_ws2_32_new 0x74500000) +set(baseaddress_wshirda 0x744d0000) +set(baseaddress_wshtcpip 0x744a0000) +set(baseaddress_wsock32 0x74470000) +set(baseaddress_wtsapi32 0x74440000) +set(baseaddress_wuapi 0x74400000) +set(baseaddress_xinput1_1 0x743d0000) +set(baseaddress_xinput1_2 0x743a0000) +set(baseaddress_xinput1_3 0x74370000) +set(baseaddress_xinput9_1_0 0x74340000) +set(baseaddress_xmllite 0x74300000) +set(baseaddress_access 0x74280000) +set(baseaddress_appwiz 0x74210000) +set(baseaddress_cmicpl 0x741d0000) +set(baseaddress_desk 0x74130000) +set(baseaddress_hdwwiz 0x740a0000) +set(baseaddress_hhctrl 0x74050000) +set(baseaddress_imaadp32.acm 0x74020000) +set(baseaddress_inetcpl 0x73fa0000) +set(baseaddress_intl 0x73f30000) +set(baseaddress_joy 0x73ef0000) +set(baseaddress_main 0x73e40000) +set(baseaddress_mmsys 0x73d40000) +set(baseaddress_msacm32.drv 0x73d10000) +set(baseaddress_msadp32.acm 0x73ce0000) +set(baseaddress_msg711.acm 0x73cb0000) +set(baseaddress_msgsm32.acm 0x73c80000) +set(baseaddress_msisys 0x73c50000) +set(baseaddress_ncpa 0x73c20000) +set(baseaddress_odbccp32i 0x73bf0000) +set(baseaddress_powercfg 0x73b80000) +set(baseaddress_sysdm 0x73aa0000) +set(baseaddress_telephon 0x73a70000) +set(baseaddress_timedate 0x73a10000) +set(baseaddress_usrmgr 0x739b0000) +set(baseaddress_wdmaud.drv 0x737f0000) +set(baseaddress_wined3dcfg 0x737c0000) +set(baseaddress_winemp3.acm 0x73740000) +set(baseaddress_wshom 0x736f0000) +set(baseaddress_fusion 0x73500000) +set(baseaddress_fusion_1_1 0x734e0000) +set(baseaddress_fusion_2_0 0x734b0000)

9 years, 3 months

[pschweitzer] 68837: Delete pierre-fsd branch, it has been taken over by trunk which is far more advanced than this branch. It served us well

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Aug 27 21:33:04 2015 New Revision: 68837 URL: http://svn.reactos.org/svn/reactos?rev=68837&view=rev Log: Delete pierre-fsd branch, it has been taken over by trunk which is far more advanced than this branch. It served us well Removed: branches/pierre-fsd/

9 years, 3 months

[pschweitzer] 68836: [NTFS] Return proper status

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Aug 27 21:02:52 2015 New Revision: 68836 URL: http://svn.reactos.org/svn/reactos?rev=68836&view=rev Log: [NTFS] Return proper status Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Aug 27 21:02:52 2015 @@ -833,7 +833,7 @@ ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - return STATUS_SUCCESS; + return Status; }

9 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015