Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 31339: sync dbghelp.dll to wine head. should fix build
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:34:55 2007 New Revision: 31339 URL: http://svn.reactos.org/svn/reactos?rev=31339&view=rev Log: sync dbghelp.dll to wine head. should fix build Added: trunk/reactos/dll/win32/dbghelp/dwarf.c (with props) trunk/reactos/dll/win32/dbghelp/dwarf.h (with props) trunk/reactos/dll/win32/dbghelp/wdbgexts.h (with props) Removed: trunk/reactos/dll/win32/dbghelp/mscvpdb.h trunk/reactos/dll/win32/dbghelp/regex.h Modified: trunk/reactos/dll/win32/dbghelp/Makefile.in trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image.c trunk/reactos/dll/win32/dbghelp/memory.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/source.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/dll/win32/dbghelp/storage.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/Makefile… Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Added: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Added: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… Modified: trunk/reactos/dll/win32/dbghelp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image.c?… Modified: trunk/reactos/dll/win32/dbghelp/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/memory.c… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Removed: trunk/reactos/dll/win32/dbghelp/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/mscvpdb.… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Removed: trunk/reactos/dll/win32/dbghelp/regex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/regex.h?… Modified: trunk/reactos/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/source.c… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… Modified: trunk/reactos/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/storage.… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Added: trunk/reactos/dll/win32/dbghelp/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/wdbgexts…

1 0

[mpiulachs] 31338: spanish localizations by Remialdo <remialdo at gmail dot com> - Added: systeminfo, mazescr and msgina - Fix unterminated string in systeminfo/lang/es-ES.rc See issue #2905 for more details.
by mpiulachs＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: mpiulachs Date: Thu Dec 20 00:25:05 2007 New Revision: 31338 URL: http://svn.reactos.org/svn/reactos?rev=31338&view=rev Log: spanish localizations by Remialdo <remialdo at gmail dot com> - Added: systeminfo, mazescr and msgina - Fix unterminated string in systeminfo/lang/es-ES.rc See issue #2905 for more details. Added: trunk/reactos/dll/win32/msgina/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc (with props) trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc (with props) Modified: trunk/reactos/dll/win32/msgina/msgina.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/sysutils/systeminfo/rsrc.rc Added: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,61 @@ +/* + *Spanish Language resource file + * Javier Remacha 2007-12-06 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Por favor espere..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bienvenido a ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Presione la combinación Ctrl-Alt-Supr",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Acceder" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Aceptar",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar",IDCANCEL,115,122,50,14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Usuario:",IDC_STATIC,36,75,40,8 + LTEXT "Contraseña:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Seguridad" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Cancelar",IDCANCEL,170,95,70,14 + PUSHBUTTON "Salir",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN,170,76,70,14 + LTEXT "¿Qué quieres hacer?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Bloquear computadora",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Administrador de tareas",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "¡Bienvenido!" + IDS_LOCKEDSAS "La computadora está actualmente bloqueada." + IDS_PRESSCTRLALTDELETE "Presione Ctrl-Alt-Supr para acceder." + IDS_ASKFORUSER "Usuario: " + IDS_ASKFORPASSWORD "Contraseña: " + IDS_FORCELOGOFF "Esto cerrará al usuario actual y perderá todos los datos no guardados. ¿Desea Continuar?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Thu Dec 20 00:25:05 2007 @@ -19,3 +19,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc" Added: trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Laberinto" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Thu Dec 20 00:25:05 2007 @@ -14,3 +14,4 @@ #include "lang/en-US.rc" #include "lang/lt-LT.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc" Added: trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/e… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc (added) +++ trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc Thu Dec 20 00:25:05 2007 @@ -1,0 +1,69 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-19 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S sistema [/U usuario [/P [contraseña]]]] [/FO formato] [/NH]\n\n\ +Description:\n\ + Esta herramienta de línea de comandos permite a un administrador preguntar\n\ + información básica de la configuración del sistema.\n\n\ +Lista de Parametros:\n\ + /S sistema Especifica el sistema remoto al cual conectarse.\n\n\ + /U [dominio\\]usuario Especifica el usuario bajo el cual el comando\n\ + debe ejecutarse.\n\n\ + /P [contraseña] Especifica la contraseña de usuario.\n\ + Pregunta por ella si es omitida.\n\n\ + /FO formato Especifica el formato en el que la salida\n\ + será mostrada.\n\ + Valores válidos: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Especifica que la \"Columna cabezera\" no será\n\ + mostrada en la salida.\n\ + Válido sólo para formatos \"TABLE\" y \"CSV\" .\n\n\ + /? Muestra esta ayuda.\n\n\ +Ejemplos:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S sistema\n\ + SYSTEMINFO /S sistema /U usuario\n\ + SYSTEMINFO /S sistema /U dominio\\usuario /P contraseña /FO TABLE\n\ + SYSTEMINFO /S sistema /FO LIST\n\ + SYSTEMINFO /S sistema /FO CSV /NH\n" + +IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" +IDS_OS_VERSION, "Versión Sistema Operativo: %d.%d.%d %s" +IDS_OS_BUILD, " Compilación %s\n" +IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" +IDS_REG_OWNER, "Propietario: %s\n" +IDS_REG_ORG, "Organización: %s\n" +IDS_PRODUCT_ID, "Identificador de Producto %s\n" +IDS_INST_DATE, "Fecha de Instalación: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "Tipo de sistema: Desconocido\n" +IDS_SYS_TYPE_X86, "Tipo de sistema: PC basado en X86\n" +IDS_SYS_TYPE_IA64, "Tipo de sistema: PC basado en IA64\n" +IDS_SYS_TYPE_AMD64, "Tipo de sistema: PC basado en AMD64\n" +IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" +IDS_ROS_DIR, "Directorio de ReactOS: %s\n" +IDS_SYS_DIR, "Directorio del Sistema: %s\n" +IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" +IDS_SYS_LOCALE, "Idioma del sistema: %s\n" +IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" +IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %ld MB (%ld KB)\n" +IDS_HOST_NAME, "Nombre del Servidor: %s\n" +IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación %s\n" +IDS_TIME_ZONE, "Zona horario: %s\n" +IDS_DOMINE, "Dominio: %s\n" +IDS_BIOS_DATE, "Fecha BIOS: %s\n" +IDS_BIOS_VERSION, "Versión BIOS: %s\n" +IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" + +END Propchange: trunk/rosapps/sysutils/systeminfo/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/rsrc.r… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/rsrc.rc (original) +++ trunk/rosapps/sysutils/systeminfo/rsrc.rc Thu Dec 20 00:25:05 2007 @@ -4,3 +4,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/es-ES.rc"

