Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[pschweitzer] 31459: - Definitively get rid of pidl work - Now, previous path is just selected in browse window
by pschweitzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: pschweitzer Date: Thu Dec 27 15:49:46 2007 New Revision: 31459 URL: http://svn.reactos.org/svn/reactos?rev=31459&view=rev Log: - Definitively get rid of pidl work - Now, previous path is just selected in browse window Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Dec 27 15:49:46 2007 @@ -3,9 +3,10 @@ - Updated RosBE Configuration Tool. (Pierre Schweitzer) - Removed an used var (Pierre Schweitzer) - Removed magic value use (Pierre Schweitzer) - - Deactivated temporarily pidl work because of unwanted effects (Pierre Schweitzer) - Fixed the a bug : user can now enter the path in browse dialog, and it will be used (if correct) (Pierre Schweitzer) - If there's a slash at the end of the entered path, it's removed (Pierre Schweitzer) + - Definitively get rid of pidl work (Pierre Schweitzer) + - Now, previous path is just selected in browse window (Pierre Schweitzer) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) - Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Thu Dec 27 15:49:46 2007 @@ -257,28 +257,42 @@ INT CALLBACK BrowseProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - if ((Msg == BFFM_VALIDATEFAILED) && (lParam != ID_MGWDIR)) - { - WCHAR BoxMsg[256], BoxTitle[128]; - HWND hwndParent; - INT PathLen; - hwndParent = GetWindow(Dlg, GW_OWNER); - LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); - LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); - if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDYES) - { - PathLen = wcslen((LPWSTR)wParam); - if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) - wcsset((LPWSTR)wParam+(PathLen-1), '\0'); - if (CreateDirectory((LPWSTR)wParam, NULL) == 0) - { - LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); - MessageBox(Dlg, BoxMsg, NULL, MB_ICONERROR); - } - else - { - SetDlgItemText(hwndParent, lParam, (LPWSTR)wParam); - } + HWND hwndParent; + hwndParent = GetWindow(Dlg, GW_OWNER); + switch (Msg) + { + case BFFM_INITIALIZED: + { + WCHAR ActualPath[MAX_PATH]; + GetDlgItemText(hwndParent, lParam, ActualPath, MAX_PATH); + SendMessage(Dlg, BFFM_SETSELECTION, TRUE, (LPARAM)ActualPath); + break; + } + case BFFM_VALIDATEFAILED: + { + if (lParam != ID_MGWDIR) + { + WCHAR BoxMsg[256], BoxTitle[128]; + INT PathLen; + LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); + LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); + if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDYES) + { + PathLen = wcslen((LPWSTR)wParam); + if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) + wcsset((LPWSTR)wParam+(PathLen-1), '\0'); + if (CreateDirectory((LPWSTR)wParam, NULL) == 0) + { + LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); + MessageBox(Dlg, BoxMsg, NULL, MB_ICONERROR); + } + else + { + SetDlgItemText(hwndParent, lParam, (LPWSTR)wParam); + } + } + } + break; } } return FALSE; @@ -373,16 +387,9 @@ PathInfo.ulFlags = BIF_EDITBOX | BIF_VALIDATE; PathInfo.lpfn = (BFFCALLBACK)BrowseProc; PathInfo.lParam = ID_LOGDIR; -#if 0 - SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); - PathInfo.pidlRoot = pidl; -#endif + PathInfo.pidlRoot = NULL; if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) { -#if 0 - HINSTANCE hDLL; - ILCREATEFROMPATHW ILCreateFromPathW; -#endif Control = ID_MGWDIR; IDText = MSG_FINDMGWDIR; if (wParam == ID_BROWSEOBJ) @@ -396,19 +403,6 @@ IDText = MSG_FINDOUTDIR; } PathInfo.lParam = Control; -#if 0 - hDLL = LoadLibrary(L"shell32.dll"); - if (hDLL) - { - ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); - if (ILCreateFromPathW) - { - GetDlgItemTextW(Dlg, Control, path, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(path); - } - FreeLibrary(hDLL); - } -#endif } LoadString(hInstance, IDText, Text, 512); PathInfo.lpszTitle = Text; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Thu Dec 27 15:49:46 2007 @@ -15,10 +15,6 @@ #include "resources.h" #define MINGWVERSION L"\\4.1.3" - -#if 0 -typedef LPITEMIDLIST (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); -#endif typedef struct _SETTINGS {

1 0

