Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 28762: Implement stub for NtGdiGetServerMetaFileBits, NtGdiGetStats, NtGdiPolyTextOutW, NtGdiRemoveFontResourceW, NtGdiRemoveFontMemResourceEx, NtGdiSetBrushAttributes, NtGdiSetupPublicCFONT, NtGdiSetVirtualResolution, NtGdiSetSizeDevice, NtGdiXLATEOBJ_cGetPalette, NtGdiXLATEOBJ_iXlate, NtGdiXLATEOBJ_hGetColorTransform, NtGdiXFORMOBJ_bApplyXform, NtGdiXFORMOBJ_iGetXform
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 14:14:28 2007 New Revision: 28762 URL: http://svn.reactos.org/svn/reactos?rev=28762&view=rev Log: Implement stub for NtGdiGetServerMetaFileBits, NtGdiGetStats, NtGdiPolyTextOutW, NtGdiRemoveFontResourceW, NtGdiRemoveFontMemResourceEx, NtGdiSetBrushAttributes, NtGdiSetupPublicCFONT, NtGdiSetVirtualResolution, NtGdiSetSizeDevice, NtGdiXLATEOBJ_cGetPalette, NtGdiXLATEOBJ_iXlate, NtGdiXLATEOBJ_hGetColorTransform, NtGdiXFORMOBJ_bApplyXform, NtGdiXFORMOBJ_iGetXform Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Sep 2 14:14:28 2007 @@ -2947,3 +2947,210 @@ UNIMPLEMENTED; } + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiRemoveFontMemResourceEx( + IN HANDLE hMMFont) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiRemoveFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN ULONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiPolyTextOutW( + IN HDC hdc, + IN POLYTEXTW *pptw, + IN UINT cStr, + IN DWORD dwCodePage) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetServerMetaFileBits( + IN HANDLE hmo, + IN ULONG cjData, + OUT OPTIONAL LPBYTE pjData, + OUT PDWORD piType, + OUT PDWORD pmm, + OUT PDWORD pxExt, + OUT PDWORD pyExt) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +NTSTATUS +STDCALL +NtGdiGetStats( + IN HANDLE hProcess, + IN INT iIndex, + IN INT iPidType, + OUT PVOID pResults, + IN UINT cjResultSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiXLATEOBJ_cGetPalette( + IN XLATEOBJ *pxlo, + IN ULONG iPal, + IN ULONG cPal, + OUT ULONG *pPal) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiXLATEOBJ_iXlate( + IN XLATEOBJ *pxlo, + IN ULONG iColor) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HANDLE +STDCALL +NtGdiXLATEOBJ_hGetColorTransform( + IN XLATEOBJ *pxlo) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiXFORMOBJ_bApplyXform( + IN XFORMOBJ *pxo, + IN ULONG iMode, + IN ULONG cPoints, + IN PVOID pvIn, + OUT PVOID pvOut) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiXFORMOBJ_iGetXform( + IN XFORMOBJ *pxo, + OUT OPTIONAL XFORML *pxform) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSetSizeDevice( + IN HDC hdc, + IN INT cxVirtualDevice, + IN INT cyVirtualDevice) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSetVirtualResolution( + IN HDC hdc, + IN INT cxVirtualDevicePixel, + IN INT cyVirtualDevicePixel, + IN INT cxVirtualDeviceMm, + IN INT cyVirtualDeviceMm) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +INT +STDCALL +NtGdiSetupPublicCFONT( + IN HDC hdc, + IN OPTIONAL HFONT hf, + IN ULONG ulAve) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +HBRUSH +STDCALL +NtGdiSetBrushAttributes( + IN HBRUSH hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Sep 2 14:14:28 2007 @@ -203,9 +203,9 @@ NtGdiGetRealizationInfo 3 NtGdiGetRegionData 3 NtGdiGetRgnBox 2 -# NtGdiGetServerMetaFileBits 7 +NtGdiGetServerMetaFileBits 7 NtGdiGetSpoolMessage 4 -# NtGdiGetStats 5 +NtGdiGetStats 5 NtGdiGetStockObject 1 NtGdiGetStringBitmapW 5 NtGdiGetSystemPaletteUse 1 @@ -246,7 +246,7 @@ NtGdiPlgBlt 11 NtGdiPolyDraw 4 NtGdiPolyPolyDraw 5 -# NtGdiPolyTextOutW 4 +NtGdiPolyTextOutW 4 NtGdiPtInRegion 3 NtGdiPtVisible 3 NtGdiQueryFonts 3 @@ -254,8 +254,8 @@ NtGdiRectangle 5 NtGdiRectInRegion 2 NtGdiRectVisible 2 -# NtGdiRemoveFontResourceW 6 -# NtGdiRemoveFontMemResourceEx 1 +NtGdiRemoveFontResourceW 6 +NtGdiRemoveFontMemResourceEx 1 NtGdiResetDC 5 NtGdiResizePalette 2 NtGdiRestoreDC 2 @@ -272,7 +272,7 @@ NtGdiSetBitmapBits 3 NtGdiSetBitmapDimension 4 NtGdiSetBoundsRect 3 -# NtGdiSetBrushAttributes 2 +NtGdiSetBrushAttributes 2 NtGdiSetBrushOrg 4 NtGdiSetColorAdjustment 2 NtGdiSetColorSpace 2 @@ -293,9 +293,9 @@ NtGdiSetRectRgn 5 NtGdiSetSystemPaletteUse 2 NtGdiSetTextJustification 3 -# NtGdiSetupPublicCFONT 3 -# NtGdiSetVirtualResolution 5 -# NtGdiSetSizeDevice 3 +NtGdiSetupPublicCFONT 3 +NtGdiSetVirtualResolution 5 +NtGdiSetSizeDevice 3 NtGdiStartDoc 4 NtGdiStartPage 1 NtGdiStretchBlt 12 @@ -631,9 +631,9 @@ NtGdiEngTransparentBlt 8 NtGdiEngTextOut 10 NtGdiEngStretchBltROP 13 -# NtGdiXLATEOBJ_cGetPalette 4 -# NtGdiXLATEOBJ_iXlate 2 -# NtGdiXLATEOBJ_hGetColorTransform 1 +NtGdiXLATEOBJ_cGetPalette 4 +NtGdiXLATEOBJ_iXlate 2 +NtGdiXLATEOBJ_hGetColorTransform 1 NtGdiCLIPOBJ_bEnum 3 NtGdiCLIPOBJ_cEnumStart 5 NtGdiCLIPOBJ_ppoGetPath 1 @@ -644,8 +644,8 @@ NtGdiBRUSHOBJ_pvAllocRbrush 2 NtGdiBRUSHOBJ_pvGetRbrush 1 NtGdiBRUSHOBJ_hGetColorTransform 1 -# NtGdiXFORMOBJ_bApplyXform 5 -# NtGdiXFORMOBJ_iGetXform 2 +NtGdiXFORMOBJ_bApplyXform 5 +NtGdiXFORMOBJ_iGetXform 2 NtGdiFONTOBJ_vGetInfo 3 NtGdiFONTOBJ_pxoGetXform 1 NtGdiFONTOBJ_cGetGlyphs 5

1 0