1 0

[tkreuzer] 31337: - update dbghelp.h and cvconst.h from wine - update mscvpdb.h, winbase16.h and windef16.h wine headers - create wine/winbase.h containing SYSLEVEL struct - add regex.h to include/wine
by tkreuzer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: tkreuzer Date: Thu Dec 20 00:11:06 2007 New Revision: 31337 URL: http://svn.reactos.org/svn/reactos?rev=31337&view=rev Log: - update dbghelp.h and cvconst.h from wine - update mscvpdb.h, winbase16.h and windef16.h wine headers - create wine/winbase.h containing SYSLEVEL struct - add regex.h to include/wine Added: trunk/reactos/include/reactos/wine/mscvpdb.h - copied, changed from r31291, trunk/reactos/dll/win32/dbghelp/mscvpdb.h trunk/reactos/include/reactos/wine/regex.h (with props) trunk/reactos/include/reactos/wine/winbase.h (with props) Modified: trunk/reactos/include/psdk/cvconst.h trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/reactos/wine/winbase16.h trunk/reactos/include/reactos/wine/windef16.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/cvconst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cvconst.h?rev… Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… Copied: trunk/reactos/include/reactos/wine/mscvpdb.h (from r31291, trunk/reactos/dll/win32/dbghelp/mscvpdb.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Added: trunk/reactos/include/reactos/wine/regex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/regex… Added: trunk/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… Modified: trunk/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… Modified: trunk/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde…

1 0

[gbrunmar] 31336: * Forgot the struct name change in self-pointer * Inited self-pointer
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:48:58 2007 New Revision: 31336 URL: http://svn.reactos.org/svn/reactos?rev=31336&view=rev Log: * Forgot the struct name change in self-pointer * Inited self-pointer Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Wed Dec 19 23:48:58 2007 @@ -88,6 +88,8 @@ pDirect3D9->unknown004583 = 0; pDirect3D9->unknown004589 = 0; + pDirect3D9->lpInt = pDirect3D9; + *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; return ERROR_SUCCESS; Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 23:48:58 2007 @@ -24,7 +24,7 @@ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; -/* 0x0024 */ struct _tagDIRECTD3D9_INT_ * lpInt; +/* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */

1 0