[jimtabor] 31458: Fix a typo in text.h. Implemente NtGdiGetDhpdev.
by jimtabor＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: jimtabor Date: Thu Dec 27 11:41:38 2007 New Revision: 31458 URL: http://svn.reactos.org/svn/reactos?rev=31458&view=rev Log: Fix a typo in text.h. Implemente NtGdiGetDhpdev. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Thu Dec 27 11:41:38 2007 @@ -44,7 +44,7 @@ PLONG plPartition; PLONG plNext; PGLYPHPOS pgpNext; - LONG lCurrentFont; + PLONG plCurrentFont; POINTL ptlBaseLineAdjust; INT cTTSysGlyphs; INT cSysGlyphs; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 27 11:41:38 2007 @@ -3346,4 +3346,30 @@ return FALSE; } +/* + * @implemented + */ +DHPDEV +NtGdiGetDhpdev( + IN HDEV hdev) +{ + PGDIDEVICE pGdiDevice = (PGDIDEVICE) hdev; + if (!pGdiDevice) return NULL; + // ATM we have one, so this cheesie test + if (pGdiDevice != &PrimarySurface) return NULL; +// +// if ( pGdiDevice < MmSystemRangeStart) return NULL; +// pPDev = &PrimarySurface; +// KeEnterCriticalRegion(); +// do +// { +// if (pGdiDevice == pPDev) break; +// else +// pPDev = pPDev->ppdevNext; +// } while (pPDev != NULL); +// KeLeaveCriticalRegion(); +// if (!pPDev) return NULL; + return pGdiDevice->PDev; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Thu Dec 27 11:41:38 2007 @@ -2758,17 +2758,6 @@ /* * @unimplemented */ -DHPDEV -NtGdiGetDhpdev( - IN HDEV hdev) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiGetEmbUFI(

1 0

[tkreuzer] 31457: w32kdll for vista
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 06:48:36 2007 New Revision: 31457 URL: http://svn.reactos.org/svn/reactos?rev=31457&view=rev Log: w32kdll for vista Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/ trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.S (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild (with props) Modified: trunk/rostests/apitests/w32kdll/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…

1 0

[tkreuzer] 31456: - enumerate symbols instead of simple lookup, this makes the program slow, but you can now see if an adress has more than one name
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 06:42:56 2007 New Revision: 31456 URL: http://svn.reactos.org/svn/reactos?rev=31456&view=rev Log: - enumerate symbols instead of simple lookup, this makes the program slow, but you can now see if an adress has more than one name Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.c (original) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c Thu Dec 27 06:42:56 2007 @@ -77,7 +77,17 @@ printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); return 0; } + printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); return GetOffsetFromAdress64(pModule, pSym->Address - pSym->ModBase, pbX64); +} + +BOOL CALLBACK EnumSymbolsProc( + PSYMBOL_INFO pSymInfo, + ULONG SymbolSize, + PVOID UserContext) +{ + printf("%s@%d ", pSymInfo->Name, (UINT)UserContext); + return TRUE; } int main(int argc, char* argv[]) @@ -159,16 +169,16 @@ dwW32pServiceTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceTable", &bX64); dwW32pServiceLimit = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceLimit", &bX64); dwW32pArgumentTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pArgumentTable", &bX64); - if (!dwW32pServiceTable || !dwW32pServiceLimit || !dwW32pArgumentTable) - { - printf("Couldn't find adress!\n"); - goto cleanup; - } - printf("dwW32pServiceTable = %llx\n", dwW32pServiceTable); printf("dwW32pServiceLimit = %llx\n", dwW32pServiceLimit); printf("dwW32pArgumentTable = %llx\n", dwW32pArgumentTable); + if (!dwW32pServiceTable || !dwW32pServiceLimit || !dwW32pArgumentTable) + { + printf("Couldn't find adress!\n"); + goto cleanup; + } + dwServiceLimit = *((DWORD*)(pModule + dwW32pServiceLimit)); pdwArgs = (BYTE*)(pModule + dwW32pArgumentTable); @@ -176,20 +186,22 @@ { DWORD *pdwEntries32 = (DWORD*)(pModule + dwW32pServiceTable); - for (i = 0; i <= dwServiceLimit; i++) + for (i = 0; i < dwServiceLimit; i++) { - SymFromAddr(hProcess, (DWORD64)pdwEntries32[i], 0, &Sym.Symbol); - printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); + printf("0x%x:", i+0x1000); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries32[i], EnumSymbolsProc, (PVOID)(DWORD)pdwArgs[i]); + printf("\n"); } } else { DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwW32pServiceTable); - for (i = 0; i <= dwServiceLimit; i++) + for (i = 0; i < dwServiceLimit; i++) { - SymFromAddr(hProcess, (DWORD64)pdwEntries64[i], 0, &Sym.Symbol); - printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); + printf("0x%x:", i+0x1000); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries64[i], EnumSymbolsProc, (PVOID)(i+0x1000)); + printf("\n"); } }

1 0

[tkreuzer] 31455: dbghelp.dll: - use own .def file instead of wine's spec - add stubs.c - move ntdll up to make it load again on ros
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 06:36:57 2007 New Revision: 31455 URL: http://svn.reactos.org/svn/reactos?rev=31455&view=rev Log: dbghelp.dll: - use own .def file instead of wine's spec - add stubs.c - move ntdll up to make it load again on ros Added: trunk/reactos/dll/win32/dbghelp/dbghelp.def (with props) trunk/reactos/dll/win32/dbghelp/stubs.c (with props) Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild Added: trunk/reactos/dll/win32/dbghelp/dbghelp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.def (added) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.def Thu Dec 27 06:36:57 2007 @@ -1,0 +1,199 @@ +; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $ +; +; ReactOS Operating System +; +; This file contains all dbghelp.dll exports +; +LIBRARY dbghelp.dll + +EXPORTS +;SymGetOmapBlockBase +DbgHelpCreateUserDump@12 +DbgHelpCreateUserDumpW@12 +EnumDirTree@24 +EnumDirTreeW@24 +EnumerateLoadedModules64@12 +EnumerateLoadedModules@12 +EnumerateLoadedModulesW64@12 +ExtensionApiVersion@0 +FindDebugInfoFile@12 +FindDebugInfoFileEx@20 +;FindDebugInfoFileExW; not existent on windows, stubbed in wine spec +FindExecutableImage@12 +FindExecutableImageEx@20 +FindExecutableImageExW@20 +FindFileInPath@32 +FindFileInSearchPath@28 +GetTimestampForLoadedLibrary@4 +ImageDirectoryEntryToData(a)16=ntdll.RtlImageDirectoryEntryToData +ImageDirectoryEntryToDataEx@20 +ImageNtHeader(a)4=ntdll.RtlImageNtHeader +ImageRvaToSection(a)12=ntdll.RtlImageRvaToSection +ImageRvaToVa(a)16=ntdll.RtlImageRvaToVa +ImagehlpApiVersion@0 +ImagehlpApiVersionEx@4 +MakeSureDirectoryPathExists@4 +MapDebugInformation@16 +MiniDumpReadDumpStream@20 +MiniDumpWriteDump@28 +SearchTreeForFile@12 +SearchTreeForFileW@12 +StackWalk64@36 +StackWalk@36 +SymAddSymbol@32 +SymAddSymbolW@32 +SymCleanup@4 +SymDeleteSymbol@28 +SymDeleteSymbolW@28 +SymEnumLines@28 +SymEnumLinesW@28 +SymEnumProcesses@8 +SymEnumSourceFiles@24 +SymEnumSourceFilesW@24 +SymEnumSourceLines@36 +SymEnumSourceLinesW@36 +SymEnumSym@20 +SymEnumSymbols@24 +SymEnumSymbolsForAddr@20 +SymEnumSymbolsForAddrW@20 +SymEnumSymbolsW@24 +SymEnumTypes@20 +SymEnumTypesW@20 +SymEnumerateModules64@12 +SymEnumerateModules@12 +SymEnumerateModulesW64@12 +SymEnumerateSymbols64@20 +SymEnumerateSymbols@16 +SymEnumerateSymbolsW64@20 +SymEnumerateSymbolsW@16 +;SymFindDebugInfoFile; not existent on windows, stubbed in wine spec +;SymFindDebugInfoFileW; not existent on windows, stubbed in wine spec +SymFindFileInPath@40 +SymFindFileInPathW@40 +SymFromAddr@20 +SymFromAddrW@20 +SymFromIndex@20 +SymFromIndexW@20 +SymFromName@12 +SymFromNameW@12 +SymFromToken@20 +SymFromTokenW@20 +SymFunctionTableAccess64@12 +SymFunctionTableAccess@8 +SymGetFileLineOffsets64@20 +SymGetHomeDirectory@12 +SymGetHomeDirectoryW@12 +SymGetLineFromAddr64@20 +SymGetLineFromAddr@16 +SymGetLineFromAddrW64@20 +SymGetLineFromName64@24 +SymGetLineFromName@24 +SymGetLineFromNameW64@24 +SymGetLineNext64@8 +SymGetLineNext@8 +SymGetLineNextW64@8 +SymGetLinePrev64@8 +SymGetLinePrev@8 +SymGetLinePrevW64@8 +SymGetModuleBase64@12 +SymGetModuleBase@8 +SymGetModuleInfo64@16 +SymGetModuleInfo@12 +SymGetModuleInfoW64@16 +SymGetModuleInfoW@12 +SymGetOptions@0 +SymGetScope@20 +SymGetScopeW@20 +SymGetSearchPath@12 +SymGetSearchPathW@12 +SymGetSourceFile@28 +SymGetSourceFileFromToken@20 +SymGetSourceFileFromTokenW@20 +SymGetSourceFileToken@24 +SymGetSourceFileTokenW@24 +;SymGetSourceFileW +;SymGetSourceVarFromToken +;SymGetSourceVarFromTokenW +SymGetSymFromAddr64@20 +SymGetSymFromAddr@16 +SymGetSymFromName64@12 +SymGetSymFromName@12 +SymGetSymNext64@8 +SymGetSymNext@8 +SymGetSymPrev64@8 +SymGetSymPrev@8 +SymGetSymbolFile@32 +SymGetSymbolFileW@32 +SymGetTypeFromName@20 +SymGetTypeFromNameW@20 +SymGetTypeInfo@24 +SymGetTypeInfoEx@16 +SymInitialize@12 +SymInitializeW@12 +SymLoadModule64@28 +SymLoadModule@24 +SymLoadModuleEx@36 +SymLoadModuleExW@36 +SymMatchFileName@16 +SymMatchFileNameW@16 +SymMatchString@12 +SymMatchStringA@12 +SymMatchStringW@12 +SymNext@8 +SymNextW@8 +SymPrev@8 +SymPrevW@8 +;SymRefreshModuleList +SymRegisterCallback64@16 +SymRegisterCallback@12 +SymRegisterCallbackW64@16 +SymRegisterFunctionEntryCallback64@16 +SymRegisterFunctionEntryCallback@12 +SymSearch@44 +SymSearchW@44 +SymSetContext@12 +SymSetHomeDirectory@8 +SymSetHomeDirectoryW@8 +SymSetOptions@4 +SymSetParentWindow@4 +SymSetSearchPath@8 +SymSetSearchPathW@8 +;SymSetSymWithAddr64 +SymSrvDeltaName@20 +SymSrvDeltaNameW@20 +;SymSrvGetFileIndexInfo; not existent on windows, stubbed in wine spec +;SymSrvGetFileIndexInfoW; not existent on windows, stubbed in wine spec +SymSrvGetFileIndexString@24 +SymSrvGetFileIndexStringW@24 +SymSrvGetFileIndexes@20 +SymSrvGetFileIndexesW@20 +SymSrvGetSupplement@16 +SymSrvGetSupplementW@16 +SymSrvIsStore@8 +SymSrvIsStoreW@8 +SymSrvStoreFile@16 +SymSrvStoreFileW@16 +SymSrvStoreSupplement@20 +SymSrvStoreSupplementW@20 +SymUnDName64@12 +SymUnDName@12 +SymUnloadModule64@12 +SymUnloadModule@8 +UnDecorateSymbolName@16 +UnDecorateSymbolNameW@16 +UnmapDebugInformation@4 +WinDbgExtensionDllInit@12 +;block +;dbghelp +;dh +;fptr +;homedir +;lmi +;lminfo +;omap +;srcfiles +;stack_force_ebp +;stackdbg +;sym +;symsrv +;vc7fpo Propchange: trunk/reactos/dll/win32/dbghelp/dbghelp.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild Thu Dec 27 06:36:57 2007 @@ -1,5 +1,5 @@ <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true"> - <importlibrary definition="dbghelp.spec.def" /> + <importlibrary definition="dbghelp.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="_WIN32_IE">0x600</define> @@ -7,9 +7,9 @@ <define name="WINVER">0x502</define> <define name="__WINESRC__" /> <define name="HAVE_REGEX_H" /> + <library>ntdll</library> <library>wine</library> <library>pseh</library> - <library>ntdll</library> <library>kernel32</library> <library>psapi</library> <file>coff.c</file> @@ -27,9 +27,9 @@ <file>source.c</file> <file>stabs.c</file> <file>stack.c</file> + <file>stubs.c</file> <file>storage.c</file> <file>symbol.c</file> <file>type.c</file> <file>dbghelp.rc</file> - <file>dbghelp.spec</file> </module> Added: trunk/reactos/dll/win32/dbghelp/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stubs.c (added) +++ trunk/reactos/dll/win32/dbghelp/stubs.c Thu Dec 27 06:36:57 2007 @@ -1,0 +1,745 @@ +/* + * File stubs.c - stubs for exported functions + * + * Copyright (C) 2007, Timo Kreuzer + * + * 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 + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> + +#include "dbghelp_private.h" + +#define UNIMPLEMENTED DbgPrint("DBGHELP: %s is unimplemented, please try again later.\n", __FUNCTION__); + +BOOL WINAPI +DbgHelpCreateUserDump(LPSTR pszFileName, + PDBGHELP_CREATE_USER_DUMP_CALLBACK Callback, + PVOID pUserData) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DbgHelpCreateUserDumpW(LPWSTR pszFileName, + PDBGHELP_CREATE_USER_DUMP_CALLBACK Callback, + PVOID pUserData) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +FindFileInPath(HANDLE hProcess, + LPSTR pszSearchPath, + LPSTR pszFileName, + PVOID id, + DWORD two, + DWORD three, + DWORD dwFlags, + LPSTR pszFilePath) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +FindFileInSearchPath(HANDLE hProcess, + LPSTR pszSearchPath, + LPSTR pszFileName, + DWORD one, + DWORD two, + DWORD three, + LPSTR pszFilePath) +{ + UNIMPLEMENTED; + return FALSE; +} + +PVOID WINAPI +ImageDirectoryEntryToDataEx(PVOID pModuleBase, + BOOLEAN bMappedAsImage, + USHORT DirectoryEntry, + PULONG pulSize, + PIMAGE_SECTION_HEADER *FoundHeader) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL WINAPI +SymAddSymbol(HANDLE hProcess, + ULONG64 ModBase, + PCSTR pszName, + DWORD64 Address, + DWORD dwSize, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymAddSymbolW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszName, + DWORD64 Address, + DWORD dwSize, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymDeleteSymbol(HANDLE hProcess, + ULONG64 ModBase, + PCSTR pszName, + DWORD64 Address, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymDeleteSymbolW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszName, + DWORD64 Address, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumLinesW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszObj, + PCWSTR pszFile, + PSYM_ENUMLINES_CALLBACKW Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL SymEnumProcesses(PSYM_ENUMPROCESSES_CALLBACK Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSourceFilesW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszMask, + PSYM_ENUMSOURCEFILES_CALLBACKW Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSourceLines(HANDLE hProcess, + ULONG64 ModBase, + PCSTR pszObject, + PCSTR pszFile, + DWORD dwLine, + DWORD dwFlags, + PSYM_ENUMLINES_CALLBACK Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSourceLinesW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszObject, + PCWSTR pszFile, + DWORD dwLine, + DWORD dwFlags, + PSYM_ENUMLINES_CALLBACKW Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSym(HANDLE hProcess, + ULONG64 ModBase, + PSYM_ENUMERATESYMBOLS_CALLBACK Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSymbolsForAddr(HANDLE hProcess, + DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumSymbolsForAddrW(HANDLE hProcess, + DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACKW Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumerateSymbols64(HANDLE hProcess, + DWORD64 ModBase, + PSYM_ENUMSYMBOLS_CALLBACK64 Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumerateSymbolsW64(HANDLE hProcess, + DWORD64 ModBase, + PSYM_ENUMSYMBOLS_CALLBACK64W Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymEnumerateSymbolsW(HANDLE hProcess, + DWORD ModBase, + PSYM_ENUMSYMBOLS_CALLBACKW Callback, + PVOID pUserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymFromIndex(HANDLE hProcess, + ULONG64 ModBase, + DWORD Index, + PSYMBOL_INFO Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymFromIndexW(HANDLE hProcess, + ULONG64 ModBase, + DWORD Index, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymFromNameW(HANDLE hProcess, + PCWSTR pszName, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymFromToken(HANDLE hProcess, + DWORD64 ModBase, + DWORD Token, + PSYMBOL_INFO Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymFromTokenW(HANDLE hProcess, + DWORD64 ModBase, + DWORD Token, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetFileLineOffsets64(HANDLE hProcess, + PSTR pszModuleName, + PSTR pszFileName, + PDWORD64 pBuffer, + ULONG BufferLines) +{ + UNIMPLEMENTED; + return FALSE; +} + +PCHAR WINAPI +SymGetHomeDirectory(DWORD dwType, + PSTR pszDir, + size_t Size) +{ + UNIMPLEMENTED; + return NULL; +} + +PWCHAR WINAPI +SymGetHomeDirectoryW(DWORD dwType, + PWSTR pszDir, + size_t Size) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL WINAPI +SymGetLineFromName64(HANDLE hProcess, + PCSTR pszModuleName, + PCSTR pszFileName, + DWORD dwLineNumber, + PLONG plDisplacement, + PIMAGEHLP_LINE64 Line) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetLineFromName(HANDLE hProcess, + PCSTR pszModuleName, + PCSTR pszFileName, + DWORD dwLineNumber, + PLONG plDisplacement, + PIMAGEHLP_LINE Line) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetLineFromNameW64(HANDLE hProcess, + PCWSTR pszModuleName, + PCWSTR pszFileName, + DWORD dwLineNumber, + PLONG lpDisplacement, + PIMAGEHLP_LINEW64 Line) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetLineNextW64(HANDLE hProcess, + PIMAGEHLP_LINEW64 Line) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetLinePrevW64(HANDLE hProcess, + PIMAGEHLP_LINEW64 Line) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetScope(HANDLE hProcess, + ULONG64 ModBase, + DWORD Index, + PSYMBOL_INFO Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetScopeW(HANDLE hProcess, + ULONG64 ModBase, + DWORD Index, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSourceFile(HANDLE hProcess, + ULONG64 ModBase, + PCSTR pszParams, + PCSTR pszFileSpec, + PSTR pszFilePath, + DWORD Size) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSourceFileFromToken(HANDLE hProcess, + PVOID Token, + PCSTR pszParams, + PSTR pszFilePath, + DWORD Size) +{ + UNIMPLEMENTED; + return FALSE; +} + + +BOOL WINAPI +SymGetSourceFileFromTokenW(HANDLE hProcess, + PVOID Token, + PCWSTR pszParams, + PWSTR pszFilePath, + DWORD Size) +{ + UNIMPLEMENTED; + return FALSE; +} + +// SymGetSourceFileW +// SymGetSourceVarFromToken +// SymGetSourceVarFromTokenW + +BOOL WINAPI +SymGetSymFromName64(HANDLE hProcess, + PCSTR pszName, + PIMAGEHLP_SYMBOL64 Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSymNext64(HANDLE hProcess, + PIMAGEHLP_SYMBOL64 Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSymPrev64(HANDLE hProcess, + PIMAGEHLP_SYMBOL64 Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSymbolFile(HANDLE hProcess, + PCSTR pszSymPath, + PCSTR pszImageFile, + DWORD Type, + PSTR SymbolFile, + size_t cSymbolFile, + PSTR DbgFile, + size_t cDbgFile) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetSymbolFileW(HANDLE hProcess, + PCWSTR pszSymPath, + PCWSTR pszImageFile, + DWORD Type, + PWSTR pszSymbolFile, + size_t cSymbolFile, + PWSTR pszDbgFile, + size_t cDbgFile) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetTypeFromNameW(HANDLE hProcess, + ULONG64 ModBase, + PCWSTR pszName, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymGetTypeInfoEx(HANDLE hProcess, + DWORD64 ModBase, + PIMAGEHLP_GET_TYPE_INFO_PARAMS Params) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymMatchStringA(PCSTR pszString, + PCSTR pszExpression, + BOOL bCaseSensitiv) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymMatchStringW(PCWSTR pszString, + PCWSTR pszExpression, + BOOL bCaseSensitiv) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymNext(HANDLE hProcess, + PSYMBOL_INFO Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymNextW(HANDLE hProcess, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymPrev(HANDLE hProcess, + PSYMBOL_INFO Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymPrevW(HANDLE hProcess, + PSYMBOL_INFOW Symbol) +{ + UNIMPLEMENTED; + return FALSE; +} + +// SymRefreshModuleList + +PCHAR WINAPI +SymSetHomeDirectory(HANDLE hProcess, + PCSTR pszDir) +{ + UNIMPLEMENTED; + return NULL; +} + +PWCHAR WINAPI +SymSetHomeDirectoryW(HANDLE hProcess, + PCWSTR pszDir) +{ + UNIMPLEMENTED; + return NULL; +} + +// SymSetSymWithAddr64 + +PCSTR WINAPI +SymSrvDeltaName(HANDLE hProcess, + PCSTR pszSymPath, + PCSTR pszType, + PCSTR pszFile1, + PCSTR pszFile2) +{ + UNIMPLEMENTED; + return NULL; +} + +PCWSTR WINAPI +SymSrvDeltaNameW(HANDLE hProcess, + PCWSTR pszSymPath, + PCWSTR pszType, + PCWSTR pszFile1, + PCWSTR pszFile2) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL WINAPI +SymSrvGetFileIndexString(HANDLE hProcess, + PCSTR pszSrvPath, + PCSTR pszFile, + PSTR pszIndex, + size_t Size, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymSrvGetFileIndexStringW(HANDLE hProcess, + PCWSTR pszSrvPath, + PCWSTR pszFile, + PWSTR pszIndex, + size_t Size, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymSrvGetFileIndexes(PCSTR File, + GUID* Id, + DWORD* Val1, + DWORD* Val2, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymSrvGetFileIndexesW(PCWSTR File, + GUID* Id, + DWORD* Val1, + DWORD* Val2, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +PCSTR WINAPI +SymSrvGetSupplement(HANDLE hProcess, + PCSTR pszSymPath, + PCSTR pszNode, + PCSTR pszFile) +{ + UNIMPLEMENTED; + return NULL; +} + +PCWSTR WINAPI +SymSrvGetSupplementW(HANDLE hProcess, + PCWSTR pszSymPath, + PCWSTR pszNode, + PCWSTR pszFile) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL WINAPI +SymSrvIsStore(HANDLE hProcess, + PCSTR pszPath) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SymSrvIsStoreW(HANDLE hProcess, + PCWSTR pszPath) +{ + UNIMPLEMENTED; + return FALSE; +} + +PCSTR WINAPI +SymSrvStoreFile(HANDLE hProcess, + PCSTR pszSrvPath, + PCSTR pszFile, + DWORD pszFlags) +{ + UNIMPLEMENTED; + return NULL; +} + +PCWSTR WINAPI +SymSrvStoreFileW(HANDLE hProcess, + PCWSTR pszSrvPath, + PCWSTR pszFile, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + +PCSTR WINAPI +SymSrvStoreSupplement(HANDLE hProcess, + PCSTR pszSymPath, + PCSTR pszNode, + PCSTR pszFile, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + +PCWSTR WINAPI +SymSrvStoreSupplementW(HANDLE hProcess, + PCWSTR pszSymPath, + PCWSTR pszNode, + PCWSTR pszFile, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL WINAPI +SymUnDName64(PIMAGEHLP_SYMBOL64 Symbol, + PSTR pszUndecoratedName, + DWORD dwUndecoratedNameLength) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD WINAPI +UnDecorateSymbolNameW(PCWSTR DecoratedName, + PWSTR pszUnDecoratedName, + DWORD dwUndecoratedLength, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + + Propchange: trunk/reactos/dll/win32/dbghelp/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 31454: - fix definition of SymGetFileLineOffsets64 - add definitions for PSYM_ENUMPROCESSES_CALLBACK and SymEnumProcesses
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 06:07:34 2007 New Revision: 31454 URL: http://svn.reactos.org/svn/reactos?rev=31454&view=rev Log: - fix definition of SymGetFileLineOffsets64 - add definitions for PSYM_ENUMPROCESSES_CALLBACK and SymEnumProcesses Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h (original) +++ trunk/reactos/include/psdk/dbghelp.h Thu Dec 27 06:07:34 2007 @@ -1076,7 +1076,7 @@ BOOL WINAPI SymGetLineFromName(HANDLE, PCSTR, PCSTR, DWORD, PLONG, PIMAGEHLP_LINE); BOOL WINAPI SymGetLineFromName64(HANDLE, PCSTR, PCSTR, DWORD, PLONG, PIMAGEHLP_LINE64); BOOL WINAPI SymGetLineFromNameW64(HANDLE, PCWSTR, PCWSTR, DWORD, PLONG, PIMAGEHLP_LINEW64); -ULONG WINAPI SymGetFileLineOffsets64(HANDLE, PCSTR, PCSTR, PDWORD64, ULONG); +BOOL WINAPI SymGetFileLineOffsets64(HANDLE, PSTR, PSTR, PDWORD64, ULONG); BOOL WINAPI SymGetSourceFile(HANDLE, ULONG64, PCSTR, PCSTR, PSTR, DWORD); BOOL WINAPI SymGetSourceFileW(HANDLE, ULONG64, PCWSTR, PCWSTR, PWSTR, DWORD); BOOL WINAPI SymGetSourceFileToken(HANDLE, ULONG64, PCSTR, PVOID*, DWORD*); @@ -1177,6 +1177,11 @@ *************************/ BOOL WINAPI SymSetContext(HANDLE, PIMAGEHLP_STACK_FRAME, PIMAGEHLP_CONTEXT); +/************************* + * Processes * + *************************/ +typedef BOOL (*PSYM_ENUMPROCESSES_CALLBACK)(HANDLE, PVOID); +BOOL SymEnumProcesses(PSYM_ENUMPROCESSES_CALLBACK, PVOID); /************************* * Stack management *

1 0

[tkreuzer] 31453: add PDBGHELP_CREATE_USER_DUMP_CALLBACK, DbgHelpCreateUserDump, DbgHelpCreateUserDumpW to dbghelp.h
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 04:01:34 2007 New Revision: 31453 URL: http://svn.reactos.org/svn/reactos?rev=31453&view=rev Log: add PDBGHELP_CREATE_USER_DUMP_CALLBACK, DbgHelpCreateUserDump, DbgHelpCreateUserDumpW to dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h (original) +++ trunk/reactos/include/psdk/dbghelp.h Thu Dec 27 04:01:34 2007 @@ -783,6 +783,13 @@ ULONG*); #include <poppack.h> + +/************************* + * User mode dump * + *************************/ +typedef BOOL (WINAPI *PDBGHELP_CREATE_USER_DUMP_CALLBACK)(DWORD, PVOID*, LPDWORD, PVOID); +BOOL WINAPI DbgHelpCreateUserDump(LPSTR, PDBGHELP_CREATE_USER_DUMP_CALLBACK, PVOID); +BOOL WINAPI DbgHelpCreateUserDumpW(LPWSTR, PDBGHELP_CREATE_USER_DUMP_CALLBACK, PVOID); /************************* * MODULE handling *

1 0

[tkreuzer] 31452: fix definition of FindFileInPath
by tkreuzer＠svn.reactos.org 27 Dec '07

27 Dec '07

Author: tkreuzer Date: Thu Dec 27 03:47:39 2007 New Revision: 31452 URL: http://svn.reactos.org/svn/reactos?rev=31452&view=rev Log: fix definition of FindFileInPath Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h (original) +++ trunk/reactos/include/psdk/dbghelp.h Thu Dec 27 03:47:39 2007 @@ -1124,8 +1124,7 @@ HANDLE WINAPI SymFindDebugInfoFileW(HANDLE, PCWSTR, PWSTR, PFIND_DEBUG_FILE_CALLBACKW, PVOID); typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACK)(PCSTR, PVOID); typedef BOOL (CALLBACK *PFINDFILEINPATHCALLBACKW)(PCWSTR, PVOID); -BOOL WINAPI FindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, - PSTR, PFINDFILEINPATHCALLBACK, PVOID); +BOOL WINAPI FindFileInPath(HANDLE, LPSTR, LPSTR, PVOID, DWORD, DWORD, DWORD, LPSTR); BOOL WINAPI SymFindFileInPath(HANDLE, PCSTR, PCSTR, PVOID, DWORD, DWORD, DWORD, PSTR, PFINDFILEINPATHCALLBACK, PVOID); BOOL WINAPI SymFindFileInPathW(HANDLE, PCWSTR, PCWSTR, PVOID, DWORD, DWORD, DWORD,

1 0

[fireball] 31451: - Silence debug messages.
by fireball＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: fireball Date: Wed Dec 26 21:09:37 2007 New Revision: 31451 URL: http://svn.reactos.org/svn/reactos?rev=31451&view=rev Log: - Silence debug messages. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Wed Dec 26 21:09:37 2007 @@ -454,7 +454,7 @@ if (!NT_SUCCESS(result)) return result; - DPRINT1("Registry key succesfully opened\n"); + DPRINT("Registry key succesfully opened\n"); length = sizeof(KEY_VALUE_FULL_INFORMATION) + 255*2;//MAX_PATH*sizeof(WCHAR); pFullInfo = (PKEY_VALUE_FULL_INFORMATION)&fullInfo; @@ -469,7 +469,7 @@ length, &length); - DPRINT1("First enumerate call result=%x\n", result); + DPRINT("First enumerate call result=%x\n", result); while (result != STATUS_NO_MORE_ENTRIES) { int i; @@ -484,7 +484,7 @@ lpLocale[8]=0; - DPRINT1("Locale=%S\n", lpLocale); + DPRINT("Locale=%S\n", lpLocale); // Call Enum func if (!lpLocaleEnumProc((LPWSTR)lpLocale))

1 0

[tkreuzer] 31450: - fix section pointer calculation - print parameter byte count from W32pArgumentTable - use value of W32pServiceLimit for the loop
by tkreuzer＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: tkreuzer Date: Wed Dec 26 20:57:53 2007 New Revision: 31450 URL: http://svn.reactos.org/svn/reactos?rev=31450&view=rev Log: - fix section pointer calculation - print parameter byte count from W32pArgumentTable - use value of W32pServiceLimit for the loop Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c Modified: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.c (original) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c Wed Dec 26 20:57:53 2007 @@ -27,7 +27,7 @@ PIMAGE_DOS_HEADER pDosHdr; PIMAGE_NT_HEADERS32 pNtHdr32; WORD NumberOfSections; - INT i; + INT i, nSection; DWORD64 dwOffset = 0; pDosHdr = (PIMAGE_DOS_HEADER)pModule; @@ -46,14 +46,16 @@ NumberOfSections = pNtHdr32->FileHeader.NumberOfSections; pSectionHdr = (PIMAGE_SECTION_HEADER)(pNtHdr32 + 1); + nSection = 0; for (i = 0; i < NumberOfSections; i++) { if (dwAdress >= pSectionHdr[i].VirtualAddress && - pSectionHdr[i].PointerToRawData > dwOffset) + pSectionHdr[i].PointerToRawData > pSectionHdr[nSection].PointerToRawData) { - dwOffset = pSectionHdr[i].PointerToRawData; + nSection = i; } } + dwOffset = pSectionHdr[nSection].PointerToRawData + dwAdress - pSectionHdr[nSection].VirtualAddress; return dwOffset; } else @@ -64,16 +66,32 @@ } } +DWORD64 +GetOffsetFromName(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name, PBOOL pbX64) +{ + pSym->SizeOfStruct = sizeof(SYMBOL_INFO); + pSym->MaxNameLen = MAX_SYMBOL_NAME-1; + + if (!SymFromName(hProcess, Name, pSym)) + { + printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); + return 0; + } + return GetOffsetFromAdress64(pModule, pSym->Address - pSym->ModBase, pbX64); +} + int main(int argc, char* argv[]) { HANDLE hProcess; CHAR szModuleFileName[MAX_PATH+1]; DWORD64 dwModuleBase; - DWORD64 dwFileOffset; HANDLE hFile = 0, hMap = 0; PBYTE pModule = NULL; UINT i; BOOL bX64; + DWORD64 dwW32pServiceTable, dwW32pServiceLimit, dwW32pArgumentTable; + DWORD dwServiceLimit; + BYTE *pdwArgs; struct { @@ -124,18 +142,6 @@ goto cleanup; } - Sym.Symbol.SizeOfStruct = sizeof(SYMBOL_INFO); - Sym.Symbol.MaxNameLen = MAX_SYMBOL_NAME-1; - - if (!SymFromName(hProcess, "W32pServiceTable", &Sym.Symbol)) - { - printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); - goto cleanup; - } - - printf("Address for W32pServiceTable = %llx\n", Sym.Symbol.Address); - printf("Module base = %llx\n", dwModuleBase); - hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (!hMap) { @@ -150,31 +156,40 @@ goto cleanup; } - dwFileOffset = GetOffsetFromAdress64(pModule, Sym.Symbol.Address - dwModuleBase, &bX64); - if (!dwFileOffset) - { - printf("PE file is invalid!\n"); - goto cleanup; - } + dwW32pServiceTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceTable", &bX64); + dwW32pServiceLimit = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pServiceLimit", &bX64); + dwW32pArgumentTable = GetOffsetFromName(hProcess, &Sym.Symbol, pModule, "W32pArgumentTable", &bX64); + if (!dwW32pServiceTable || !dwW32pServiceLimit || !dwW32pArgumentTable) + { + printf("Couldn't find adress!\n"); + goto cleanup; + } + + printf("dwW32pServiceTable = %llx\n", dwW32pServiceTable); + printf("dwW32pServiceLimit = %llx\n", dwW32pServiceLimit); + printf("dwW32pArgumentTable = %llx\n", dwW32pArgumentTable); + + dwServiceLimit = *((DWORD*)(pModule + dwW32pServiceLimit)); + pdwArgs = (BYTE*)(pModule + dwW32pArgumentTable); if (!bX64) { - DWORD *pdwEntries32 = (DWORD*)(pModule + dwFileOffset); - - for (i = 0; pdwEntries32[i] > dwModuleBase; i++) + DWORD *pdwEntries32 = (DWORD*)(pModule + dwW32pServiceTable); + + for (i = 0; i <= dwServiceLimit; i++) { SymFromAddr(hProcess, (DWORD64)pdwEntries32[i], 0, &Sym.Symbol); - printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); } } else { - DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwFileOffset); - - for (i = 0; pdwEntries64[i] > dwModuleBase; i++) + DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwW32pServiceTable); + + for (i = 0; i <= dwServiceLimit; i++) { SymFromAddr(hProcess, (DWORD64)pdwEntries64[i], 0, &Sym.Symbol); - printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + printf("0x%x:%s@%d\n", i+0x1000, Sym.Symbol.Name, pdwArgs[i]); } }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007