[arty] 28761: Empty OARCH.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 13:59:45 2007 New Revision: 28761 URL: http://svn.reactos.org/svn/reactos?rev=28761&view=rev Log: Empty OARCH. Modified: trunk/reactos/config-ppc.template.rbuild Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Sun Sep 2 13:59:45 2007 @@ -26,7 +26,7 @@ See GCC manual for more CPU names and which CPUs GCC can optimize for. --> -<property name="OARCH" value="i486" /> +<property name="OARCH" value="" /> <!--

1 0

[arty] 28760: Small change to make OARCH optional.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 13:59:11 2007 New Revision: 28760 URL: http://svn.reactos.org/svn/reactos?rev=28760&view=rev Log: Small change to make OARCH optional. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Sep 2 13:59:11 2007 @@ -426,7 +426,9 @@ fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "endif\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "\n" ); }

1 0

[arty] 28759: Remove hack-coff and le2be. We make an elf booter now.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 13:17:46 2007 New Revision: 28759 URL: http://svn.reactos.org/svn/reactos?rev=28759&view=rev Log: Remove hack-coff and le2be. We make an elf booter now. Removed: trunk/reactos/tools/hack-coff.c trunk/reactos/tools/ppc-le2be.c trunk/reactos/tools/rs6000.h Removed: trunk/reactos/tools/hack-coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hack-coff.c?rev=2875… ============================================================================== --- trunk/reactos/tools/hack-coff.c (original) +++ trunk/reactos/tools/hack-coff.c (removed) @@ -1,83 +1,0 @@ -/* - * hack-coff.c - hack the header of an xcoff file to fill in - * a few fields needed by the Open Firmware xcoff loader on - * Power Macs but not initialized by objcopy. - * - * Copyright (C) Paul Mackerras 1997. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <fcntl.h> -#include <string.h> -#include "rs6000.h" - -#define AOUT_MAGIC 0x010b - -#define get_16be(x) ((((unsigned char *)(x))[0] << 8) \ - + ((unsigned char *)(x))[1]) -#define put_16be(x, v) (((unsigned char *)(x))[0] = (v) >> 8, \ - ((unsigned char *)(x))[1] = (v) & 0xff) -#define get_32be(x) ((((unsigned char *)(x))[0] << 24) \ - + (((unsigned char *)(x))[1] << 16) \ - + (((unsigned char *)(x))[2] << 8) \ - + ((unsigned char *)(x))[3]) - -int main(int ac, char **av) -{ - int fd; - int i, nsect; - int aoutsz; - struct external_filehdr fhdr; - AOUTHDR aout; - struct external_scnhdr shdr; - - if (ac != 2) { - fprintf(stderr, "Usage: hack-coff coff-file\n"); - exit(1); - } - if ((fd = open(av[1], 2)) == -1) { - perror(av[2]); - exit(1); - } - if (read(fd, &fhdr, sizeof(fhdr)) != sizeof(fhdr)) - goto readerr; - i = get_16be(fhdr.f_magic); - if (i != U802TOCMAGIC && i != U802WRMAGIC && i != U802ROMAGIC) { - fprintf(stderr, "%s: not an xcoff file\n", av[1]); - exit(1); - } - aoutsz = get_16be(fhdr.f_opthdr); - if (read(fd, &aout, aoutsz) != aoutsz) - goto readerr; - nsect = get_16be(fhdr.f_nscns); - for (i = 0; i < nsect; ++i) { - if (read(fd, &shdr, sizeof(shdr)) != sizeof(shdr)) - goto readerr; - if (strcmp(shdr.s_name, ".text") == 0) { - put_16be(aout.o_snentry, i+1); - put_16be(aout.o_sntext, i+1); - } else if (strcmp(shdr.s_name, ".data") == 0) { - put_16be(aout.o_sndata, i+1); - } else if (strcmp(shdr.s_name, ".bss") == 0) { - put_16be(aout.o_snbss, i+1); - } - } - put_16be(aout.magic, AOUT_MAGIC); - if (lseek(fd, (long) sizeof(struct external_filehdr), 0) == -1 - || write(fd, &aout, aoutsz) != aoutsz) { - fprintf(stderr, "%s: write error\n", av[1]); - exit(1); - } - close(fd); - exit(0); - -readerr: - fprintf(stderr, "%s: read error or file too short\n", av[1]); - exit(1); -} Removed: trunk/reactos/tools/ppc-le2be.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc-le2be.c?rev=2875… ============================================================================== --- trunk/reactos/tools/ppc-le2be.c (original) +++ trunk/reactos/tools/ppc-le2be.c (removed) @@ -1,25 +1,0 @@ -#include <stdio.h> - -int main( int argc, char **argv ) { - char buf[8]; - int rlen, i; - FILE *fin = NULL, *fout = NULL; - - if( argc < 3 ) return 1; - - fin = fopen( argv[1], "rb" ); - - if( fin ) - fout = fopen( argv[2], "wb" ); - if( !fout ) return 1; - - do { - rlen = fread( buf, 1, 8, fin ); - for( i = 7; rlen > 0 && i >= 0; i-- ) fputc( buf[i], fout ); - } - while( rlen == 8 ); - - fclose( fout ); - - return 0; -} Removed: trunk/reactos/tools/rs6000.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rs6000.h?rev=28758&v… ============================================================================== --- trunk/reactos/tools/rs6000.h (original) +++ trunk/reactos/tools/rs6000.h (removed) @@ -1,243 +1,0 @@ -/* IBM RS/6000 "XCOFF" file definitions for BFD. - Copyright (C) 1990, 1991 Free Software Foundation, Inc. - FIXME: Can someone provide a transliteration of this name into ASCII? - Using the following chars caused a compiler warning on HIUX (so I replaced - them with octal escapes), and isn't useful without an understanding of what - character set it is. - Written by Mimi Ph\373\364ng-Th\345o V\365 of IBM - and John Gilmore of Cygnus Support. */ - -/********************** FILE HEADER **********************/ - -struct external_filehdr { - char f_magic[2]; /* magic number */ - char f_nscns[2]; /* number of sections */ - char f_timdat[4]; /* time & date stamp */ - char f_symptr[4]; /* file pointer to symtab */ - char f_nsyms[4]; /* number of symtab entries */ - char f_opthdr[2]; /* sizeof(optional hdr) */ - char f_flags[2]; /* flags */ -}; - - /* IBM RS/6000 */ -#define U802WRMAGIC 0730 /* writeable text segments **chh** */ -#define U802ROMAGIC 0735 /* readonly sharable text segments */ -#define U802TOCMAGIC 0737 /* readonly text segments and TOC */ - -#define BADMAG(x) \ - ((x).f_magic != U802ROMAGIC && (x).f_magic != U802WRMAGIC && \ - (x).f_magic != U802TOCMAGIC) - -#define FILHDR struct external_filehdr -#define FILHSZ 20 - - -/********************** AOUT "OPTIONAL HEADER" **********************/ - - -typedef struct -{ - unsigned char magic[2]; /* type of file */ - unsigned char vstamp[2]; /* version stamp */ - unsigned char tsize[4]; /* text size in bytes, padded to FW bdry */ - unsigned char dsize[4]; /* initialized data " " */ - unsigned char bsize[4]; /* uninitialized data " " */ - unsigned char entry[4]; /* entry pt. */ - unsigned char text_start[4]; /* base of text used for this file */ - unsigned char data_start[4]; /* base of data used for this file */ - unsigned char o_toc[4]; /* address of TOC */ - unsigned char o_snentry[2]; /* section number of entry point */ - unsigned char o_sntext[2]; /* section number of .text section */ - unsigned char o_sndata[2]; /* section number of .data section */ - unsigned char o_sntoc[2]; /* section number of TOC */ - unsigned char o_snloader[2]; /* section number of .loader section */ - unsigned char o_snbss[2]; /* section number of .bss section */ - unsigned char o_algntext[2]; /* .text alignment */ - unsigned char o_algndata[2]; /* .data alignment */ - unsigned char o_modtype[2]; /* module type (??) */ - unsigned char o_cputype[2]; /* cpu type */ - unsigned char o_maxstack[4]; /* max stack size (??) */ - unsigned char o_maxdata[4]; /* max data size (??) */ - unsigned char o_resv2[12]; /* reserved */ -} -AOUTHDR; - -#define AOUTSZ 72 -#define SMALL_AOUTSZ (28) -#define AOUTHDRSZ 72 - -#define RS6K_AOUTHDR_OMAGIC 0x0107 /* old: text & data writeable */ -#define RS6K_AOUTHDR_NMAGIC 0x0108 /* new: text r/o, data r/w */ -#define RS6K_AOUTHDR_ZMAGIC 0x010B /* paged: text r/o, both page-aligned */ - - -/********************** SECTION HEADER **********************/ - - -struct external_scnhdr { - char s_name[8]; /* section name */ - char s_paddr[4]; /* physical address, aliased s_nlib */ - char s_vaddr[4]; /* virtual address */ - char s_size[4]; /* section size */ - char s_scnptr[4]; /* file ptr to raw data for section */ - char s_relptr[4]; /* file ptr to relocation */ - char s_lnnoptr[4]; /* file ptr to line numbers */ - char s_nreloc[2]; /* number of relocation entries */ - char s_nlnno[2]; /* number of line number entries*/ - char s_flags[4]; /* flags */ -}; - -/* - * names of "special" sections - */ -#define _TEXT ".text" -#define _DATA ".data" -#define _BSS ".bss" -#define _PAD ".pad" -#define _LOADER ".loader" - -#define SCNHDR struct external_scnhdr -#define SCNHSZ 40 - -/* XCOFF uses a special .loader section with type STYP_LOADER. */ -#define STYP_LOADER 0x1000 - -/* XCOFF uses a special .debug section with type STYP_DEBUG. */ -#define STYP_DEBUG 0x2000 - -/* XCOFF handles line number or relocation overflow by creating - another section header with STYP_OVRFLO set. */ -#define STYP_OVRFLO 0x8000 - -/********************** LINE NUMBERS **********************/ - -/* 1 line number entry for every "breakpointable" source line in a section. - * Line numbers are grouped on a per function basis; first entry in a function - * grouping will have l_lnno = 0 and in place of physical address will be the - * symbol table index of the function name. - */ -struct external_lineno { - union { - char l_symndx[4]; /* function name symbol index, iff l_lnno == 0*/ - char l_paddr[4]; /* (physical) address of line number */ - } l_addr; - char l_lnno[2]; /* line number */ -}; - - -#define LINENO struct external_lineno -#define LINESZ 6 - - -/********************** SYMBOLS **********************/ - -#define E_SYMNMLEN 8 /* # characters in a symbol name */ -#define E_FILNMLEN 14 /* # characters in a file name */ -#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ - -struct external_syment -{ - union { - char e_name[E_SYMNMLEN]; - struct { - char e_zeroes[4]; - char e_offset[4]; - } e; - } e; - char e_value[4]; - char e_scnum[2]; - char e_type[2]; - char e_sclass[1]; - char e_numaux[1]; -}; - - - -#define N_BTMASK (017) -#define N_TMASK (060) -#define N_BTSHFT (4) -#define N_TSHIFT (2) - - -union external_auxent { - struct { - char x_tagndx[4]; /* str, un, or enum tag indx */ - union { - struct { - char x_lnno[2]; /* declaration line number */ - char x_size[2]; /* str/union/array size */ - } x_lnsz; - char x_fsize[4]; /* size of function */ - } x_misc; - union { - struct { /* if ISFCN, tag, or .bb */ - char x_lnnoptr[4]; /* ptr to fcn line # */ - char x_endndx[4]; /* entry ndx past block end */ - } x_fcn; - struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[E_DIMNUM][2]; - } x_ary; - } x_fcnary; - char x_tvndx[2]; /* tv index */ - } x_sym; - - union { - char x_fname[E_FILNMLEN]; - struct { - char x_zeroes[4]; - char x_offset[4]; - } x_n; - } x_file; - - struct { - char x_scnlen[4]; /* section length */ - char x_nreloc[2]; /* # relocation entries */ - char x_nlinno[2]; /* # line numbers */ - } x_scn; - - struct { - char x_tvfill[4]; /* tv fill value */ - char x_tvlen[2]; /* length of .tv */ - char x_tvran[2][2]; /* tv range */ - } x_tv; /* info about .tv section (in auxent of symbol .tv)) */ - - struct { - unsigned char x_scnlen[4]; - unsigned char x_parmhash[4]; - unsigned char x_snhash[2]; - unsigned char x_smtyp[1]; - unsigned char x_smclas[1]; - unsigned char x_stab[4]; - unsigned char x_snstab[2]; - } x_csect; - -}; - -#define SYMENT struct external_syment -#define SYMESZ 18 -#define AUXENT union external_auxent -#define AUXESZ 18 -#define DBXMASK 0x80 /* for dbx storage mask */ -#define SYMNAME_IN_DEBUG(symptr) ((symptr)->n_sclass & DBXMASK) - - - -/********************** RELOCATION DIRECTIVES **********************/ - - -struct external_reloc { - char r_vaddr[4]; - char r_symndx[4]; - char r_size[1]; - char r_type[1]; -}; - - -#define RELOC struct external_reloc -#define RELSZ 10 - -#define DEFAULT_DATA_SECTION_ALIGNMENT 4 -#define DEFAULT_BSS_SECTION_ALIGNMENT 4 -#define DEFAULT_TEXT_SECTION_ALIGNMENT 4 -/* For new sections we havn't heard of before */ -#define DEFAULT_SECTION_ALIGNMENT 4