[gbrunmar] 31335: * Renamed internal IDirect3D9 structure * Made Direct3D9Impl's IUnknown interface more robust thanks to hpoussin * Inited more values in internal struct
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:44:43 2007 New Revision: 31335 URL: http://svn.reactos.org/svn/reactos?rev=31335&view=rev Log: * Renamed internal IDirect3D9 structure * Made Direct3D9Impl's IUnknown interface more robust thanks to hpoussin * Inited more values in internal struct Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Wed Dec 19 23:44:43 2007 @@ -14,6 +14,10 @@ static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; +LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) +{ + return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); +} BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) { @@ -58,12 +62,12 @@ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) { - LPDIRECTD3D9_INT pDirect3D9; + LPDIRECT3D9_INT pDirect3D9; if (ppDirect3D9 == 0) return DDERR_INVALIDPARAMS; - pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTD3D9_INT)); + pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECT3D9_INT)); if (0 == pDirect3D9) return DDERR_OUTOFMEMORY; @@ -75,7 +79,16 @@ pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->dwRefCnt = 1; - *ppDirect3D9 = (IDirect3D9*)pDirect3D9; + pDirect3D9->unknown004576 = 0; + pDirect3D9->unknown004578 = 0; + pDirect3D9->unknown004579 = 0; + pDirect3D9->unknown004580 = 0; + pDirect3D9->unknown004581 = 0; + pDirect3D9->unknown004582 = 0; + pDirect3D9->unknown004583 = 0; + pDirect3D9->unknown004589 = 0; + + *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; return ERROR_SUCCESS; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Wed Dec 19 23:44:43 2007 @@ -5,9 +5,13 @@ * PURPOSE: d3d9.dll helper functions * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#ifndef _D3D9_HELPERS_H_ +#define _D3D9_HELPERS_H_ -#include <d3d9.h> -#include <windows.h> +#include "d3d9_private.h" + +/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ +LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface); /* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); @@ -17,3 +21,5 @@ /* Creates a Direct3D9 object */ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); + +#endif // _D3D9_HELPERS_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 23:44:43 2007 @@ -5,20 +5,18 @@ * PURPOSE: IDirect3D9 implementation * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -#include "d3d9_private.h" +#include "d3d9_helpers.h" #include <debug.h> - -static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface); /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { - IDirect3D9Impl_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = &This->lpVtbl; return S_OK; } @@ -29,7 +27,7 @@ static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); ULONG ref = InterlockedIncrement(&This->dwRefCnt); return ref; @@ -37,7 +35,7 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { - LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); ULONG ref = InterlockedDecrement(&This->dwRefCnt); if (ref == 0) Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Dec 19 23:44:43 2007 @@ -5,7 +5,10 @@ * PURPOSE: d3d9.dll helper functions * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#ifndef _D3D9_PRIVATE_H_ +#define _D3D9_PRIVATE_H_ +#define COBJMACROS #include <windows.h> #include <d3d9.h> @@ -15,7 +18,7 @@ extern const IDirect3D9Vtbl Direct3D9_Vtbl; -typedef struct _tagDIRECTD3D9_INT_ +typedef struct _tagDIRECT3D9_INT_ { /* 0x0000 */ const IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; @@ -4596,4 +4599,6 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ DWORD unknown004589; /*? 0x00000020 */ -} DIRECTD3D9_INT, *LPDIRECTD3D9_INT; +} DIRECT3D9_INT, *LPDIRECT3D9_INT; + +#endif // _D3D9_PRIVATE_H_

1 0

[cfinck] 31334: Change the umlauts to characters of the english alphabet, otherwise they aren't displayed correctly. See issue #2902 for more details.
by cfinck＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cfinck Date: Wed Dec 19 23:19:41 2007 New Revision: 31334 URL: http://svn.reactos.org/svn/reactos?rev=31334&view=rev Log: Change the umlauts to characters of the english alphabet, otherwise they aren't displayed correctly. See issue #2902 for more details. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Dec 19 23:19:41 2007 @@ -94,7 +94,7 @@ { 6, 12, - "Es gibt folgende Beschränkungen:", + "Es gibt folgende Beschraenkungen:", TEXT_NORMAL }, { @@ -335,7 +335,7 @@ { 6, 20, - "Dann druecken Sie die Eingabetaste, um eine Einstellung abzuändern.", + "Dann druecken Sie die Eingabetaste, um eine Einstellung abzuaendern.", TEXT_NORMAL }, {

1 0

[gbrunmar] 31333: Changed last IDirect3D9->QueryInterface() according to hpoussin's feedback
by gbrunmar＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: gbrunmar Date: Wed Dec 19 23:06:34 2007 New Revision: 31333 URL: http://svn.reactos.org/svn/reactos?rev=31333&view=rev Log: Changed last IDirect3D9->QueryInterface() according to hpoussin's feedback Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Dec 19 23:06:34 2007 @@ -14,13 +14,16 @@ /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { + LPDIRECTD3D9_INT This = (LPDIRECTD3D9_INT)iface; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { IDirect3D9Impl_AddRef(iface); - *ppvObject = iface; + *ppvObject = &This->lpVtbl; return S_OK; } + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs