Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[jimtabor] 31349: Add a test to see which is the naughty handle type abusing the system. Free = 0 Window = 225 Menu = 116 CursorIcon = 1695 Hook = 2 CallProc = 6 Accel = 3 Monitor = 1
by jimtabor＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: jimtabor Date: Thu Dec 20 05:36:38 2007 New Revision: 31349 URL: http://svn.reactos.org/svn/reactos?rev=31349&view=rev Log: Add a test to see which is the naughty handle type abusing the system. Free = 0 Window = 225 Menu = 116 CursorIcon = 1695 Hook = 2 CallProc = 6 Accel = 3 Monitor = 1 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Thu Dec 20 05:36:38 2007 @@ -68,7 +68,47 @@ if (ht->nb_handles >= ht->allocated_handles) /* need to grow the array */ { - DPRINT1("Out of user handles!\n"); +/**/ + int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, + iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0; + /**/ + DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", usedHandles, ht->nb_handles); +//#if 0 + for(i = 0; i < ht->nb_handles; i++) + { + switch (ht->handles[i].type) + { + case otFree: // Should be zero. + iFree++; + break; + case otWindow: + iWindow++; + break; + case otMenu: + iMenu++; + break; + case otCursorIcon: + iCursorIcon++; + break; + case otHook: + iHook++; + break; + case otCallProc: + iCallProc++; + break; + case otAccel: + iAccel++; + break; + case otMonitor: + iMonitor++; + break; + default: + break; + } + } + DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", + iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); +//#endif return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles;

1 0

[cfinck] 31348: Remove this deprecated wchar_t logic. We needed it, when host and target headers weren't fully separated, but this greatly improved now :-)
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:30:20 2007 New Revision: 31348 URL: http://svn.reactos.org/svn/reactos?rev=31348&view=rev Log: Remove this deprecated wchar_t logic. We needed it, when host and target headers weren't fully separated, but this greatly improved now :-) Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Dec 20 03:30:20 2007 @@ -49,26 +49,8 @@ #include <basetsd.h> #include <guiddef.h> -/* wchar_t checks - * First check if wchar_t has already been defined by any host/OS */ -#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ -#define _WCHAR_T_DECLARED -#ifndef _WCHAR_T /* for Mac OS X */ -#define _WCHAR_T -#ifndef _WCHAR_T_ -#define _WCHAR_T_ -#ifndef _WCHAR_T_DEFINED /* If you want to override the wchar_t setting, define this */ #ifndef __cplusplus - typedef unsigned short wchar_t; -#endif -#endif -#endif -#endif -#endif - -/* Set _WCHAR_T_DEFINED for the case that this is checked later */ -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED + typedef unsigned short wchar_t; #endif #include <ctype.h>

1 0

[cfinck] 31347: - Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again - Get rid of the "include/psdk" include directory in the winebuild makefile - Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h>
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:20:01 2007 New Revision: 31347 URL: http://svn.reactos.org/svn/reactos?rev=31347&view=rev Log: - Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again - Get rid of the "include/psdk" include directory in the winebuild makefile - Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h> Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Thu Dec 20 03:20:01 2007 @@ -71,7 +71,7 @@ typedef long long LONGLONG; typedef unsigned long long ULONGLONG; typedef int INT; -typedef unsigned int UINT, *PUINT, *LPUINT; +typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; typedef long int W64 LONG_PTR, *PLONG_PTR; Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Thu Dec 20 03:20:01 2007 @@ -35,7 +35,7 @@ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \ - -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ -I$(INTERMEDIATE_)include WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h (original) +++ trunk/reactos/tools/winebuild/winglue.h Thu Dec 20 03:20:01 2007 @@ -1,18 +1,7 @@ #ifndef _WINGLUE_H #define _WINGLUE_H -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef unsigned short WCHAR; -#if defined(_WIN64) -typedef unsigned __int64 UINT_PTR; -#else -typedef unsigned int UINT_PTR; -#endif - -#define LOBYTE(w) ((BYTE)(w)) -#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) +#include <host/typedefs.h> #define DLL_PROCESS_ATTACH 1 #define DLL_PROCESS_DETACH 0

1 0

[cfinck] 31346: - Bump the version to 1.1-SVN - Add the list of changed components from 0.3.6 to 1.1 - Add "scut" to the build - Update svn:ignore for the "sources" directory
by cfinck＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: cfinck Date: Thu Dec 20 03:03:17 2007 New Revision: 31346 URL: http://svn.reactos.org/svn/reactos?rev=31346&view=rev Log: - Bump the version to 1.1-SVN - Add the list of changed components from 0.3.6 to 1.1 - Add "scut" to the build - Update svn:ignore for the "sources" directory Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/sources/ (props changed) Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Thu Dec 20 03:03:17 2007 @@ -7,8 +7,8 @@ # Released under GNU GPL v2 or any later version. # Constants -ROSBE_VERSION="0.3.7-SVN" -KNOWN_ROSBE_VERSIONS="0.3.6 0.3.7-SVN" +ROSBE_VERSION="1.1-SVN" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1-SVN" DEFAULT_INSTALL_DIR="/usr/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check @@ -274,6 +274,7 @@ process_make=false process_nasm=false process_buildtime=false + process_scut=false # Logic behind this update part: # - KNOWN_ROSBE_VERSIONS contains all versions from the oldest to the newest one (in this order!) @@ -289,8 +290,14 @@ if $setvalues; then case "$known_version" in "0.3.6") - # TODO: Define what has to be reprocessed, when updating from 0.3.6 to the next version + # Updated components from 0.3.6 to 1.1 process_cpucount=true + process_mingwruntime=true + process_w32api=true + process_binutils=true + process_gcc=true + process_nasm=true + process_scut=true ;; esac fi @@ -304,6 +311,7 @@ process_make=true process_nasm=true process_buildtime=true + process_scut=true # Create the directory if necessary if $createdir; then @@ -492,6 +500,12 @@ checkrun fi +if $process_scut; then + echo -n "Compiling scut..." + gcc -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" + checkrun +fi + echo -n "Removing unneeded files... " rm -rf "$installdir/mingw32/sys-include" rm -rf "$installdir/info" Propchange: trunk/tools/RosBE/RosBE-Unix/sources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Dec 20 03:03:17 2007 @@ -1,0 +1,1 @@ +*.tar.bz2