1 0

[arty] 28758: Adding misc ppc tools.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 13:11:10 2007 New Revision: 28758 URL: http://svn.reactos.org/svn/reactos?rev=28758&view=rev Log: Adding misc ppc tools. Added: trunk/reactos/tools/ppc.lost+found/ trunk/reactos/tools/ppc.lost+found/bootcd (with props) trunk/reactos/tools/ppc.lost+found/hfsmap.lst trunk/reactos/tools/ppc.lost+found/link-freeldr (with props) trunk/reactos/tools/ppc.lost+found/ofboot.b trunk/reactos/tools/ppc.lost+found/pmake (with props) Added: trunk/reactos/tools/ppc.lost+found/bootcd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/boo… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/bootcd (added) +++ trunk/reactos/tools/ppc.lost+found/bootcd Sun Sep 2 13:11:10 2007 @@ -1,0 +1,21 @@ +#!/bin/sh +# +# Create an iso that can be booted under qemu. +# For now, this is just to make ofwldr available to qemu. A disk image will +# still be required yet. +# + +CD=output-ppc/ppcboot +I=$CD/install +TOOLS=tools/ppc.lost+found + +$TOOLS/link-freeldr + +mkdir -p $I +cp freeldr.elf $I/yaboot +cp `dirname $0`/ofboot.b $I + +mkisofs -chrp-boot -U -part -hfs -T -r -l -J -A "ReactOS" -sysid PPC \ + -V "ReactOS" -volset 1 -volset-size 1 -volset-seqno 1 \ + -hfs-volid "ReactOS" -hfs-bless $I -map $TOOLS/hfsmap.lst \ + -no-desktop -allow-multidot -o ppcboot.iso $CD Propchange: trunk/reactos/tools/ppc.lost+found/bootcd ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/tools/ppc.lost+found/hfsmap.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/hfs… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/hfsmap.lst (added) +++ trunk/reactos/tools/ppc.lost+found/hfsmap.lst Sun Sep 2 13:11:10 2007 @@ -1,0 +1,12 @@ +# ext. xlate creator type comment +.hqx Ascii 'BnHx' 'TEXT' "BinHex file" +.sit Raw 'SIT!' 'SITD' "StuffIT Expander" +.mov Raw 'TVOD' 'MooV' "QuickTime Movie" +.deb Raw 'Debn' 'bina' "Debian package" +.bin Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.img Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.b Raw 'UNIX' 'tbxi' "bootstrap" +yaboot Raw 'UNIX' 'boot' "bootstrap" +vmlinux Raw 'UNIX' 'boot' "bootstrap" +.conf Raw 'UNIX' 'conf' "bootstrap" +* Ascii '????' '????' "Text file" Added: trunk/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/lin… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/link-freeldr (added) +++ trunk/reactos/tools/ppc.lost+found/link-freeldr Sun Sep 2 13:11:10 2007 @@ -1,0 +1,74 @@ +#!/bin/sh -v + +export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin +make -C lib/mmu +powerpc-unknown-linux-gnu-ld \ + -g -nostartfiles -nostdlib -N -Ttext=0xe00000 \ + -o freeldr.elf \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_util.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_calls.o \ + obj-ppc/boot/freeldr/freeldr/cache/blocklist.o \ + obj-ppc/boot/freeldr/freeldr/cache/cache.o \ + obj-ppc/boot/freeldr/freeldr/comm/rs232.o \ + obj-ppc/boot/freeldr/freeldr/disk/disk.o \ + obj-ppc/boot/freeldr/freeldr/disk/partition.o \ + obj-ppc/boot/freeldr/freeldr/fs/ext2.o \ + obj-ppc/boot/freeldr/freeldr/fs/fat.o \ + obj-ppc/boot/freeldr/freeldr/fs/fs.o \ + obj-ppc/boot/freeldr/freeldr/fs/fsrec.o \ + obj-ppc/boot/freeldr/freeldr/fs/iso.o \ + obj-ppc/boot/freeldr/freeldr/fs/ntfs.o \ + obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o \ + obj-ppc/boot/freeldr/freeldr/inifile/inifile.o \ + obj-ppc/boot/freeldr/freeldr/inifile/parse.o \ + obj-ppc/boot/freeldr/freeldr/math/libgcc2.o \ + obj-ppc/boot/freeldr/freeldr/mm/meminit.o \ + obj-ppc/boot/freeldr/freeldr/mm/mm.o \ + obj-ppc/boot/freeldr/freeldr/reactos/registry.o \ + obj-ppc/boot/freeldr/freeldr/reactos/binhive.o \ + obj-ppc/boot/freeldr/freeldr/reactos/arcname.o \ + obj-ppc/boot/freeldr/freeldr/reactos/reactos.o \ + obj-ppc/boot/freeldr/freeldr/rtl/list.o \ + obj-ppc/boot/freeldr/freeldr/rtl/libsupp.o \ + obj-ppc/boot/freeldr/freeldr/ui/gui.o \ + obj-ppc/boot/freeldr/freeldr/ui/tui.o \ + obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o \ + obj-ppc/boot/freeldr/freeldr/ui/ui.o \ + obj-ppc/boot/freeldr/freeldr/video/bank.o \ + obj-ppc/boot/freeldr/freeldr/video/fade.o \ + obj-ppc/boot/freeldr/freeldr/video/palette.o \ + obj-ppc/boot/freeldr/freeldr/video/pixel.o \ + obj-ppc/boot/freeldr/freeldr/video/video.o \ + obj-ppc/boot/freeldr/freeldr/freeldr.o \ + obj-ppc/boot/freeldr/freeldr/debug.o \ + obj-ppc/boot/freeldr/freeldr/version.o \ + obj-ppc/boot/freeldr/freeldr/cmdline.o \ + obj-ppc/boot/freeldr/freeldr/machine.o \ + obj-ppc/boot/freeldr/freeldr/windows/conversion.o \ + obj-ppc/boot/freeldr/freeldr/windows/peloader.o \ + obj-ppc/boot/freeldr/freeldr/windows/winldr.o \ + obj-ppc/boot/freeldr/freeldr/windows/wlmemory.o \ + obj-ppc/boot/freeldr/freeldr/windows/wlregistry.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/loader.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_pci.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_vga.o \ + obj-ppc/boot/freeldr/freeldr/bootmgr.o \ + obj-ppc/boot/freeldr/freeldr/drivemap.o \ + obj-ppc/boot/freeldr/freeldr/miscboot.o \ + obj-ppc/boot/freeldr/freeldr/options.o \ + obj-ppc/boot/freeldr/freeldr/linuxboot.o \ + obj-ppc/boot/freeldr/freeldr/oslist.o \ + obj-ppc/boot/freeldr/freeldr/custom.o \ + obj-ppc/lib/rossym/rossym.a \ + obj-ppc/lib/cmlib/cmlib.a \ + obj-ppc/lib/string/string.a \ + obj-ppc/lib/rtl/rtl.a \ + obj-ppc/lib/mmu/libmmu.a \ + obj-ppc/lib/mmu/libmmu_code.a \ + /usr/local/pkg/reactos-powerpc/lib/libgcc.a Propchange: trunk/reactos/tools/ppc.lost+found/link-freeldr ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/tools/ppc.lost+found/ofboot.b URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/ofb… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/ofboot.b (added) +++ trunk/reactos/tools/ppc.lost+found/ofboot.b Sun Sep 2 13:11:10 2007 @@ -1,0 +1,64 @@ +<CHRP-BOOT> +<COMPATIBLE> +MacRISC MacRISC3 MacRISC4 +</COMPATIBLE> +<DESCRIPTION> +GNU/Linux PPC bootloader +</DESCRIPTION> +<BOOT-SCRIPT> +" screen" output +load-base release-load-area +boot cd:,\install\yaboot +</BOOT-SCRIPT> +<OS-BADGE-ICONS> +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 +</OS-BADGE-ICONS> +</CHRP-BOOT> Added: trunk/reactos/tools/ppc.lost+found/pmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ppc.lost%2Bfound/pma… ============================================================================== --- trunk/reactos/tools/ppc.lost+found/pmake (added) +++ trunk/reactos/tools/ppc.lost+found/pmake Sun Sep 2 13:11:10 2007 @@ -1,0 +1,14 @@ +#!/bin/sh + +export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin +make \ + ARCH=powerpc \ + HOST=mingw32-linux \ + PREFIX=reactos-powerpc \ + ROS_INTERMEDIATE=obj-ppc \ + ROS_OUTPUT=output-ppc \ + ROS_PREFIX=reactos-powerpc \ + ROS_INSTALL=rosppc \ + ROS_AUTOMAKE=makefile.ppc \ + ROS_RBUILDFLAGS=-rReactOS-ppc.rbuild \ + $* Propchange: trunk/reactos/tools/ppc.lost+found/pmake ------------------------------------------------------------------------------ svn:executable = *

1 0

[arty] 28757: Add interface generator for open firmware calls.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 13:02:12 2007 New Revision: 28757 URL: http://svn.reactos.org/svn/reactos?rev=28757&view=rev Log: Add interface generator for open firmware calls. Added: trunk/reactos/tools/ofw_interface/ trunk/reactos/tools/ofw_interface/calls.ofw trunk/reactos/tools/ofw_interface/ofw_interface.cpp trunk/reactos/tools/ofw_interface/ofw_interface.mak Modified: trunk/reactos/tools/tools.mak Added: trunk/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/calls.… ============================================================================== --- trunk/reactos/tools/ofw_interface/calls.ofw (added) +++ trunk/reactos/tools/ofw_interface/calls.ofw Sun Sep 2 13:02:12 2007 @@ -1,0 +1,25 @@ +# Function Args Returns Types +# Real OFW functions to proxy +finddevice 1 1 char* int +open 1 1 char* int +getprop 4 1 int char* char*:arg3 int int +write 3 1 int char*:arg2 int int +read 3 1 int char*:arg2 int int +exit 0 0 +child 1 1 int int +peer 1 1 int int +parent 1 1 int int +seek 3 1 int int int int +# MMU methods +# claim (virt size align -- base) +claim 3 1 int int int int +# claim-mem (size align -- base) +claim-mem 2 1 int int int +# release (virt size --) +release 2 0 int int +package-to-path 3 1 int char*:arg2 int int +# Declare the call-method BE function ++call-method 0 0 +# MMU Methods +@phys2virt!translate 4 1 int int int int&0 int +@virt2phys!translate 2 1 int int&1 int Added: trunk/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… ============================================================================== --- trunk/reactos/tools/ofw_interface/ofw_interface.cpp (added) +++ trunk/reactos/tools/ofw_interface/ofw_interface.cpp Sun Sep 2 13:02:12 2007 @@ -1,0 +1,316 @@ +#include <stdio.h> +#include <iostream> +#include <fstream> +#include <sstream> +#include <string> +#include <vector> + +class ofw_wrappers { +public: + int base, ctindex, method_ctindex; + std::string functions; + std::string names; + std::string calltable; + std::string le_stubs; + std::string of_call; +}; + +class vartype { +public: + vartype( const std::string &typestr ) { + size_t amp = typestr.find('&'); + size_t col = typestr.find(':'); + if( amp != std::string::npos ) { + if( col > amp && col != std::string::npos ) + lit_value = typestr.substr(amp+1,col-amp+1); + else lit_value = typestr.substr(amp+1); + } + if( col != std::string::npos ) { + if( amp > col && amp != std::string::npos ) + len = typestr.substr(col+1,amp-col+1); + else len = typestr.substr(col+1); + } + + if( amp != std::string::npos && amp < col ) col = amp; + if( col == std::string::npos ) col = typestr.size(); + c_type = typestr.substr(0,col); + } + + vartype( const vartype &other ) + : c_type(other.c_type), + len(other.len), + lit_value(other.lit_value) { + } + + vartype &operator = ( const vartype &other ) { + c_type = other.c_type; + len = other.len; + lit_value = other.lit_value; + return *this; + } + + std::string c_type; + std::string len; + std::string lit_value; +}; + +std::string uppercase( const std::string &toucase ) { + std::vector<char> ucase_work(toucase.size()); + for( size_t i = 0; i < toucase.size(); i++ ) { + ucase_work[i] = toupper(toucase[i]); + } + return std::string(&ucase_work[0], toucase.size()); +} + +std::string clip_eol( std::string in, const std::string &eol_marks ) { + size_t found; + for( size_t i = 0; i < eol_marks.size(); i++ ) { + found = in.find( eol_marks[i] ); + if( found != std::string::npos ) + in = in.substr( 0, found ); + } + return in; +} + +int round_up( int x, int factor ) { + return (x + (factor - 1)) & ~(factor - 1); +} + +void populate_definition( ofw_wrappers &wrapper, const std::string &line ) { + std::istringstream iss(line); + bool make_function = true, method_call = false, make_stub = true, comma; + std::string name, nametext, argtype, rettype; + std::vector<vartype> argtypes; + int args, rets, i, local_offset, total_stack, userarg_start = 0; + size_t f; + std::ostringstream function, ct_csource, le_stub, of_call; + + iss >> name >> args >> rets; + + if( !name.size() ) return; + + if( (f = name.find('!')) != std::string::npos ) { + nametext = name.substr(f+1); + name = name.substr(0,f); + } + if( name[0] == '-' ) { + name = name.substr(1); + make_function = false; + } + if( name[0] == '+' ) { + name = name.substr(1); + make_stub = false; + } + if( name[0] == '@' ) { + name = name.substr(1); + method_call = true; + make_function = false; + } + + if( !nametext.size() ) nametext = name; + + for( i = 1; i < (int)name.size(); i++ ) + if( name[i] == '-' ) name[i] = '_'; + + if( nametext == "call-method" ) + wrapper.method_ctindex = wrapper.ctindex; + + for( i = 0; i < args; i++ ) { + iss >> argtype; + argtypes.push_back(vartype(argtype)); + } + + if( method_call ) { + userarg_start = 1; + args += 2; + } + + iss >> rettype; + if( !rettype.size() ) rettype = "void"; + + local_offset = (3 + rets + args) * 4; + total_stack = round_up(12 + local_offset, 16); + + function << "asm_ofw_" << name << ":\n" + << "\t/* Reserve stack space */\n" + << "\tsubi %r1,%r1," << total_stack << "\n" + << "\t/* Store r8, r9, lr */\n" + << "\tstw %r8," << (local_offset + 0) << "(%r1)\n" + << "\tstw %r9," << (local_offset + 4) << "(%r1)\n" + << "\tmflr %r8\n" + << "\tstw %r8," << (local_offset + 8) << "(%r1)\n" + << "\t/* Get read name */\n" + << "\tlis %r8," << name << "_ofw_name@ha\n" + << "\taddi %r9,%r8," << name << "_ofw_name@l\n" + << "\tstw %r9,0(%r1)\n" + << "\t/* " << args << " arguments and " << rets << " return */\n" + << "\tli %r9," << args << "\n" + << "\tstw %r9,4(%r1)\n" + << "\tli %r9," << rets << "\n" + << "\tstw %r9,8(%r1)\n"; + + for( int i = 0; i < args; i++ ) + function << "\tstw %r" << (i+3) << "," << (4 * (i + 3)) << "(%r1)\n"; + + function << "\t/* Load up the call address */\n" + << "\tlis %r10,ofw_call_addr@ha\n" + << "\tlwz %r9,ofw_call_addr@l(%r10)\n" + << "\tmtlr %r9\n" + << "\t/* Set argument */\n" + << "\tmr %r3,%r1\n" + << "\t/* Fire */\n" + << "\tblrl\n" + << "\tlwz %r3," << (local_offset - 4) << "(%r1)\n" + << "\t/* Restore registers */\n" + << "\tlwz %r8," << (local_offset + 8) << "(%r1)\n" + << "\tmtlr %r8\n" + << "\tlwz %r9," << (local_offset + 4) << "(%r1)\n" + << "\tlwz %r8," << (local_offset + 0) << "(%r1)\n" + << "\t/* Return */\n" + << "\taddi %r1,%r1," << total_stack << "\n" + << "\tblr\n"; + + if( method_call ) { + argtypes.insert(argtypes.begin(),vartype("int")); + argtypes.insert(argtypes.begin(),vartype("char*")); + } + + le_stub << rettype << " ofw_" << name << "("; + + comma = false; + for( i = userarg_start; i < args; i++ ) { + if( !argtypes[i].lit_value.size() ) { + if( !comma ) comma = true; else le_stub << ","; + le_stub << argtypes[i].c_type << " arg" << i; + } + } + le_stub << ")"; + of_call << le_stub.str() << ";\n"; + + le_stub << " {\n"; + if( rettype != "void" ) + le_stub << "\t" << rettype << " ret;\n"; + + if( method_call ) { + le_stub << "\tchar arg0[" + << round_up(nametext.size()+1,8) + << "] = \"" << nametext << "\";\n"; + } + + for( i = 0; i < args; i++ ) { + if( argtypes[i].lit_value.size() ) { + le_stub << "\t" << argtypes[i].c_type << " arg" << i << " = " + << argtypes[i].lit_value << ";\n"; + } + } + + le_stub << "\t"; + if( rettype != "void" ) le_stub << "ret = (" << rettype << ")"; + + le_stub << "ofproxy(" << + (method_call ? (wrapper.method_ctindex * 4) : (wrapper.ctindex * 4)); + + for( i = 0; i < 6; i++ ) { + if( i < args ) le_stub << ",(void *)arg" << i; + else le_stub << ",NULL"; + } + + le_stub << ");\n"; + + if( rettype != "void" ) + le_stub << "\treturn ret;\n"; + + le_stub << "}\n"; + + if( make_function ) wrapper.functions += function.str(); + if( make_stub ) { + wrapper.le_stubs += le_stub.str(); + wrapper.of_call += of_call.str(); + } + if( !method_call ) { + wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; + wrapper.calltable += std::string("\t.long asm_ofw_") + name + "\n"; + wrapper.ctindex++; + } +} + +int main( int argc, char **argv ) { + int status = 0; + std::ifstream in; + std::ofstream out, outcsource, outcheader; + std::string line; + const char *eol_marks = "#\r\n"; + ofw_wrappers wrappers; + + wrappers.base = 0xe00000; + wrappers.ctindex = 0; + + if( argc < 5 ) { + fprintf( stderr, "%s [interface.ofw] [ofw.s] [le_stub.c] [le_stub.h]\n", argv[0] ); + return 1; + } + + in.open( argv[1] ); + if( !in ) { + fprintf( stderr, "can't open %s\n", argv[1] ); + status = 1; + goto error; + } + + out.open( argv[2] ); + if( !out ) { + fprintf( stderr, "can't open %s\n", argv[2] ); + status = 1; + goto error; + } + + outcsource.open( argv[3] ); + if( !outcsource ) { + fprintf( stderr, "can't open %s\n", argv[3] ); + status = 1; + goto error; + } + + outcheader.open( argv[4] ); + if( !outcheader ) { + fprintf( stderr, "can't open %s\n", argv[4] ); + status = 1; + goto error; + } + + while( std::getline( in, line ) ) { + line = clip_eol( line, eol_marks ); + if( line.size() ) populate_definition( wrappers, line ); + } + + out << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" + << "\t.section .text\n" + << "\t.align 4\n" + << "\t.globl _start\n" + << "\t.globl ofw_functions\n" + << "\t.globl ofw_call_addr\n" + << "ofw_call_addr:\n" + << "\t.long 0\n" + << "\n/* Function Wrappers */\n\n" + << wrappers.functions + << "\n/* Function Names */\n\n" + << wrappers.names + << "\n/* Function Call Table for Freeldr */\n\n" + << "\t.align 4\n" + << "ofw_functions:\n" + << wrappers.calltable + << "\n/* End */\n"; + + outcsource << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" + << "#include \"of.h\"\n" + << wrappers.le_stubs; + + outcheader << "/* AUTOMATICALLY GENERATE BY ofw_interface */\n" + << "#ifndef _OFW_CALLS_H\n" + << "#define _OFW_CALLS_H\n" + << wrappers.of_call + << "#endif/*_OFW_CALLS_H*/\n"; + +error: + return status; +} Added: trunk/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… ============================================================================== --- trunk/reactos/tools/ofw_interface/ofw_interface.mak (added) +++ trunk/reactos/tools/ofw_interface/ofw_interface.mak Sun Sep 2 13:02:12 2007 @@ -1,0 +1,63 @@ +OFW_INTERFACE_BASE = $(TOOLS_BASE_)ofw_interface +OFW_INTERFACE_BASE_ = $(OFW_INTERFACE_BASE)$(SEP) +OFW_INTERFACE_INT = $(INTERMEDIATE_)$(OFW_INTERFACE_BASE) +OFW_INTERFACE_INT_ = $(OFW_INTERFACE_INT)$(SEP) +OFW_INTERFACE_OUT = $(OUTPUT_)$(OFW_INTERFACE_BASE) +OFW_INTERFACE_OUT_ = $(OFW_INTERFACE_OUT)$(SEP) + +OFW_INTERFACE_OUTPUT = boot/freeldr/freeldr/arch/powerpc/ofw_calls.s +OFW_INTERFACE_SOURCE = boot/freeldr/freeldr/arch/powerpc/ofw.c +OFW_INTERFACE_HEADER = boot/freeldr/freeldr/include/of_call.h +OFW_INTERFACE_INPUT = $(OFW_INTERFACE_BASE_)calls.ofw +OFW_INTERFACE_SERVICE_FILES = \ + $(OFW_INTERFACE_OUTPUT) \ + $(OFW_INTERFACE_SOURCE) \ + $(OFW_INTERFACE_HEADER) + +$(OFW_INTERFACE_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(OFW_INTERFACE_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + +OFW_INTERFACE_TARGET = \ + $(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) + +OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \ + ofw_interface.cpp \ + ) + +OFW_INTERFACE_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(OFW_INTERFACE_SOURCES:.cpp=.o)) + +OFW_INTERFACE_HOST_CFLAGS = $(TOOLS_CFLAGS) + +OFW_INTERFACE_HOST_LFLAGS = $(TOOLS_LFLAGS) + +$(OFW_INTERFACE_TARGET): $(OFW_INTERFACE_OBJECTS) | $(OFW_INTERFACE_OUT) + $(ECHO_LD) + ${host_gpp} $(OFW_INTERFACE_OBJECTS) $(OFW_INTERFACE_HOST_LFLAGS) -o $@ + +$(OFW_INTERFACE_INT_)ofw_interface.o: $(OFW_INTERFACE_BASE_)ofw_interface.cpp | $(OFW_INTERFACE_INT) + $(ECHO_CC) + ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ + +$(OFW_INTERFACE_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) + $(ECHO_OFW) + $(Q)$(OFW_INTERFACE_TARGET) \ + $(OFW_INTERFACE_INPUT) \ + $(OFW_INTERFACE_OUTPUT) \ + $(OFW_INTERFACE_SOURCE) \ + $(OFW_INTERFACE_HEADER) + +.PHONY: ofw_interface +ofw_interface: $(OFW_INTERFACE_TARGET) + +.PHONY: ofw_interface_clean +ofw_interface_clean: + -@$(rm) $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_OBJECTS) 2>$(NUL) +clean: ofw_interface_clean Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=28757&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Sun Sep 2 13:02:12 2007 @@ -47,6 +47,7 @@ include tools/cdmake/cdmake.mak include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak +include tools/ofw_interface/ofw_interface.mak include tools/mkhive/mkhive.mak include tools/nci/nci.mak include tools/pefixup.mak

1 0

[jimtabor] 28756: Working Dc_Attr support, tested and it worked. Will plugin the rest later.
by jimtabor＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: jimtabor Date: Sun Sep 2 11:59:12 2007 New Revision: 28756 URL: http://svn.reactos.org/svn/reactos?rev=28756&view=rev Log: Working Dc_Attr support, tested and it worked. Will plugin the rest later. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Sun Sep 2 11:59:12 2007 @@ -145,6 +145,7 @@ VOID FASTCALL DC_InitDC(HDC DCToInit); HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); VOID FASTCALL DC_FreeDC(HDC DCToFree); +VOID FASTCALL DC_FreeDcAttr(HDC); BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody); HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); @@ -154,6 +155,10 @@ BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG); +BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC, FLONG); +BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC, FLONG); +BOOL FASTCALL DCU_SyncDcAttrtoW32k(PDC, FLONG); +BOOL FASTCALL DCU_SynchDcAttrtoW32k(HDC, FLONG); VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Sun Sep 2 11:59:12 2007 @@ -3,6 +3,121 @@ #define NDEBUG #include <debug.h> + +static +VOID +CopytoUserDcAttr(PDC dc, PDC_ATTR Dc_Attr, FLONG Dirty) +{ + + Dc_Attr->hpen = dc->Dc_Attr.hpen; + Dc_Attr->hbrush = dc->Dc_Attr.hbrush; + Dc_Attr->hColorSpace = dc->Dc_Attr.hColorSpace; + Dc_Attr->hlfntNew = dc->Dc_Attr.hlfntNew; + + Dc_Attr->jROP2 = dc->Dc_Attr.jROP2; + Dc_Attr->jFillMode = dc->Dc_Attr.jFillMode; + Dc_Attr->jStretchBltMode = dc->Dc_Attr.jStretchBltMode; + Dc_Attr->lRelAbs = dc->Dc_Attr.lRelAbs; + Dc_Attr->jBkMode = dc->Dc_Attr.jBkMode; + + Dc_Attr->crBackgroundClr = dc->Dc_Attr.crBackgroundClr; + Dc_Attr->ulBackgroundClr = dc->Dc_Attr.ulBackgroundClr; + Dc_Attr->crForegroundClr = dc->Dc_Attr.crForegroundClr; + Dc_Attr->ulForegroundClr = dc->Dc_Attr.ulForegroundClr; + + Dc_Attr->ulBrushClr = dc->Dc_Attr.ulBrushClr; + Dc_Attr->crBrushClr = dc->Dc_Attr.crBrushClr; + + Dc_Attr->ulPenClr = dc->Dc_Attr.ulPenClr; + Dc_Attr->crPenClr = dc->Dc_Attr.crPenClr; + + Dc_Attr->ptlBrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x; + Dc_Attr->ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; + + Dc_Attr->lTextAlign = dc->Dc_Attr.lTextAlign; + Dc_Attr->lTextExtra = dc->Dc_Attr.lTextExtra; + Dc_Attr->cBreak = dc->Dc_Attr.cBreak; + Dc_Attr->lBreakExtra = dc->Dc_Attr.lBreakExtra; + Dc_Attr->iMapMode = dc->Dc_Attr.iMapMode; + Dc_Attr->iGraphicsMode = dc->Dc_Attr.iGraphicsMode; + + Dc_Attr->ptlCurrent.x = dc->Dc_Attr.ptlCurrent.x; + Dc_Attr->ptlCurrent.y = dc->Dc_Attr.ptlCurrent.y; + Dc_Attr->ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; + Dc_Attr->ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; + Dc_Attr->szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; + Dc_Attr->szlWindowExt.cy = dc->Dc_Attr.szlWindowExt.cy; + Dc_Attr->ptlViewportOrg.x = dc->Dc_Attr.ptlViewportOrg.x; + Dc_Attr->ptlViewportOrg.y = dc->Dc_Attr.ptlViewportOrg.y; + Dc_Attr->szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; + Dc_Attr->szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; + + Dc_Attr->ulDirty_ = 0; // Force to Zero! +} + +static +VOID +CopyFromUserDcAttr(PDC dc, PDC_ATTR Dc_Attr, FLONG Dirty) +{ + if ( (Dirty & DIRTY_FILL) || (Dc_Attr->ulDirty_ & DIRTY_FILL)) + { + dc->Dc_Attr.ulBrushClr = Dc_Attr->ulBrushClr; + dc->Dc_Attr.crBrushClr = Dc_Attr->crBrushClr; + Dc_Attr->ulDirty_ &= ~DIRTY_FILL; + } + if ( Dirty & DIRTY_LINE || (Dc_Attr->ulDirty_ & DIRTY_LINE)) + { + dc->Dc_Attr.ulPenClr = Dc_Attr->ulPenClr; + dc->Dc_Attr.crPenClr = Dc_Attr->crPenClr; + Dc_Attr->ulDirty_ &= ~DIRTY_LINE; + } +} + +static +BOOL +ReadWriteVMDcAttr(PDC dc, FLONG Dirty, BOOL Write) +{ + BOOL Ret = FALSE; + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)dc->hSelf); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & 0x0000ffff); + DC_ATTR lDc_AttrData; + + if(Entry->UserData) + { + NTSTATUS Status = ZwReadVirtualMemory ( ProcessId, + &(Entry->UserData), + &lDc_AttrData, + sizeof(DC_ATTR), + NULL ); + if (Write) + { + if (NT_SUCCESS(Status)) CopytoUserDcAttr(dc, &lDc_AttrData, Dirty); + Ret = TRUE; + } + else + { + if (NT_SUCCESS(Status)) CopyFromUserDcAttr(dc, &lDc_AttrData, Dirty); + Ret = TRUE; + } + if (Write) + Status = ZwWriteVirtualMemory ( ProcessId, + &(Entry->UserData), + &lDc_AttrData, + sizeof(DC_ATTR), + NULL ); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + Ret = FALSE; + } + } + } + KeLeaveCriticalRegion(); + return Ret; +} BOOL @@ -41,12 +156,103 @@ { SetLastNtError(Status); return FALSE; - } + } } #endif return TRUE; } +BOOL +FASTCALL +DCU_SyncDcAttrtoUser(PDC dc, FLONG Dirty) +{ + BOOL TryHarder = FALSE; + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dirty) return FALSE; + if (!Dc_Attr) return FALSE; + else + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(Dc_Attr, + sizeof(DC_ATTR), + 1); + CopytoUserDcAttr( dc, Dc_Attr, Dirty); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + TryHarder = TRUE; + } + if (TryHarder) + { + return ReadWriteVMDcAttr( dc, Dirty, TRUE); + } + } + return TRUE; +} + +BOOL +FASTCALL +DCU_SynchDcAttrtoUser(HDC hDC, FLONG Dirty) +{ + PDC pDC = DC_LockDc ( hDC ); + BOOL Ret = DCU_SyncDcAttrtoUser(pDC, Dirty); + DC_UnlockDc( pDC ); + return Ret; +} + +BOOL +FASTCALL +DCU_SyncDcAttrtoW32k(PDC dc, FLONG Dirty) +{ + BOOL TryHarder = FALSE; + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dirty) return FALSE; + if (!Dc_Attr) return FALSE; + else + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForRead(Dc_Attr, + sizeof(DC_ATTR), + 1); + CopyFromUserDcAttr( dc, Dc_Attr, Dirty); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + TryHarder = TRUE; + } + if (TryHarder) + { + return ReadWriteVMDcAttr( dc, Dirty, FALSE); + } + } + return TRUE; +} + +BOOL +FASTCALL +DCU_SynchDcAttrtoW32k(HDC hDC, FLONG Dirty) +{ + PDC pDC = DC_LockDc ( hDC ); + BOOL Ret = DCU_SyncDcAttrtoW32k(pDC, Dirty); + DC_UnlockDc( pDC ); + return Ret; +} + + VOID APIENTRY

1 0

[jimtabor] 28755: Fix BootCD!!!!! Watch your commit GL! LOL!
by jimtabor＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: jimtabor Date: Sun Sep 2 09:31:00 2007 New Revision: 28755 URL: http://svn.reactos.org/svn/reactos?rev=28755&view=rev Log: Fix BootCD!!!!! Watch your commit GL! LOL! Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Sep 2 09:31:00 2007 @@ -2737,7 +2737,7 @@ DWORD dwRop) { /* FIXME some part need be done in user mode */ - return PatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); + return NtGdiPatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); } BOOL

1 0

[tkreuzer] 28754: Revert wars! ; -) I talked with GL, he agrees, it is correct.
by tkreuzer＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: tkreuzer Date: Sun Sep 2 03:11:16 2007 New Revision: 28754 URL: http://svn.reactos.org/svn/reactos?rev=28754&view=rev Log: Revert wars! ;-) I talked with GL, he agrees, it is correct. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sun Sep 2 03:11:16 2007 @@ -1091,17 +1091,13 @@ STDCALL AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved ) { - int retVal = 0; - - if (fl & (FR_PRIVATE | FR_NOT_ENUM)) - { - retVal = GdiAddFontResourceW(lpszFilename, fl,0); - } - else + if (fl & ~(FR_PRIVATE | FR_NOT_ENUM)) { SetLastError( ERROR_INVALID_PARAMETER ); - } - return retVal; + return 0; + } + + return GdiAddFontResourceW(lpszFilename, fl,0); } @@ -1114,26 +1110,24 @@ { NTSTATUS Status; PWSTR FilenameW; - int rc = 0; - - if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + int rc; + + if (fl & ~(FR_PRIVATE | FR_NOT_ENUM)) { SetLastError( ERROR_INVALID_PARAMETER ); - } - else - { - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); - } - else - { - rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); - HEAP_free ( FilenameW ); - } - } - return rc; + return 0; + } + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + return 0; + } + + rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); + HEAP_free ( FilenameW ); + return rc; }