1 0

[jimtabor] 31345: Reorder code since it is a POWNED DC.
by jimtabor＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: jimtabor Date: Thu Dec 20 02:48:07 2007 New Revision: 31345 URL: http://svn.reactos.org/svn/reactos?rev=31345&view=rev Log: Reorder code since it is a POWNED DC. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 20 02:48:07 2007 @@ -630,15 +630,11 @@ if (Window->Wnd->Class->Style & CS_CLASSDC || Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ { - PWINDOW_OBJECT CurrentWindow; if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ DceDeleteClipRgn(pDCE); - CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); - if (CurrentWindow) - { // Update and reset Vis Rgn and clear the dirty bit. - // Should release VisRgn than reset it to default. - DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); - } + // Update and reset Vis Rgn and clear the dirty bit. + // Should release VisRgn than reset it to default. + DceUpdateVisRgn(pDCE, Window, pDCE->DCXFlags); pDCE->DCXFlags = DCX_DCEEMPTY; pDCE->hwndCurrent = 0; }

1 0

[jimtabor] 31344: Fix a problem when freeing a window class with dirty bit set.
by jimtabor＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: jimtabor Date: Thu Dec 20 02:26:04 2007 New Revision: 31344 URL: http://svn.reactos.org/svn/reactos?rev=31344&view=rev Log: Fix a problem when freeing a window class with dirty bit set. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 20 02:26:04 2007 @@ -557,11 +557,6 @@ if (Dce->DCXFlags & DCX_CACHE) { DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); - if (Dce->pProcess) - { - DPRINT1("POWNED!\n"); - return NULL; // should assert here. - } // Need to set ownership so Sync dcattr will work. DC_SetOwnership( Dce->hDC, PsGetCurrentProcess()); DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr @@ -635,8 +630,16 @@ if (Window->Wnd->Class->Style & CS_CLASSDC || Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ { + PWINDOW_OBJECT CurrentWindow; if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ DceDeleteClipRgn(pDCE); + CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); + if (CurrentWindow) + { // Update and reset Vis Rgn and clear the dirty bit. + // Should release VisRgn than reset it to default. + DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); + } + pDCE->DCXFlags = DCX_DCEEMPTY; pDCE->hwndCurrent = 0; } else if (Window->Wnd->Class->Style & CS_OWNDC || @@ -665,7 +668,6 @@ DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); DceReleaseDC(pDCE, FALSE); } - pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->hwndCurrent = 0; }

1 0

[cfinck] 31343: - Fix indentation I accidentally broke - Update svn:ignore for both affected directories
by cfinck＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cfinck Date: Thu Dec 20 01:07:53 2007 New Revision: 31343 URL: http://svn.reactos.org/svn/reactos?rev=31343&view=rev Log: - Fix indentation I accidentally broke - Update svn:ignore for both affected directories Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ (props changed) trunk/tools/RosBE/Tools/ (props changed) trunk/tools/RosBE/Tools/scut.c Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Dec 20 01:07:53 2007 @@ -1,7 +1,1 @@ *.exe -*.sln -*.ncb -*.suo -*.user -Debug -Release Propchange: trunk/tools/RosBE/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Dec 20 01:07:53 2007 @@ -1,1 +1,7 @@ *.exe +*.sln +*.ncb +*.suo +*.user +Debug +Release Modified: trunk/tools/RosBE/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/scut.c?rev=31343… ============================================================================== --- trunk/tools/RosBE/Tools/scut.c (original) +++ trunk/tools/RosBE/Tools/scut.c Thu Dec 20 01:07:53 2007 @@ -14,23 +14,23 @@ #include <string.h> #if defined(WIN32) -# include <direct.h> -# include <io.h> - -# define paccess(path, mode) _access(path, mode) -# define pchdir(path) _chdir(path) -# define pgetcwd(buffer, maxlen) _getcwd(buffer, maxlen) -# define pmkdir(path) _mkdir(path) -# define pstricmp(str1, str2) _stricmp(str1, str2) +# include <direct.h> +# include <io.h> + +# define paccess(path, mode) _access(path, mode) +# define pchdir(path) _chdir(path) +# define pgetcwd(buffer, maxlen) _getcwd(buffer, maxlen) +# define pmkdir(path) _mkdir(path) +# define pstricmp(str1, str2) _stricmp(str1, str2) #else -# include <sys/stat.h> -# include <unistd.h> - -# define paccess(path, mode) access(path, mode) -# define pchdir(path) chdir(path) -# define pgetcwd(buffer, maxlen) getcwd(buffer, maxlen) -# define pmkdir(path) mkdir(path, S_IRWXU | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) // chmod rights: 0755 -# define pstricmp(str1, str2) strcasecmp(str1, str2) +# include <sys/stat.h> +# include <unistd.h> + +# define paccess(path, mode) access(path, mode) +# define pchdir(path) chdir(path) +# define pgetcwd(buffer, maxlen) getcwd(buffer, maxlen) +# define pmkdir(path) mkdir(path, S_IRWXU | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) // chmod rights: 0755 +# define pstricmp(str1, str2) strcasecmp(str1, str2) #endif

1 0

[cfinck] 31342: - Make scut fully compilable under both Windows and Unix - Move it to the RosBE/Tools directory, where all the other portable tools are
by cfinck＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cfinck Date: Thu Dec 20 01:01:44 2007 New Revision: 31342 URL: http://svn.reactos.org/svn/reactos?rev=31342&view=rev Log: - Make scut fully compilable under both Windows and Unix - Move it to the RosBE/Tools directory, where all the other portable tools are Added: trunk/tools/RosBE/Tools/scut.c - copied, changed from r31334, trunk/tools/RosBE/RosBE-Windows/Tools/scut.c trunk/tools/RosBE/Tools/scut.vcproj - copied unchanged from r31334, trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj Removed: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile trunk/tools/RosBE/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ma… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile Thu Dec 20 01:01:44 2007 @@ -8,7 +8,7 @@ SUFFIX := .exe WINVER := 0x500 -all: buildtime chknewer chkslash echoh flash getdate rquote scut tee +all: buildtime chknewer chkslash echoh flash getdate rquote tee buildtime: buildtime.c ${CC} ${CFLAGS} buildtime$(SUFFIX) buildtime.c @@ -38,13 +38,9 @@ ${CC} ${CFLAGS} rquote rquote.c $(STRIP) rquote$(SUFFIX) -scut: scut.c - ${CC} ${CFLAGS} scut scut.c - $(STRIP) scut$(SUFFIX) - tee: tee.c ${CC} ${CFLAGS} tee tee.c $(STRIP) tee$(SUFFIX) clean: - del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe scut.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe tee.exe Removed: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (removed) @@ -1,652 +1,0 @@ -/* - * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. - * FILE: Tools/scut.c - * PURPOSE: Manages named shortcuts to ReactOS source directories. - * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> - * Daniel Reimer <reimer.daniel(a)freenet.de> - * - */ - -#include <direct.h> -#include <io.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -typedef struct _SHORTCUT -{ - char* name; - char* path; - struct _SHORTCUT *next; -} SHORTCUT, *PSHORTCUT; - -#define LINE_MAX 1024 -char* programname; -char rosbeappdata[248]; -char shortcutfile[260]; -int hasshortcuts = 0; - -PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); -void checkfile(void); -int checkname(PSHORTCUT head, char* name); -int checkpath(char* path); // Alters path by fully expanding it. -void defaultshortcut(char* name); -PSHORTCUT deleteshortcut(PSHORTCUT ptr, PSHORTCUT *head); -void editshortcut(PSHORTCUT ptr, char* name, char* path); -void freeshortcuts(PSHORTCUT ptr); -PSHORTCUT previousshortcut(PSHORTCUT current, PSHORTCUT head); -PSHORTCUT readshortcuts(void); -int writeshortcuts(PSHORTCUT head); - -int main(int argc, char* argv[]) -{ - PSHORTCUT shortcuts = NULL, current = NULL; - char name[260], path[260]; - int removed = 0; - programname = argv[0]; - -#if defined(WIN32) - strncpy(rosbeappdata, getenv("APPDATA"), 241); - strcat(rosbeappdata, "\\RosBE"); - strcpy(shortcutfile, rosbeappdata); - strcat(shortcutfile, "\\srclist.txt"); -#else - strncopy(rosbeappdata, getenv("HOME"), 240); - strcat(rosbeappdata, "/.RosBE"); - strcpy(shortcutfile, rosbeappdata); - strcat(shortcutfile, "/srclist.txt"); -#endif - - checkfile(); - - if (argc > 4) - { - fprintf(stderr, "%s: Error too many parameters specified.\n", programname); - return -1; - } - if (argc == 1) - { - defaultshortcut(NULL); - } - else if ((!strcmp(argv[1], "/?")) || - (!_stricmp(argv[1], "-h")) || - (!_stricmp(argv[1], "--help"))) - { - printf("Usage: %s [OPTIONS] [SHORTCUT] [PATH]\n", programname); - printf("Manages named shortcuts to ReactOS source directories. scut started\n"); - printf("with the name of a shortcut sets this shortcut active.\n\n"); - printf("The following details the options:\n\n"); - printf(" list - Lists all shortcuts and their paths.\n"); - printf(" add - Adds a shortcut.\n"); - printf(" (Optional: SHORTCUT PATH as the second and third parameters)\n"); - printf(" rem - Removes a shortcut.\n"); - printf(" (Optional: SHORTCUT as the second parameter)\n"); - printf(" edit - Edits a shortcut.\n"); - printf(" (Optional: SHORTCUT PATH as the second and third parameters)\n"); - printf(" def - Sets the default shortcut which is enabled on\n"); - printf(" every start of RosBE. 'Default' is the source\n"); - printf(" directory as you know it from previous versions.\n\n"); - return 0; - } - else if (!_stricmp(argv[1], "list")) - { - shortcuts = readshortcuts(); - current = shortcuts; - - if (hasshortcuts) - { - printf("All available shortcuts:\n\n"); - while(current) - { - if (!_stricmp(current->name, "Default")) - { - current = current->next; - continue; - } - printf("Shortcut Name: %s\n", current->name); - printf(" -> Path: %s\n", current->path); - current = current->next; - } - } - else - { - printf("No shortcuts found, use 'scut add' to create one.\n"); - } - freeshortcuts(shortcuts); - } - else if (!_stricmp(argv[1], "add")) - { - shortcuts = readshortcuts(); - current = shortcuts; - - if (argc >= 3) - { - strcpy(name, argv[2]); - } - else - { - do - { - printf("Please enter a name for the shortcut: "); - fflush(stdin); - - if(!fgets(name, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(name) <= 1); - - strcpy(name, strtok(name, "\n")); - } - if (!checkname(shortcuts, name)) - { - fprintf(stderr, "%s: Shortcut '%s' already exists.\n", programname, name); - } - else - { - if (argc == 4) - { - strcpy(path, argv[3]); - } - else - { - do - { - printf("Please enter the path for the shortcut: "); - fflush(stdin); - - if(!fgets(path, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(path) <= 1); - - strcpy(path, strtok(path, "\n")); - } - if (!checkpath(path)) - { - fprintf(stderr, "%s: Directory '%s' doesn't exist.\n", programname, path); - } - else - { - shortcuts = addshortcut(shortcuts, name, path); - writeshortcuts(shortcuts); - } - } - freeshortcuts(shortcuts); - } - else if (!_stricmp(argv[1], "rem")) - { - shortcuts = readshortcuts(); - current = shortcuts; - - if (argc >= 3) - { - strcpy(name, argv[2]); - } - else - { - do - { - printf("Please enter the name of the shortcut to remove: "); - fflush(stdin); - - if(!fgets(name, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(name) <= 1); - - strcpy(name, strtok(name, "\n")); - } - if (!_stricmp(name, "Default")) - { - fprintf(stderr, "%s: Unable to remove default shortcut.\n", programname); - } - else - { - while(current) - { - if (!_stricmp(current->name, name)) - { - current = deleteshortcut(current, &shortcuts); - removed = 1; - break; - } - current = current->next; - } - if (removed) - { - writeshortcuts(shortcuts); - printf("Removed shortcut: %s\n", name); - } - else - { - printf("Unable to find shortcut: %s\n", name); - } - } - freeshortcuts(shortcuts); - } - else if (!_stricmp(argv[1], "edit")) - { - shortcuts = readshortcuts(); - current = shortcuts; - - if (argc >= 3) - { - strcpy(name, argv[2]); - } - else - { - do - { - printf("Please enter the name of the shortcut to edit: "); - fflush(stdin); - - if(!fgets(name, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(name) <= 1); - - strcpy(name, strtok(name, "\n")); - } - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) - { - fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); - } - else - { - while(current) - { - if (!_stricmp(current->name, name)) - { - if (argc == 4) - { - strcpy(path, argv[3]); - } - else - { - do - { - printf("Please enter a new path for the shortcut: "); - fflush(stdin); - - if(!fgets(path, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(path) <= 1); - - strcpy(path, strtok(path, "\n")); - } - if (!checkpath(path)) - { - fprintf(stderr, "%s: Directory '%s' doesn't exist.\n", programname, path); - break; - } - else - { - editshortcut(current, name, path); - writeshortcuts(shortcuts); - printf("Edited shortcut: %s\n", name); - break; - } - } - current = current->next; - } - } - freeshortcuts(shortcuts); - } - else if (!_stricmp(argv[1], "def")) - { - shortcuts = readshortcuts(); - current = shortcuts; - - if (argc >= 3) - { - strcpy(name, argv[2]); - } - else - { - do - { - printf("Please enter the the name of the shortcut to set as default: "); - fflush(stdin); - - if(!fgets(name, 260, stdin)) - { - freeshortcuts(shortcuts); - return -1; - } - } while(strlen(name) <= 1); - - strcpy(name, strtok(name, "\n")); - } - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) - { - fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); - freeshortcuts(shortcuts); - } - else - { - freeshortcuts(shortcuts); - defaultshortcut(name); - } - } - else - { - if (argc > 2) - { - fprintf(stderr, "%s: Error too many parameters specified.\n", programname); - return -1; - } - shortcuts = readshortcuts(); - current = shortcuts; - - strcpy(name, argv[1]); - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) - { - fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); - } - else - { - while(current) - { - if (!_stricmp(current->name, name)) - { - printf("%s", current->path); - break; - } - current = current->next; - } - } - freeshortcuts(shortcuts); - } - - return 0; -} - -PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path) -{ - if (!ptr) - { - ptr = (PSHORTCUT)malloc(sizeof(SHORTCUT)); - ptr->name = (char*)malloc(strlen(name) + 1); - strcpy(ptr->name, name); - ptr->path = (char*)malloc(strlen(path) + 1); - strcpy(ptr->path, path); - ptr->next = NULL; - } - else - { - ptr->next = addshortcut(ptr->next, name, path); - } - - return ptr; -} - -void checkfile(void) -{ - FILE *fp; - - fp = fopen(shortcutfile, "r"); - if (!fp) - { - if(_access(rosbeappdata, 0) == -1) - { - // Directory does not exist, create it - if(_mkdir(rosbeappdata) == -1) - { - fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); - } - } - - fp = fopen(shortcutfile, "w"); - if (!fp) - { - fprintf(stderr, "%s: Error creating file.\n", programname); - } - else - { - fprintf(fp, "Default,Default\n"); - if (fclose(fp)) - { - fprintf(stderr, "%s: Error closing file.\n", programname); - } - } - } - else - { - if (fclose(fp)) - { - fprintf(stderr, "%s: Error closing file.\n", programname); - } - } -} - -int checkname(PSHORTCUT head, char* name) -{ - PSHORTCUT current = head; - - while(current) - { - if (!_stricmp(current->name, name)) - { - return 0; - } - current = current->next; - } - - return 1; -} - -int checkpath(char* path) -{ - char currentdir[260]; - _getcwd(currentdir, 260); - if (!_chdir(path)) - { - _getcwd(path, 260); - _chdir(currentdir); - return 1; - } - - return 0; -} - -void defaultshortcut(char* name) -{ - PSHORTCUT shortcuts = NULL, current = NULL; - char path[260]; - - shortcuts = readshortcuts(); - current = shortcuts; - - if (!name) - { - while(current) - { - if (!_stricmp(current->name, "Default")) - { - printf("%s", current->path); - break; - } - current = current->next; - } - } - else - { - while(current) - { - if (!_stricmp(current->name, name)) - { - strcpy(path, current->path); - current = shortcuts; - while(current) - { - if (!_stricmp(current->name, "Default")) - { - editshortcut(current, "Default", path); - writeshortcuts(shortcuts); - printf("Default shortcut set to: %s\n", path); - break; - } - current = current->next; - } - break; - } - current = current->next; - } - } - - freeshortcuts(shortcuts); -} - -PSHORTCUT deleteshortcut(PSHORTCUT current, PSHORTCUT *head) -{ - PSHORTCUT temp = NULL; - PSHORTCUT previous = NULL; - - if (current) - { - temp = current; - if (current != *head) - { - previous = previousshortcut(current, *head); - current = current->next; - previous->next = current; - } - else - { - *head = current->next; - } - if (temp->name) free(temp->name); - if (temp->path) free(temp->path); - free(temp); - } - - return current; -} - -void editshortcut(PSHORTCUT current, char* name, char* path) -{ - if (current) - { - if (name) - { - current->name = (char*)realloc(current->name, strlen(name) + 1); - strcpy(current->name, name); - } - if (path) - { - current->path = (char*)realloc(current->path, strlen(path) + 1); - strcpy(current->path, path); - } - } -} - -void freeshortcuts(PSHORTCUT head) -{ - PSHORTCUT temp = NULL; - - while (head) - { - temp = head; - head = head->next; - if (temp->name) free(temp->name); - if (temp->path) free(temp->path); - free(temp); - } -} - -PSHORTCUT previousshortcut(PSHORTCUT current, PSHORTCUT head) -{ - PSHORTCUT temp = head; - - if(current == head) - { - return head; - } - - while(temp->next != current) - { - temp = temp->next; - } - - return temp; -} - -PSHORTCUT readshortcuts(void) -{ - FILE *fp; - PSHORTCUT head = NULL; - char strbuff[LINE_MAX]; - char *name = NULL, *path = NULL; - - fp = fopen(shortcutfile, "r"); - if (!fp) - { - fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); - return NULL; - } - else - { - while(!feof(fp)) - { - fgets(strbuff, LINE_MAX, fp); - name = strtok(strbuff, ","); - path = strtok(NULL, "\n"); - if (name && path) - { - if (_stricmp(name, "Default") && - !hasshortcuts) - { - hasshortcuts = 1; - } - head = addshortcut(head, name, path); - } - } - if (fclose(fp)) - { - fprintf(stderr, "%s: Error closing file.\n", programname); - freeshortcuts(head); - return NULL; - } - } - - return head; -} - -int writeshortcuts(PSHORTCUT head) -{ - FILE *fp; - - fp = fopen(shortcutfile, "w"); - if (!fp) - { - fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); - return -1; - } - else - { - while(head) - { - fprintf(fp, "%s,%s\n", head->name, head->path); - head = head->next; - } - if (fclose(fp)) - { - fprintf(stderr, "%s: Error closing file.\n", programname); - return -1; - } - } - - return 0; -} Removed: trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj (removed) @@ -1,185 +1,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="scut" - ProjectGUID="{4698046D-30AC-49E1-A767-520A75AA06FE}" - RootNamespace="scut" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="scut.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: trunk/tools/RosBE/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/makefile?rev=313… ============================================================================== --- trunk/tools/RosBE/Tools/makefile (original) +++ trunk/tools/RosBE/Tools/makefile Thu Dec 20 01:01:44 2007 @@ -17,11 +17,16 @@ endif -all: cpucount +all: cpucount scut cpucount: cpucount.c ${CC} ${CFLAGS} cpucount$(SUFFIX) cpucount.c $(STRIP) cpucount$(SUFFIX) +scut: scut.c + ${CC} ${CFLAGS} scut$(SUFFIX) scut.c + $(STRIP) scut$(SUFFIX) + clean: $(RM) cpucount$(SUFFIX) + $(RM) scut$(SUFFIX) Copied: trunk/tools/RosBE/Tools/scut.c (from r31334, trunk/tools/RosBE/RosBE-Windows/Tools/scut.c) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/scut.c?p2=trunk/… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/Tools/scut.c Thu Dec 20 01:01:44 2007 @@ -5,14 +5,38 @@ * PURPOSE: Manages named shortcuts to ReactOS source directories. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> * Daniel Reimer <reimer.daniel(a)freenet.de> + * Colin Finck <mail(a)colinfinck.de> * */ -#include <direct.h> -#include <io.h> #include <stdio.h> #include <stdlib.h> #include <string.h> + +#if defined(WIN32) +# include <direct.h> +# include <io.h> + +# define paccess(path, mode) _access(path, mode) +# define pchdir(path) _chdir(path) +# define pgetcwd(buffer, maxlen) _getcwd(buffer, maxlen) +# define pmkdir(path) _mkdir(path) +# define pstricmp(str1, str2) _stricmp(str1, str2) +#else +# include <sys/stat.h> +# include <unistd.h> + +# define paccess(path, mode) access(path, mode) +# define pchdir(path) chdir(path) +# define pgetcwd(buffer, maxlen) getcwd(buffer, maxlen) +# define pmkdir(path) mkdir(path, S_IRWXU | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) // chmod rights: 0755 +# define pstricmp(str1, str2) strcasecmp(str1, str2) +#endif + + + +#define LINE_MAX 1024 +#define READWRITE 6 // R_OK | W_OK for access(), these constants don't exist in MSVC typedef struct _SHORTCUT { @@ -21,7 +45,7 @@ struct _SHORTCUT *next; } SHORTCUT, *PSHORTCUT; -#define LINE_MAX 1024 + char* programname; char rosbeappdata[248]; char shortcutfile[260]; @@ -52,10 +76,10 @@ strcpy(shortcutfile, rosbeappdata); strcat(shortcutfile, "\\srclist.txt"); #else - strncopy(rosbeappdata, getenv("HOME"), 240); + strncpy(rosbeappdata, getenv("HOME"), 244); strcat(rosbeappdata, "/.RosBE"); strcpy(shortcutfile, rosbeappdata); - strcat(shortcutfile, "/srclist.txt"); + strcat(shortcutfile, "/srclist"); #endif checkfile(); @@ -70,8 +94,8 @@ defaultshortcut(NULL); } else if ((!strcmp(argv[1], "/?")) || - (!_stricmp(argv[1], "-h")) || - (!_stricmp(argv[1], "--help"))) + (!pstricmp(argv[1], "-h")) || + (!pstricmp(argv[1], "--help"))) { printf("Usage: %s [OPTIONS] [SHORTCUT] [PATH]\n", programname); printf("Manages named shortcuts to ReactOS source directories. scut started\n"); @@ -89,7 +113,7 @@ printf(" directory as you know it from previous versions.\n\n"); return 0; } - else if (!_stricmp(argv[1], "list")) + else if (!pstricmp(argv[1], "list")) { shortcuts = readshortcuts(); current = shortcuts; @@ -99,7 +123,7 @@ printf("All available shortcuts:\n\n"); while(current) { - if (!_stricmp(current->name, "Default")) + if (!pstricmp(current->name, "Default")) { current = current->next; continue; @@ -115,7 +139,7 @@ } freeshortcuts(shortcuts); } - else if (!_stricmp(argv[1], "add")) + else if (!pstricmp(argv[1], "add")) { shortcuts = readshortcuts(); current = shortcuts; @@ -178,7 +202,7 @@ } freeshortcuts(shortcuts); } - else if (!_stricmp(argv[1], "rem")) + else if (!pstricmp(argv[1], "rem")) { shortcuts = readshortcuts(); current = shortcuts; @@ -203,7 +227,7 @@ strcpy(name, strtok(name, "\n")); } - if (!_stricmp(name, "Default")) + if (!pstricmp(name, "Default")) { fprintf(stderr, "%s: Unable to remove default shortcut.\n", programname); } @@ -211,7 +235,7 @@ { while(current) { - if (!_stricmp(current->name, name)) + if (!pstricmp(current->name, name)) { current = deleteshortcut(current, &shortcuts); removed = 1; @@ -231,7 +255,7 @@ } freeshortcuts(shortcuts); } - else if (!_stricmp(argv[1], "edit")) + else if (!pstricmp(argv[1], "edit")) { shortcuts = readshortcuts(); current = shortcuts; @@ -256,7 +280,7 @@ strcpy(name, strtok(name, "\n")); } - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + if (!pstricmp(name, "Default") || checkname(shortcuts, name)) { fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); } @@ -264,7 +288,7 @@ { while(current) { - if (!_stricmp(current->name, name)) + if (!pstricmp(current->name, name)) { if (argc == 4) { @@ -304,7 +328,7 @@ } freeshortcuts(shortcuts); } - else if (!_stricmp(argv[1], "def")) + else if (!pstricmp(argv[1], "def")) { shortcuts = readshortcuts(); current = shortcuts; @@ -329,7 +353,7 @@ strcpy(name, strtok(name, "\n")); } - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + if (!pstricmp(name, "Default") || checkname(shortcuts, name)) { fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); freeshortcuts(shortcuts); @@ -351,7 +375,7 @@ current = shortcuts; strcpy(name, argv[1]); - if (!_stricmp(name, "Default") || checkname(shortcuts, name)) + if (!pstricmp(name, "Default") || checkname(shortcuts, name)) { fprintf(stderr, "%s: Shortcut '%s' doesn't exist.\n", programname, name); } @@ -359,9 +383,9 @@ { while(current) { - if (!_stricmp(current->name, name)) - { - printf("%s", current->path); + if (!pstricmp(current->name, name)) + { + printf("%s\n", current->path); break; } current = current->next; @@ -399,10 +423,10 @@ fp = fopen(shortcutfile, "r"); if (!fp) { - if(_access(rosbeappdata, 0) == -1) + if(paccess(rosbeappdata, READWRITE) == -1) { // Directory does not exist, create it - if(_mkdir(rosbeappdata) == -1) + if(pmkdir(rosbeappdata) == -1) { fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); } @@ -437,7 +461,7 @@ while(current) { - if (!_stricmp(current->name, name)) + if (!pstricmp(current->name, name)) { return 0; } @@ -450,11 +474,11 @@ int checkpath(char* path) { char currentdir[260]; - _getcwd(currentdir, 260); - if (!_chdir(path)) - { - _getcwd(path, 260); - _chdir(currentdir); + pgetcwd(currentdir, 260); + if (!pchdir(path)) + { + pgetcwd(path, 260); + pchdir(currentdir); return 1; } @@ -473,9 +497,9 @@ { while(current) { - if (!_stricmp(current->name, "Default")) - { - printf("%s", current->path); + if (!pstricmp(current->name, "Default")) + { + printf("%s\n", current->path); break; } current = current->next; @@ -485,13 +509,13 @@ { while(current) { - if (!_stricmp(current->name, name)) + if (!pstricmp(current->name, name)) { strcpy(path, current->path); current = shortcuts; while(current) { - if (!_stricmp(current->name, "Default")) + if (!pstricmp(current->name, "Default")) { editshortcut(current, "Default", path); writeshortcuts(shortcuts); @@ -605,7 +629,7 @@ path = strtok(NULL, "\n"); if (name && path) { - if (_stricmp(name, "Default") && + if (pstricmp(name, "Default") && !hasshortcuts) { hasshortcuts = 1;