1 0

[tkreuzer] 28753: - Add test for AddFontResourceEx showing that the function accepts 0 as flags. - remove header inclusion in test files
by tkreuzer＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: tkreuzer Date: Sun Sep 2 02:06:05 2007 New Revision: 28753 URL: http://svn.reactos.org/svn/reactos?rev=28753&view=rev Log: - Add test for AddFontResourceEx showing that the function accepts 0 as flags. - remove header inclusion in test files Added: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Modified: trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c trunk/rostests/apitests/gdi32api/tests/CreateFont.c trunk/rostests/apitests/gdi32api/tests/CreatePen.c trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/gdi32api/tests/GetStockObject.c trunk/rostests/apitests/gdi32api/tests/SelectObject.c trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c trunk/rostests/apitests/gdi32api/tests/SetSysColors.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c (original) +++ trunk/rostests/apitests/gdi32api/testlist.c Sun Sep 2 02:06:05 2007 @@ -4,6 +4,7 @@ #include "gdi32api.h" /* include the tests */ +#include "tests/AddFontResourceEx.c" #include "tests/CreateCompatibleDC.c" #include "tests/CreateFont.c" #include "tests/CreatePen.c" @@ -20,6 +21,7 @@ /* The List of tests */ TESTENTRY TestList[] = { + { L"AddFontResourceEx", Test_AddFontResourceEx }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, Added: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c (added) +++ trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Sun Sep 2 02:06:05 2007 @@ -1,0 +1,19 @@ + +INT +Test_AddFontResourceEx(PTESTINFO pti) +{ + WCHAR szFileName[MAX_PATH]; + GetEnvironmentVariableW(L"systemroot", szFileName, MAX_PATH); + + wcscat(szFileName, L"\\Fonts\\cour.ttf"); + + SetLastError(ERROR_SUCCESS); + TEST(AddFontResourceExW(szFileName, 0, 0) != 0); + TEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + TEST(AddFontResourceExW(szFileName, 256, 0) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_CreateCompatibleDC(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateFont.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateFont.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - #define INVALIDFONT "ThisFontDoesNotExist" INT Modified: trunk/rostests/apitests/gdi32api/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreatePen.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreatePen.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_CreatePen(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_CreateRectRgn(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c (original) +++ trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_ExtCreatePen(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_GetClipRgn(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - static INT Test_General(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_GetStockObject(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SelectObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SelectObject.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_SelectObject(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - INT Test_SetDCPenColor(PTESTINFO pti) { Modified: trunk/rostests/apitests/gdi32api/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetSysColors.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SetSysColors.c Sun Sep 2 02:06:05 2007 @@ -1,5 +1,3 @@ -#include "../gdi32api.h" - #define NUM_SYSCOLORS 31 INT

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