1 0

[tkreuzer] 31341: update README.WINE
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:55:04 2007 New Revision: 31341 URL: http://svn.reactos.org/svn/reactos?rev=31341&view=rev Log: update README.WINE Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Dec 20 00:55:04 2007 @@ -42,7 +42,7 @@ reactos/dll/win32/crypt32 # Out of sync reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync -reactos/dll/win32/dbghelp # +reactos/dll/win32/dbghelp # Synced to Wine-0_9_51 reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync

1 0

[tkreuzer] 31340: syscall dumper for win32k that also works on vista. You need dbghelp.dll and symsrv.dll. The ones from syscall lister (http://www.openrce.org/blog/view/808/Syscall_lister) work fine, the ones shipped with windows don't. todo: support x64
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:48:15 2007 New Revision: 31340 URL: http://svn.reactos.org/svn/reactos?rev=31340&view=rev Log: syscall dumper for win32k that also works on vista. You need dbghelp.dll and symsrv.dll. The ones from syscall lister (http://www.openrce.org/blog/view/808/Syscall_lister) work fine, the ones shipped with windows don't. todo: support x64 Added: trunk/rosapps/devutils/syscalldump/ (with props) trunk/rosapps/devutils/syscalldump/syscalldump.c (with props) trunk/rosapps/devutils/syscalldump/syscalldump.rbuild (with props) Modified: trunk/rosapps/devutils/directory.rbuild Modified: trunk/rosapps/devutils/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/directory.rbuild?… ============================================================================== --- trunk/rosapps/devutils/directory.rbuild (original) +++ trunk/rosapps/devutils/directory.rbuild Thu Dec 20 00:48:15 2007 @@ -16,6 +16,10 @@ <xi:include href="roswebparser/roswebparser.rbuild" /> </directory> + <directory name="syscalldump"> + <xi:include href="syscalldump/syscalldump.rbuild" /> + </directory> + <directory name="zoomin"> <xi:include href="zoomin/zoomin.rbuild" /> </directory> Propchange: trunk/rosapps/devutils/syscalldump/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Dec 20 00:48:15 2007 @@ -1,0 +1,2 @@ +syscalldump.depend +syscalldump.cbp Added: trunk/rosapps/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.c (added) +++ trunk/rosapps/devutils/syscalldump/syscalldump.c Thu Dec 20 00:48:15 2007 @@ -1,0 +1,196 @@ +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#define _WINVER 0x501 +#include <windows.h> +#include <shlwapi.h> +#include <dbghelp.h> + +HANDLE hCurrentProcess; + +#define MAX_SYMBOL_NAME 1024 + +BOOL InitDbgHelp(HANDLE hProcess) +{ + if (!SymInitialize(hProcess, 0, FALSE)) + return FALSE; + + SymSetOptions(SymGetOptions() | SYMOPT_ALLOW_ABSOLUTE_SYMBOLS); + SymSetOptions(SymGetOptions() & (~SYMOPT_DEFERRED_LOADS)); + SymSetSearchPath(hProcess, "srv**symbols*http://msdl.microsoft.com/download/symbols"); + return TRUE; +} + +DWORD64 +GetOffsetFromAdress64(PBYTE pModule, DWORD64 dwAdress, PBOOL pbX64) +{ + PIMAGE_DOS_HEADER pDosHdr; + PIMAGE_NT_HEADERS32 pNtHdr32; + WORD NumberOfSections; + INT i; + DWORD64 dwOffset = 0; + + pDosHdr = (PIMAGE_DOS_HEADER)pModule; + pNtHdr32 = (PIMAGE_NT_HEADERS32)((UINT_PTR)pModule + pDosHdr->e_lfanew); + + if (pNtHdr32->Signature != IMAGE_NT_SIGNATURE) + { + return 0; + } + + if (pNtHdr32->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) + { + PIMAGE_SECTION_HEADER pSectionHdr; + + *pbX64 = FALSE; + NumberOfSections = pNtHdr32->FileHeader.NumberOfSections; + pSectionHdr = (PIMAGE_SECTION_HEADER)(pNtHdr32 + 1); + + for (i = 0; i < NumberOfSections; i++) + { + if (dwAdress >= pSectionHdr[i].VirtualAddress && + pSectionHdr[i].PointerToRawData > dwOffset) + { + dwOffset = pSectionHdr[i].PointerToRawData; + } + } + return dwOffset; + } + else + { + *pbX64 = TRUE; + printf("x64 is unsupported atm\n"); + return 0; + } +} + +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; + + struct + { + SYMBOL_INFO Symbol; + CHAR Name[MAX_SYMBOL_NAME]; + } Sym; + + printf("Win32k Syscall dumper\n"); + printf("Copyright (c) Timo Kreuzer 2007\n"); + + hProcess = GetCurrentProcess(); + + // try current dir + GetCurrentDirectory(MAX_PATH, szModuleFileName); + strcat(szModuleFileName, "\\win32k.sys"); + hFile = CreateFile(szModuleFileName, FILE_READ_DATA, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + goto cont; + } + + // try system dir + GetSystemDirectory(szModuleFileName, MAX_PATH); + strcat(szModuleFileName, "\\win32k.sys"); + hFile = CreateFile(szModuleFileName, FILE_READ_DATA, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + printf("CreateFile() failed: %ld!\n", GetLastError()); + goto cleanup; + } + +cont: + printf("Trying to get syscalls from: %s\n", szModuleFileName); + + if (!InitDbgHelp(hProcess)) + { + printf("SymInitialize() failed\n"); + goto cleanup; + } + + printf("Loading symbols for %s, please wait...\n", szModuleFileName); + dwModuleBase = SymLoadModule64(hProcess, 0, szModuleFileName, 0, 0, 0); + if (dwModuleBase == 0) + { + printf("SymLoadModule64() failed: %ld\n", GetLastError()); + 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) + { + printf("CreateFileMapping() failed: %ld\n", GetLastError()); + goto cleanup; + } + + pModule = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); + if(!pModule) + { + printf("MapViewOfFile() failed: %ld\n", GetLastError()); + goto cleanup; + } + + dwFileOffset = GetOffsetFromAdress64(pModule, Sym.Symbol.Address - dwModuleBase, &bX64); + if (!dwFileOffset) + { + printf("PE file is invalid!\n"); + goto cleanup; + } + + if (!bX64) + { + DWORD *pdwEntries32 = (DWORD*)(pModule + dwFileOffset); + + for (i = 0; pdwEntries32[i] > dwModuleBase; i++) + { + SymFromAddr(hProcess, (DWORD64)pdwEntries32[i], 0, &Sym.Symbol); + printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + } + } + else + { + DWORD64 *pdwEntries64 = (DWORD64*)(pModule + dwFileOffset); + + for (i = 0; pdwEntries64[i] > dwModuleBase; i++) + { + SymFromAddr(hProcess, (DWORD64)pdwEntries64[i], 0, &Sym.Symbol); + printf("0x%x:%s\n", i+0x1000, Sym.Symbol.Name); + } + } + +cleanup: + if (pModule) + { + UnmapViewOfFile(pModule); + } + if (hMap) + { + CloseHandle(hMap); + } + if (hFile) + { + CloseHandle(hFile); + } + + return 0; +} Propchange: trunk/rosapps/devutils/syscalldump/syscalldump.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/syscalldump/syscalldump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/syscalldump/sysca… ============================================================================== --- trunk/rosapps/devutils/syscalldump/syscalldump.rbuild (added) +++ trunk/rosapps/devutils/syscalldump/syscalldump.rbuild Thu Dec 20 00:48:15 2007 @@ -1,0 +1,9 @@ +<module name="syscalldump" type="win32cui" installname="syscalldump.exe"> + <include base="syscalldump">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>dbghelp</library> + <file>syscalldump.c</file> +</module> Propchange: trunk/rosapps/devutils/syscalldump/syscalldump.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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