Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 26531: A perversely delightful hack to make hives of either BE or LE.
by arty＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: arty Date: Fri Apr 27 09:48:13 2007 New Revision: 26531 URL: http://svn.reactos.org/svn/reactos?rev=26531&view=rev Log: A perversely delightful hack to make hives of either BE or LE. Added: branches/powerpc/reactos/tools/mkhive/bytesex.h Modified: branches/powerpc/reactos/tools/mkhive/binhive.c branches/powerpc/reactos/tools/mkhive/mkhive.c branches/powerpc/reactos/tools/mkhive/mkhive.h branches/powerpc/reactos/tools/mkhive/mkhive.mak branches/powerpc/reactos/tools/mkhive/reginf.c Modified: branches/powerpc/reactos/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/bi… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/binhive.c (original) +++ branches/powerpc/reactos/tools/mkhive/binhive.c Fri Apr 27 09:48:13 2007 @@ -35,6 +35,7 @@ #include "binhive.h" #include "registry.h" +using namespace ReactosBytesex; #define REG_HIVE_ID 0x66676572 #define REG_BIN_ID 0x6e696268 @@ -56,7 +57,7 @@ // BLOCK_OFFSET = offset in file after header block -typedef ULONG BLOCK_OFFSET, *PBLOCK_OFFSET; +typedef E_ULONG BLOCK_OFFSET, *PBLOCK_OFFSET; #ifdef _MSC_VER typedef unsigned __int64 FILETIME; @@ -71,131 +72,131 @@ /* header for registry hive file : */ typedef struct _HIVE_HEADER { - /* Hive identifier "regf" (0x66676572) */ - ULONG BlockId; - - /* Update counter */ - ULONG UpdateCounter1; - - /* Update counter */ - ULONG UpdateCounter2; - - /* When this hive file was last modified */ - FILETIME DateModified; - - /* Registry format major version (1) */ - ULONG MajorVersion; - - /* Registry format minor version (3) - Version 3 added fast indexes, version 5 has large value optimizations */ - ULONG MinorVersion; - - /* Registry file type (0 - Primary, 1 - Log) */ - ULONG Type; - - /* Registry format (1 is the only defined value so far) */ - ULONG Format; - - /* Offset into file from the byte after the end of the base block. - If the hive is volatile, this is the actual pointer to the KEY_CELL */ - BLOCK_OFFSET RootKeyOffset; - - /* Size of each hive block ? */ - ULONG BlockSize; - - /* (1?) */ - ULONG Unused7; - - /* Name of hive file */ - WCHAR FileName[32]; - - ULONG Reserved[99]; - - /* Checksum of first 0x200 bytes */ - ULONG Checksum; + /* Hive identifier "regf" (0x66676572) */ + E_ULONG BlockId; + + /* Update counter */ + E_ULONG UpdateCounter1; + + /* Update counter */ + E_ULONG UpdateCounter2; + + /* When this hive file was last modified */ + E_FILETIME DateModified; + + /* Registry format major version (1) */ + E_ULONG MajorVersion; + + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + E_ULONG MinorVersion; + + /* Registry file type (0 - Primary, 1 - Log) */ + E_ULONG Type; + + /* Registry format (1 is the only defined value so far) */ + E_ULONG Format; + + /* Offset into file from the byte after the end of the base block. + If the hive is volatile, this is the actual pointer to the KEY_CELL */ + BLOCK_OFFSET RootKeyOffset; + + /* Size of each hive block ? */ + E_ULONG BlockSize; + + /* (1?) */ + E_ULONG Unused7; + + /* Name of hive file */ + E_WCHAR FileName[32]; + + E_ULONG Reserved[99]; + + /* Checksum of first 0x200 bytes */ + E_ULONG Checksum; } GCC_PACKED HIVE_HEADER, *PHIVE_HEADER; typedef struct _HBIN { - /* Bin identifier "hbin" (0x6E696268) */ - ULONG HeaderId; - - /* Block offset of this bin */ - BLOCK_OFFSET BinOffset; - - /* Size in bytes, multiple of the block size (4KB) */ - ULONG BinSize; - - ULONG Reserved[2]; - - /* When this bin was last modified */ - FILETIME DateModified; - - /* ? (In-memory only) */ - ULONG MemAlloc; + /* Bin identifier "hbin" (0x6E696268) */ + E_ULONG HeaderId; + + /* Block offset of this bin */ + BLOCK_OFFSET BinOffset; + + /* Size in bytes, multiple of the block size (4KB) */ + E_ULONG BinSize; + + E_ULONG Reserved[2]; + + /* When this bin was last modified */ + E_FILETIME DateModified; + + /* ? (In-memory only) */ + E_ULONG MemAlloc; } GCC_PACKED HBIN, *PHBIN; typedef struct _CELL_HEADER { - /* <0 if used, >0 if free */ - LONG CellSize; + /* <0 if used, >0 if free */ + E_LONG CellSize; } GCC_PACKED CELL_HEADER, *PCELL_HEADER; typedef struct _KEY_CELL { - /* Size of this cell */ - LONG CellSize; - - /* Key cell identifier "kn" (0x6b6e) */ - USHORT Id; - - /* ? */ - USHORT Type; - - /* Time of last flush */ - FILETIME LastWriteTime; - - /* ? */ - ULONG UnUsed1; - - /* Block offset of parent key cell */ - BLOCK_OFFSET ParentKeyOffset; - - /* Count of sub keys for the key in this key cell */ - ULONG NumberOfSubKeys; - - /* ? */ - ULONG UnUsed2; - - /* Block offset of has table for FIXME: subkeys/values? */ - BLOCK_OFFSET HashTableOffset; - - /* ? */ - ULONG UnUsed3; - - /* Count of values contained in this key cell */ - ULONG NumberOfValues; - - /* Block offset of VALUE_LIST_CELL */ - BLOCK_OFFSET ValueListOffset; - - /* Block offset of security cell */ - BLOCK_OFFSET SecurityKeyOffset; - - /* Block offset of registry key class */ - BLOCK_OFFSET ClassNameOffset; - - /* ? */ - ULONG Unused4[5]; - - /* Size in bytes of key name */ - USHORT NameSize; - - /* Size of class name in bytes */ - USHORT ClassSize; - - /* Name of key (not zero terminated) */ - CHAR Name[0]; + /* Size of this cell */ + E_LONG CellSize; + + /* Key cell identifier "kn" (0x6b6e) */ + E_USHORT Id; + + /* ? */ + E_USHORT Type; + + /* Time of last flush */ + E_FILETIME LastWriteTime; + + /* ? */ + E_ULONG UnUsed1; + + /* Block offset of parent key cell */ + BLOCK_OFFSET ParentKeyOffset; + + /* Count of sub keys for the key in this key cell */ + E_ULONG NumberOfSubKeys; + + /* ? */ + E_ULONG UnUsed2; + + /* Block offset of has table for FIXME: subkeys/values? */ + BLOCK_OFFSET HashTableOffset; + + /* ? */ + E_ULONG UnUsed3; + + /* Count of values contained in this key cell */ + E_ULONG NumberOfValues; + + /* Block offset of VALUE_LIST_CELL */ + BLOCK_OFFSET ValueListOffset; + + /* Block offset of security cell */ + BLOCK_OFFSET SecurityKeyOffset; + + /* Block offset of registry key class */ + BLOCK_OFFSET ClassNameOffset; + + /* ? */ + E_ULONG Unused4[5]; + + /* Size in bytes of key name */ + E_USHORT NameSize; + + /* Size of class name in bytes */ + E_USHORT ClassSize; + + /* Name of key (not zero terminated) */ + CHAR Name[0]; } GCC_PACKED KEY_CELL, *PKEY_CELL; /* KEY_CELL.Type constants */ @@ -208,35 +209,35 @@ // HashValue=four letters of value's name typedef struct _HASH_RECORD { - BLOCK_OFFSET KeyOffset; - ULONG HashValue; + BLOCK_OFFSET KeyOffset; + E_ULONG HashValue; } GCC_PACKED HASH_RECORD, *PHASH_RECORD; typedef struct _HASH_TABLE_CELL { - LONG CellSize; - USHORT Id; - USHORT HashTableSize; - HASH_RECORD Table[0]; + E_LONG CellSize; + E_USHORT Id; + E_USHORT HashTableSize; + HASH_RECORD Table[0]; } GCC_PACKED HASH_TABLE_CELL, *PHASH_TABLE_CELL; typedef struct _VALUE_LIST_CELL { - LONG CellSize; - BLOCK_OFFSET ValueOffset[0]; + E_LONG CellSize; + BLOCK_OFFSET ValueOffset[0]; } GCC_PACKED VALUE_LIST_CELL, *PVALUE_LIST_CELL; typedef struct _VALUE_CELL { - LONG CellSize; - USHORT Id; // "kv" - USHORT NameSize; // length of Name - ULONG DataSize; // length of datas in the cell pointed by DataOffset - BLOCK_OFFSET DataOffset;// datas are here if high bit of DataSize is set - ULONG DataType; - USHORT Flags; - USHORT Unused1; - CHAR Name[0]; /* warning : not zero terminated */ + E_LONG CellSize; + E_USHORT Id; // "kv" + E_USHORT NameSize; // length of Name + E_ULONG DataSize; // length of datas in the cell pointed by DataOffset + BLOCK_OFFSET DataOffset;// datas are here if high bit of DataSize is set + E_ULONG DataType; + E_USHORT Flags; + E_USHORT Unused1; + CHAR Name[0]; /* warning : not zero terminated */ } GCC_PACKED VALUE_CELL, *PVALUE_CELL; /* VALUE_CELL.Flags constants */ @@ -248,8 +249,8 @@ typedef struct _DATA_CELL { - LONG CellSize; - CHAR Data[0]; + E_LONG CellSize; + CHAR Data[0]; } GCC_PACKED DATA_CELL, *PDATA_CELL; #ifdef _MSC_VER @@ -276,9 +277,10 @@ ULONG Length) { ULONG i; + E_WCHAR *DstE = (E_WCHAR*)Dst; for (i = 0; i < Length; i++) - Dst[i] = (WCHAR)Src[i]; + DstE[i] = (WCHAR)Src[i]; } @@ -375,7 +377,7 @@ /* Allocate block list */ Hive->BlockListSize = 1; - Hive->BlockList = malloc (sizeof(PHBIN) * Hive->BlockListSize); + Hive->BlockList = (PHBIN*)malloc (sizeof(PHBIN) * Hive->BlockListSize); if (Hive->BlockList == NULL) { free (Hive->HiveHeader); @@ -385,7 +387,7 @@ /* Allocate free cell list */ Hive->FreeListMax = 32; - Hive->FreeList = malloc(sizeof(PCELL_HEADER) * Hive->FreeListMax); + Hive->FreeList = (PCELL_HEADER*)malloc(sizeof(PCELL_HEADER) * Hive->FreeListMax); if (Hive->FreeList == NULL) { free (Hive->BlockList); @@ -393,7 +395,7 @@ free (Hive); return NULL; } - Hive->FreeListOffset = malloc(sizeof(BLOCK_OFFSET) * Hive->FreeListMax); + Hive->FreeListOffset = (PBLOCK_OFFSET)malloc(sizeof(BLOCK_OFFSET) * Hive->FreeListMax); if (Hive->FreeListOffset == NULL) { free (Hive->FreeList); @@ -630,13 +632,13 @@ if ((RegistryHive->FreeListSize + 1) > RegistryHive->FreeListMax) { - tmpList = malloc (sizeof(PCELL_HEADER) * (RegistryHive->FreeListMax + 32)); + tmpList = (PCELL_HEADER*)malloc (sizeof(PCELL_HEADER) * (RegistryHive->FreeListMax + 32)); if (tmpList == NULL) { return FALSE; } - tmpListOffset = malloc (sizeof(BLOCK_OFFSET) * (RegistryHive->FreeListMax + 32)); + tmpListOffset = (PBLOCK_OFFSET)malloc (sizeof(BLOCK_OFFSET) * (RegistryHive->FreeListMax + 32)); if (tmpListOffset == NULL) { free (tmpList); @@ -723,7 +725,7 @@ ULONG i; BinSize = BlockCount *REG_BLOCK_SIZE; - tmpBin = malloc (BinSize); + tmpBin = (PHBIN)malloc (BinSize); if (tmpBin == NULL) { return FALSE; @@ -738,7 +740,7 @@ tmpBin->MemAlloc = 0; /* Increase size of list of blocks */ - tmpBlockList = malloc (sizeof(PHBIN) * (RegistryHive->BlockListSize + BlockCount)); + tmpBlockList = (PHBIN *)malloc (sizeof(PHBIN) * (RegistryHive->BlockListSize + BlockCount)); if (tmpBlockList == NULL) { free (tmpBin); @@ -830,9 +832,11 @@ NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize); NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; ((PCELL_HEADER) (*Block))->CellSize = CellSize; + BLOCK_OFFSET NewFree; + NewFree = *pBlockOffset + CellSize; CmiAddFree (RegistryHive, NewBlock, - *pBlockOffset + CellSize, + NewFree, TRUE); } else if (NewBlock->CellSize < CellSize) @@ -885,16 +889,16 @@ PKEY_CELL ParentKeyCell; ULONG i; - ParentKeyCell = CmiGetCell (Hive, - ParentKeyOffset, - NULL); + ParentKeyCell = (PKEY_CELL)CmiGetCell (Hive, + ParentKeyOffset, + NULL); if (ParentKeyCell == NULL) { DPRINT1 ("CmiGetBlock() failed\n"); return FALSE; } - HashBlock =CmiGetCell (Hive, + HashBlock = (PHASH_TABLE_CELL)CmiGetCell (Hive, ParentKeyCell->HashTableOffset, NULL); if (HashBlock == NULL) @@ -933,7 +937,7 @@ (ValueCount * sizeof(BLOCK_OFFSET)); Status = CmiAllocateCell (Hive, ValueListSize, - (PVOID)&ValueListCell, + (PVOID*)&ValueListCell, ValueListOffset); if ((ValueListCell == NULL) || (Status == FALSE)) { @@ -993,14 +997,14 @@ PVALUE_LIST_CELL ValueListCell; PKEY_CELL KeyCell; - KeyCell = CmiGetCell (Hive, KeyCellOffset, NULL); + KeyCell = (PKEY_CELL)CmiGetCell (Hive, KeyCellOffset, NULL); if (KeyCell == NULL) { DPRINT1 ("CmiGetBlock() failed\n"); return FALSE; } - ValueListCell = CmiGetCell (Hive, KeyCell->ValueListOffset, NULL); + ValueListCell = (PVALUE_LIST_CELL)CmiGetCell (Hive, KeyCell->ValueListOffset, NULL); if (ValueListCell == NULL) { DPRINT1 ("CmiGetBlock() failed\n"); @@ -1148,7 +1152,7 @@ /* Allocate key cell */ KeyCellSize = sizeof(KEY_CELL) + Key->NameSize - 1; - if (!CmiAllocateCell (Hive, KeyCellSize, (PVOID)&NewKeyCell, &NKBOffset)) + if (!CmiAllocateCell (Hive, KeyCellSize, (PVOID*)&NewKeyCell, &NKBOffset)) { DPRINT1 ("CmiAllocateBlock() failed\n"); return FALSE; @@ -1280,7 +1284,7 @@ DPRINT ("Name: %s\n", KeyName); - KeyCell = CmiGetCell (Hive, + KeyCell = (PKEY_CELL)CmiGetCell (Hive, Hive->HiveHeader->RootKeyOffset, NULL); if (KeyCell == NULL) Added: branches/powerpc/reactos/tools/mkhive/bytesex.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/by… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/bytesex.h (added) +++ branches/powerpc/reactos/tools/mkhive/bytesex.h Fri Apr 27 09:48:13 2007 @@ -1,0 +1,124 @@ +#ifndef BYTESEX_H +#define BYTESEX_H + +enum EndianOrder { BE = -1, LE = 0 }; +enum WordSizeMask { W = 1, D = 3, Q = 7 }; +extern enum EndianOrder order; + +#ifdef __GNUC__ +typedef long long LL_T; +typedef unsigned long long ULL_T; +#else +typedef __int64 LL_T; +typedef unsigned __int64 ULL_T; +#endif + +namespace ReactosBytesex { +#define C(x,e,m) (x ^ (e & m)) + +static inline USHORT dtohs(USHORT in) +{ + PUCHAR in_ptr = (PUCHAR)&in; + return in_ptr[C(0,order,W)] | (in_ptr[C(1,order,W)] << 8); +} + +static inline USHORT htods(USHORT in) +{ + USHORT out; + PUCHAR out_ptr = (PUCHAR)&out; + out_ptr[C(0,order,W)] = in; out_ptr[C(1,order,W)] = in >> 8; + return out; +} + +static inline ULONG dtohl(ULONG in) +{ + PUCHAR in_ptr = (PUCHAR)&in; + return + in_ptr[C(0,order,D)] | + (in_ptr[C(1,order,D)] << 8) | + (in_ptr[C(2,order,D)] << 16) | + (in_ptr[C(3,order,D)] << 24); +} + +static inline ULONG htodl(ULONG in) +{ + ULONG out; + PUCHAR out_ptr = (PUCHAR)&out; + out_ptr[C(0,order,D)] = in ; out_ptr[C(1,order,D)] = in >> 8; + out_ptr[C(2,order,D)] = in >> 16; out_ptr[C(3,order,D)] = in >> 24; + return out; +} + +static inline LL_T dtohq(LL_T in) +{ + int i; + LL_T out = 0; + for( i = 0; i < 8; i++ ) + { + out |= (in & 0xff) << ((C(i,order,Q)) * 8); + in >>= 8; + } + return out; +} + +static inline LL_T htodq(LL_T in) +{ + int i; + LL_T out; + PUCHAR out_ptr = (PUCHAR)&out; + for( i = 0; i < 8; i++ ) + out_ptr[C(i,order,Q)] = in >> (i * 8); +} + +namespace { +template <class T> T toHost( T value ); +template <class T> T toDest( T value ); +template <> SHORT toHost<SHORT>( SHORT value ) { return dtohs(value); } +template <> USHORT toHost<USHORT>( USHORT value ) { return dtohs(value); } +template <> LONG toHost<LONG>( LONG value ) { return dtohl(value); } +template <> ULONG toHost<ULONG>( ULONG value ) { return dtohl(value); } +template <> LL_T toHost<LL_T>( LL_T value ) { return dtohq(value); } +template <> ULL_T toHost<ULL_T>( ULL_T value ) { return dtohq(value); } +template <> SHORT toDest<SHORT>( SHORT value ) { return htods(value); } +template <> USHORT toDest<USHORT>( USHORT value ) { return htods(value); } +template <> LONG toDest<LONG>( LONG value ) { return htodl(value); } +template <> ULONG toDest<ULONG>( ULONG value ) { return htodl(value); } +template <> LL_T toDest<LL_T>( LL_T value ) { return htodq(value); } +template <> ULL_T toDest<ULL_T>( ULL_T value ) { return htodq(value); } +} + +#ifdef _MSC_VER +#pragma pack ( push, hive_header, 1 ) +#endif + +template <class T> +struct LENumber { +public: + operator T () const { return toHost<T>(value); } + LENumber &operator = (T other) { value = toDest<T>(other); return *this; } + T operator ++ () { (*this) += 1; return *this; } + LENumber &operator ++ (int) { (*this) += 1; return *this; } + T operator -- () { (*this) -= 1; return *this; } + LENumber &operator -- (int) { (*this) -= 1; return *this; } + LENumber &operator += (T other) { value = toDest<T>(toHost<T>(value) + other); return *this; } + LENumber &operator -= (T other) { return (*this) += -other; } + LENumber &operator *= (T other) { int x = (*this); x *= other; (*this) = x; } + LENumber &operator &= (T other) { value = toDest<T>(toHost<T>(value) & other); return *this; } + LENumber &operator |= (T other) { value = toDest<T>(toHost<T>(value) | other); return *this; } +private: + T value; +} __attribute__((packed)); + +#ifdef _MSC_VER +#pragma pack (pop, hive_header) +#endif + +typedef LENumber<SHORT> E_WCHAR; +typedef LENumber<SHORT> E_SHORT; +typedef LENumber<USHORT> E_USHORT; +typedef LENumber<LONG> E_LONG; +typedef LENumber<ULONG> E_ULONG; +typedef LENumber<ULL_T> E_FILETIME; +} + +#endif/*BYTESEX_H*/ Modified: branches/powerpc/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/mk… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/mkhive.c (original) +++ branches/powerpc/reactos/tools/mkhive/mkhive.c Fri Apr 27 09:48:13 2007 @@ -32,6 +32,8 @@ #include "registry.h" #include "reginf.h" #include "binhive.h" + +EndianOrder order; #ifdef _MSC_VER #include <stdlib.h> @@ -99,6 +101,20 @@ usage (); return 1; } + + order = LE; + if (!strcmp(argv[1], "-be")) + { + order = BE; + argc--; + argv++; + } + else if(!strcmp(argv[1], "-le")) + { + order = LE; + argc--; + argv++; + } RegInitializeRegistry (); Modified: branches/powerpc/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/mk… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/mkhive.h (original) +++ branches/powerpc/reactos/tools/mkhive/mkhive.h Fri Apr 27 09:48:13 2007 @@ -27,7 +27,6 @@ #ifndef __MKHIVE_H__ #define __MKHIVE_H__ - #define VOID void typedef void *PVOID; typedef char CHAR, *PCHAR; @@ -41,6 +40,8 @@ typedef unsigned long ULONG_PTR; typedef int BOOL, *PBOOL; + +#include "bytesex.h" #ifndef FALSE #define FALSE 0 Modified: branches/powerpc/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/mk… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/mkhive.mak (original) +++ branches/powerpc/reactos/tools/mkhive/mkhive.mak Fri Apr 27 09:48:13 2007 @@ -28,9 +28,9 @@ MKHIVE_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) -MKHIVE_HOST_CFLAGS = $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -g3 +MKHIVE_HOST_CFLAGS = $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -g3 -xc++ -MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 +MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 -lstdc++ .PHONY: mkhive mkhive: $(MKHIVE_TARGET) Modified: branches/powerpc/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/mkhive/re… ============================================================================== --- branches/powerpc/reactos/tools/mkhive/reginf.c (original) +++ branches/powerpc/reactos/tools/mkhive/reginf.c Fri Apr 27 09:48:13 2007 @@ -117,7 +117,7 @@ (Type != REG_MULTI_SZ)) return; - Buffer = malloc (Size + StringSize); + Buffer = (char *)malloc (Size + StringSize); if (Buffer == NULL) return; @@ -257,7 +257,7 @@ if (Size) { - Str = malloc (Size); + Str = (char *)malloc (Size); if (Str == NULL) return FALSE; @@ -286,7 +286,7 @@ if (Size) { - Str = malloc (Size); + Str = (char *)malloc (Size); if (Str == NULL) return FALSE; @@ -303,7 +303,7 @@ RegSetValue (KeyHandle, ValueName, Type, - (PVOID)&dw, + (char *)&dw, sizeof(ULONG)); } else @@ -315,7 +315,7 @@ RegSetValue (KeyHandle, ValueName, Type, - (PVOID)Str, + (char *)Str, Size); } else @@ -323,7 +323,7 @@ RegSetValue (KeyHandle, ValueName, Type, - (PVOID)&EmptyStr, + (char *)&EmptyStr, sizeof(CHAR)); } } @@ -338,18 +338,18 @@ if (Size) { - Data = malloc (Size); + Data = (char *)malloc (Size); if (Data == NULL) return FALSE; DPRINT("setting binary data %s len %lu\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, Size, NULL); + InfHostGetBinaryField (Context, 5, (unsigned char *)Data, Size, NULL); } RegSetValue (KeyHandle, ValueName, Type, - (PVOID)Data, + (char *)Data, Size); free (Data); @@ -403,7 +403,7 @@ else { /* get flags */ - if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) + if (InfHostGetIntField (Context, 4, (PULONG)&Flags) != 0) Flags = 0; }

1 0

[jimtabor] 26530: Win32/Gdi32: - Implement NtGdiHfontCreate, removed NtGdiCreateFont and NtGdiCreateFontIndirect from service. Changed name to NtGdiGetOutlineTextMetricsInternalW. - Updated TEXTOBJ structure changing LOGFONTW to ENUMLOGFONTEXDVW. - Update FontGetObject plus the rest of text.c in win32k. - Added CreateFontIndirectExA/W to psdk/wingdi.h, it was missing. Tested with Qemu.
by jimtabor＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: jimtabor Date: Fri Apr 27 09:42:25 2007 New Revision: 26530 URL: http://svn.reactos.org/svn/reactos?rev=26530&view=rev Log: Win32/Gdi32: - Implement NtGdiHfontCreate, removed NtGdiCreateFont and NtGdiCreateFontIndirect from service. Changed name to NtGdiGetOutlineTextMetricsInternalW. - Updated TEXTOBJ structure changing LOGFONTW to ENUMLOGFONTEXDVW. - Update FontGetObject plus the rest of text.c in win32k. - Added CreateFontIndirectExA/W to psdk/wingdi.h, it was missing. Tested with Qemu. Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/utils.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Fri Apr 27 09:42:25 2007 @@ -277,9 +277,20 @@ STDCALL CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if (elfexd) + { + ENUMLOGFONTEXDVW Logfont; + + EnumLogFontExW2A( (LPENUMLOGFONTEXA) elfexd, + &Logfont.elfEnumLogfontEx ); + + RtlCopyMemory( &Logfont.elfDesignVector, + (PVOID) &elfexd->elfDesignVector, + sizeof(DESIGNVECTOR)); + + return NtGdiHfontCreate( &Logfont, 0, 0, 0, NULL); + } + else return NULL; } /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Apr 27 09:42:25 2007 @@ -353,9 +353,11 @@ STDCALL CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( elfexd ) + { + return NtGdiHfontCreate((PENUMLOGFONTEXDVW) elfexd, 0, 0, 0, NULL ); + } + else return NULL; } /* 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 Fri Apr 27 09:42:25 2007 @@ -282,7 +282,7 @@ Info[i].FontType, lParam); } else - { + { // Could use EnumLogFontExW2A here? LogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont); WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1, (LPSTR)EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL); @@ -814,10 +814,9 @@ LPOUTLINETEXTMETRICW lpOTM ) { - return NtGdiGetOutlineTextMetrics(hdc, cbData, lpOTM); -// TMDIFF Tmd; // Should not be zero. -// if ( lpOTM == NULL) return 0; -// return NtGdiGetOutlineTextMetricsInternalW(hdc, cbData, lpOTM, &Tmd); + TMDIFF Tmd; // Should not be zero. + + return NtGdiGetOutlineTextMetricsInternalW(hdc, cbData, lpOTM, &Tmd); } @@ -830,14 +829,14 @@ CONST LOGFONTA *lplf ) { - LOGFONTW tlf; - if (lplf) { + LOGFONTW tlf; + LogFontA2W(&tlf, lplf); - return NtGdiCreateFontIndirect(&tlf); - } - else return NtGdiCreateFontIndirect(NULL); + return CreateFontIndirectW(&tlf); + } + else return NULL; } @@ -850,7 +849,25 @@ CONST LOGFONTW *lplf ) { - return NtGdiCreateFontIndirect((CONST LPLOGFONTW)lplf); + if (lplf) + { + ENUMLOGFONTEXDVW Logfont; + + RtlCopyMemory( &Logfont.elfEnumLogfontEx.elfLogFont, lplf, sizeof(LOGFONTW)); + // Need something other than just cleaning memory here. + // Guess? Use caller data to determine the rest. + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfFullName, + sizeof(Logfont.elfEnumLogfontEx.elfFullName)); + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfStyle, + sizeof(Logfont.elfEnumLogfontEx.elfStyle)); + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfScript, + sizeof(Logfont.elfEnumLogfontEx.elfScript)); + + RtlZeroMemory( &Logfont.elfDesignVector, sizeof(DESIGNVECTOR)); + + return CreateFontIndirectExW(&Logfont); + } + else return NULL; } @@ -883,8 +900,20 @@ RtlInitAnsiString(&StringA, (LPSTR)lpszFace); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = CreateFontW(nHeight, nWidth, nEscapement, nOrientation, fnWeight, fdwItalic, fdwUnderline, fdwStrikeOut, - fdwCharSet, fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily, StringU.Buffer); + ret = CreateFontW(nHeight, + nWidth, + nEscapement, + nOrientation, + fnWeight, + fdwItalic, + fdwUnderline, + fdwStrikeOut, + fdwCharSet, + fdwOutputPrecision, + fdwClipPrecision, + fdwQuality, + fdwPitchAndFamily, + StringU.Buffer); RtlFreeUnicodeString(&StringU); @@ -914,8 +943,35 @@ LPCWSTR lpszFace ) { - return NtGdiCreateFont(nHeight, nWidth, nEscapement, nOrientation, nWeight, fnItalic, fdwUnderline, fdwStrikeOut, - fdwCharSet, fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily, lpszFace); + LOGFONTW logfont; + + logfont.lfHeight = nHeight; + logfont.lfWidth = nWidth; + logfont.lfEscapement = nEscapement; + logfont.lfOrientation = nOrientation; + logfont.lfWeight = nWeight; + logfont.lfItalic = fnItalic; + logfont.lfUnderline = fdwUnderline; + logfont.lfStrikeOut = fdwStrikeOut; + logfont.lfCharSet = fdwCharSet; + logfont.lfOutPrecision = fdwOutputPrecision; + logfont.lfClipPrecision = fdwClipPrecision; + logfont.lfQuality = fdwQuality; + logfont.lfPitchAndFamily = fdwPitchAndFamily; + + if (NULL != lpszFace) + { + int Size = sizeof(logfont.lfFaceName) / sizeof(WCHAR); + wcsncpy((wchar_t *)logfont.lfFaceName, lpszFace, Size - 1); + /* Be 101% sure to have '\0' at end of string */ + logfont.lfFaceName[Size - 1] = '\0'; + } + else + { + logfont.lfFaceName[0] = L'\0'; + } + + return CreateFontIndirectW(&logfont); } Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ut… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/utils.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/utils.c Fri Apr 27 09:42:25 2007 @@ -390,13 +390,13 @@ { LogFontW2A( (LPLOGFONTA)fontA, (CONST LOGFONTW *)fontW ); - WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1, + WideCharToMultiByte( CP_THREAD_ACP, 0, fontW->elfFullName, -1, (LPSTR) fontA->elfFullName, LF_FULLFACESIZE, NULL, NULL ); fontA->elfFullName[LF_FULLFACESIZE-1] = '\0'; - WideCharToMultiByte( CP_ACP, 0, fontW->elfStyle, -1, + WideCharToMultiByte( CP_THREAD_ACP, 0, fontW->elfStyle, -1, (LPSTR) fontA->elfStyle, LF_FACESIZE, NULL, NULL ); fontA->elfStyle[LF_FACESIZE-1] = '\0'; - WideCharToMultiByte( CP_ACP, 0, fontW->elfScript, -1, + WideCharToMultiByte( CP_THREAD_ACP, 0, fontW->elfScript, -1, (LPSTR) fontA->elfScript, LF_FACESIZE, NULL, NULL ); fontA->elfScript[LF_FACESIZE-1] = '\0'; } Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Fri Apr 27 09:42:25 2007 @@ -2651,6 +2651,8 @@ HFONT WINAPI CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR); HFONT WINAPI CreateFontIndirectA(const LOGFONTA*); HFONT WINAPI CreateFontIndirectW(const LOGFONTW*); +HFONT WINAPI CreateFontIndirectExA(const ENUMLOGFONTEXDVA *); +HFONT WINAPI CreateFontIndirectExW(const ENUMLOGFONTEXDVW *); HPALETTE WINAPI CreateHalftonePalette(HDC); HBRUSH WINAPI CreateHatchBrush(int,COLORREF); HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*); @@ -2997,6 +2999,7 @@ #define CreateEnhMetaFile CreateEnhMetaFileW #define CreateFont CreateFontW #define CreateFontIndirect CreateFontIndirectW +#define CreateFontIndirectEx CreateFontIndirectExW #define CreateIC CreateICW #define CreateMetaFile CreateMetaFileW #define CreateScalableFontResource CreateScalableFontResourceW @@ -3069,6 +3072,7 @@ #define CreateEnhMetaFile CreateEnhMetaFileA #define CreateFont CreateFontA #define CreateFontIndirect CreateFontIndirectA +#define CreateFontIndirectEx CreateFontIndirectExA #define CreateIC CreateICA #define CreateMetaFile CreateMetaFileA #define CreateScalableFontResource CreateScalableFontResourceA Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Fri Apr 27 09:42:25 2007 @@ -4,7 +4,7 @@ /* GDI logical font object */ typedef struct { - LOGFONTW logfont; + ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; FONTOBJ *Font; BOOLEAN Initialized; /* Don't reinitialize for each DC */ } TEXTOBJ, *PTEXTOBJ; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Apr 27 09:42:25 2007 @@ -499,11 +499,12 @@ TextObj = TEXTOBJ_LockText(*NewFont); if (NULL != TextObj) { - memcpy(&TextObj->logfont, lf, sizeof(LOGFONTW)); + memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.lfOrientation = TextObj->logfont.lfEscapement; + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; } TEXTOBJ_UnlockText(TextObj); } @@ -600,6 +601,65 @@ return NT_SUCCESS(Status) ? NewFont : NULL; } + + +HFONT +STDCALL +NtGdiHfontCreate( + IN PENUMLOGFONTEXDVW pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData ) +{ + ENUMLOGFONTEXDVW SafeLogfont; + HFONT NewFont; + PTEXTOBJ TextObj; + NTSTATUS Status = STATUS_SUCCESS; + + if (NULL != pelfw) + { + Status = MmCopyFromCaller(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); + if (NT_SUCCESS(Status)) + { + NewFont = TEXTOBJ_AllocText(); + if (NULL != NewFont) + { + TextObj = TEXTOBJ_LockText(NewFont); + + if (NULL != TextObj) + { + RtlCopyMemory ( &TextObj->logfont, + &SafeLogfont, + sizeof(ENUMLOGFONTEXDVW)); + + if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + TEXTOBJ_UnlockText(TextObj); + } + else + { +/* FIXME */ +/* ASSERT(FALSE);*/ + Status = STATUS_INVALID_HANDLE; + } + } + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + return NT_SUCCESS(Status) ? NewFont : NULL; + +} + BOOL STDCALL @@ -1824,17 +1884,17 @@ Render = IntIsFontRenderingEnabled(); if (Render) - RenderMode = IntGetFontRenderMode(&TextObj->logfont); + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); else RenderMode = FT_RENDER_MODE_MONO; error = FT_Set_Pixel_Sizes( face, - TextObj->logfont.lfWidth, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); @@ -1884,7 +1944,8 @@ for (i = Start; i < Count; i++) { glyph_index = FT_Get_Char_Index(face, *TempText); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.lfHeight))) + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -1893,7 +1954,8 @@ } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.lfHeight, glyph, RenderMode); + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); } /* retrieve kerning distance */ if (use_kerning && previous && glyph_index) @@ -1932,7 +1994,8 @@ for (i = 0; i < Count; i++) { glyph_index = FT_Get_Char_Index(face, *String); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.lfHeight))) + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -1943,7 +2006,8 @@ goto fail; } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.lfHeight, glyph, RenderMode); + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); } // DbgPrint("realglyph: %x\n", realglyph); // DbgPrint("TextLeft: %d\n", TextLeft); @@ -2238,10 +2302,10 @@ IntLockFreeType; FT_Set_Pixel_Sizes(face, - TextObj->logfont.lfWidth, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); for (i = FirstChar; i <= LastChar; i++) { @@ -2382,11 +2446,11 @@ IntLockFreeType; FT_Set_Pixel_Sizes(face, - TextObj->logfont.lfWidth, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); for (i = FirstChar; i <= LastChar; i++) { @@ -2516,8 +2580,8 @@ FontGDI = ObjToGDI(TextObj->Font, FONT); ft_face = FontGDI->face; - aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfWidth: 0; - orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfOrientation: 0; + aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth: 0; + orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation: 0; Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); @@ -2561,10 +2625,10 @@ } // FT_Set_Pixel_Sizes(ft_face, -// TextObj->logfont.lfWidth, +// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ -// (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : -// TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); +// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : +// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); TEXTOBJ_UnlockText(TextObj); @@ -3107,11 +3171,12 @@ From "Undocumented Windows 2000 Secrets" Appendix B, Table B-2, page 472, this is NtGdiGetOutlineTextMetricsInternalW. */ -UINT +ULONG STDCALL -NtGdiGetOutlineTextMetrics(HDC hDC, - UINT Data, - LPOUTLINETEXTMETRICW otm) +NtGdiGetOutlineTextMetricsInternalW (HDC hDC, + ULONG Data, + OUTLINETEXTMETRICW *otm, + TMDIFF *Tmd) { PDC dc; PTEXTOBJ TextObj; @@ -3343,11 +3408,11 @@ IntLockFreeType; error = FT_Set_Pixel_Sizes(face, - TextObj->logfont.lfWidth, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); IntUnLockFreeType; if (error) { @@ -3395,7 +3460,7 @@ } Size->cx = (TotalWidth + 32) >> 6; - Size->cy = (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : TextObj->logfont.lfHeight); + Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72); return TRUE; @@ -3657,8 +3722,8 @@ TextObj = TEXTOBJ_LockText(hFont); ASSERT(TextObj != NULL); - Count = min(Count, wcslen(TextObj->logfont.lfFaceName)); - Status = MmCopyToCaller(FaceName, TextObj->logfont.lfFaceName, Count * sizeof(WCHAR)); + Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); + Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); TEXTOBJ_UnlockText(TextObj); if (!NT_SUCCESS(Status)) { @@ -3704,11 +3769,11 @@ Face = FontGDI->face; IntLockFreeType; Error = FT_Set_Pixel_Sizes(Face, - TextObj->logfont.lfWidth, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); IntUnLockFreeType; if (0 != Error) { @@ -4059,7 +4124,7 @@ return STATUS_SUCCESS; } - if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.lfFaceName)) + if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)) { TEXTOBJ_UnlockText(TextObj); return STATUS_NO_MEMORY; @@ -4072,21 +4137,21 @@ Win32Process = PsGetCurrentProcessWin32Process(); IntLockProcessPrivateFonts(Win32Process); FindBestFontFromList(&TextObj->Font, &MatchScore, - &TextObj->logfont, &FaceName, + &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, &Win32Process->PrivateFontListHead); IntUnLockProcessPrivateFonts(Win32Process); /* Search system fonts */ IntLockGlobalFonts; FindBestFontFromList(&TextObj->Font, &MatchScore, - &TextObj->logfont, &FaceName, + &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, &FontListHead); IntUnLockGlobalFonts; if (NULL == TextObj->Font) { DPRINT1("Requested font %S not found, no fonts loaded at all\n", - TextObj->logfont.lfFaceName); + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName); Status = STATUS_NOT_FOUND; } else @@ -4104,36 +4169,35 @@ } INT FASTCALL -FontGetObject(PTEXTOBJ Font, INT Count, PVOID Buffer) +FontGetObject(PTEXTOBJ TFont, INT Count, PVOID Buffer) { if( Buffer == NULL ) return sizeof(LOGFONTW); switch (Count) { -/* Everything will need to be converted over to ENUMLOGFONTEXDVW. + case sizeof(ENUMLOGFONTEXDVW): - RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer.elfDesignVector, - &Font->logFont.elfDesignVector, - sizeof(DESIGNVECTOR)); + RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, + &TFont->logfont, + sizeof(ENUMLOGFONTEXDVW)); + break; case sizeof(ENUMLOGFONTEXW): RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, - &Font->logFont.elfEnumLogfontEx, + &TFont->logfont.elfEnumLogfontEx, sizeof(ENUMLOGFONTEXW)); break; case sizeof(EXTLOGFONTW): case sizeof(ENUMLOGFONTW): RtlCopyMemory((LPENUMLOGFONTW) Buffer, - (LPENUMLOGFONTW) &Font->logfont.elfEnumLogfontEx.elfLogFont, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, sizeof(ENUMLOGFONTW)); break; -*/ + case sizeof(LOGFONTW): -/* RtlCopyMemory((LPLOGFONTW) Buffer, - &Font->logFont.elfEnumLogfontEx.elfLogFont, - sizeof(LOGFONTW)); -*/ - RtlCopyMemory(Buffer, &Font->logfont, sizeof(LOGFONTW)); + RtlCopyMemory((LPLOGFONTW) Buffer, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(LOGFONTW)); break; default: Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Fri Apr 27 09:42:25 2007 @@ -33,8 +33,6 @@ NtGdiCreateEllipticRgn 4 NtGdiCreateEllipticRgnIndirect 1 NtGdiCreateEnhMetaFile 4 -NtGdiCreateFont 14 -NtGdiCreateFontIndirect 1 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 NtGdiCreateIC 4 @@ -138,7 +136,7 @@ NtGdiGetMiterLimit 2 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 -NtGdiGetOutlineTextMetrics 3 +NtGdiGetOutlineTextMetricsInternalW 4 NtGdiGetPaletteEntries 4 NtGdiGetPath 4 NtGdiGetPixel 3 @@ -171,6 +169,7 @@ NtGdiGetWindowOrgEx 2 NtGdiGetWorldTransform 2 NtGdiGradientFill 6 +NtGdiHfontCreate 5 NtGdiIntersectClipRect 5 NtGdiInvertRgn 2 NtGdiLPtoDP 3

1 0

[dgorbachev] 26529: Update French translation of Desk.cpl (bug #2209).
by dgorbachev＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: dgorbachev Date: Fri Apr 27 06:45:39 2007 New Revision: 26529 URL: http://svn.reactos.org/svn/reactos?rev=26529&view=rev Log: Update French translation of Desk.cpl (bug #2209). Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Apr 27 06:45:39 2007 @@ -33,18 +33,18 @@ COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Paramè&tres",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&Aperçu",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "Dé&lai",IDC_WAITTEXT, 14, 125, 16, 9 + LTEXT "Dé&lai: ",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "À la reprise, demander un mot de &passe.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 97, 120, 138, 19 GROUPBOX "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Pour modifier les paramètres de l'alimentation du moniteur, cliquez sur Gestion de l'alimentation.", - IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + IDC_STATIC, 14, 166, 140, 20 + PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 140, 171, 93, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -56,7 +56,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avancée", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -104,13 +104,13 @@ BEGIN LTEXT "&Affichage:",1820,3,100,30,8 LTEXT "<aucun>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Région de l'affichage",1818,3,120,115,43 + GROUPBOX "&Résolution de l'affichage",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Moins",1815,9,130,15,8,NOT WS_GROUP LTEXT "Plus",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "Qualité &Couleur",1817,125,120,115,43 + GROUPBOX "&Couleurs",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN,

1 0

[dgorbachev] 26528: - Update French translation of Explorer (bug #2209). - Fix minor bug in USetup.
by dgorbachev＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: dgorbachev Date: Fri Apr 27 06:45:12 2007 New Revision: 26528 URL: http://svn.reactos.org/svn/reactos?rev=26528&view=rev Log: - Update French translation of Explorer (bug #2209). - Fix minor bug in USetup. Modified: trunk/reactos/base/setup/usetup/native/utils/console.c trunk/reactos/base/shell/explorer/explorer-fr.rc Modified: trunk/reactos/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.c (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.c Fri Apr 27 06:45:12 2007 @@ -254,7 +254,6 @@ /* FIXME: use real unicode->oem conversion */ for (i = 0; i < nLength; i++) pText[i] = (CHAR)lpCharacter[i]; - pText[i] = 0; Status = NtDeviceIoControlFile( hConsoleOutput, Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc Fri Apr 27 06:45:12 2007 @@ -7,54 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS +#include <windows.h> ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////////////////// // French (France) resources @@ -81,9 +37,9 @@ POPUP "&Affichage" BEGIN MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "Barre d'&extras", ID_VIEW_EXTRA_BAR MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&Volet latéral", ID_VIEW_SIDE_BAR MENUITEM "Barre d'&état", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "A&ctualiser\tF5", ID_REFRESH @@ -106,8 +62,8 @@ POPUP "&Aide" BEGIN MENUITEM "&FAQ de l'explorateur...", ID_EXPLORER_FAQ - MENUITEM "&A propos de l'explorateur...", ID_ABOUT_EXPLORER - MENUITEM "A propos de l'&OS...", ID_ABOUT_WINDOWS + MENUITEM "&À propos de l'explorateur...", ID_ABOUT_EXPLORER + MENUITEM "À propos de l'&OS...", ID_ABOUT_WINDOWS END END @@ -118,7 +74,7 @@ MENUITEM "&Paramètres...", ID_DESKTOPBAR_SETTINGS MENUITEM "&Gestionnaire de tâches...", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&A propos de l'explorateur...", ID_ABOUT_EXPLORER + MENUITEM "&À propos de l'explorateur...", ID_ABOUT_EXPLORER END END @@ -135,12 +91,12 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Afficher les icônes cachés", ID_SHOW_HIDDEN_ICONS - MENUITEM "Afficher l'icône &Boutton", ID_SHOW_ICON_BUTTON - MENUITEM "&Configurer les Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Ajuster Date/&Heure...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&A propos de l'explorateur...", ID_ABOUT_EXPLORER + MENUITEM "&Afficher les icônes cachées", ID_SHOW_HIDDEN_ICONS + MENUITEM "Afficher le bouton des icônes", ID_SHOW_ICON_BUTTON + MENUITEM "&Configurer les notifications...", ID_CONFIG_NOTIFYAREA + MENUITEM "Ajuster la date/l'&heure...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&À propos de l'explorateur...", ID_ABOUT_EXPLORER END END @@ -155,7 +111,7 @@ POPUP "&Affichage" BEGIN MENUITEM "&Barre d'outils", ID_VIEW_TOOL_BAR - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Volet latéral", ID_VIEW_SIDE_BAR, GRAYED MENUITEM "&Barre d'état", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "A&ctualiser\tF5", ID_REFRESH @@ -169,8 +125,8 @@ POPUP "&Aide" BEGIN MENUITEM "&FAQ de l'explorateur...", ID_EXPLORER_FAQ - MENUITEM "&A propos de l'explorateur...", ID_ABOUT_EXPLORER - MENUITEM "A propos de l'&OS...", ID_ABOUT_WINDOWS + MENUITEM "&À propos de l'explorateur...", ID_ABOUT_EXPLORER + MENUITEM "À propos de l'&OS...", ID_ABOUT_WINDOWS END END @@ -208,7 +164,7 @@ CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Vérifier les entrées",IDC_CHECK_ENTRIES,143,7,50,14 + PUSHBUTTON "&Rechercher",IDC_CHECK_ENTRIES,143,7,50,14 END IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 @@ -216,25 +172,25 @@ CAPTION "Propriétés du bureau" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Please select your prefered icon alignment algorithm:", + LTEXT "Veuillez sélectionner votre algorithme d'alignement des icônes:", IDC_STATIC,7,7,166,8 - CONTROL "gauche/haut descend",IDC_ICON_ALIGN_0,"Button", + CONTROL "gauche/haut bas",IDC_ICON_ALIGN_0,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 CONTROL "gauche/haut droite",IDC_ICON_ALIGN_1,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "droite/haut left",IDC_ICON_ALIGN_2,"Button", + CONTROL "droite/haut gauche",IDC_ICON_ALIGN_2,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "droite/haut descend",IDC_ICON_ALIGN_3,"Button", + CONTROL "droite/haut bas",IDC_ICON_ALIGN_3,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "gauche/fond monte",IDC_ICON_ALIGN_4,"Button", + CONTROL "gauche/bas haut",IDC_ICON_ALIGN_4,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "gauche/fond right",IDC_ICON_ALIGN_5,"Button", + CONTROL "gauche/bas droite",IDC_ICON_ALIGN_5,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "droite/fond gauche",IDC_ICON_ALIGN_6,"Button", + CONTROL "droite/bas gauche",IDC_ICON_ALIGN_6,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rdroite/fond. descend",IDC_ICON_ALIGN_7,"Button", + CONTROL "droite/bas bas",IDC_ICON_ALIGN_7,"Button", BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "bord descend",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "haut vers bas",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 CONTROL "bord H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 @@ -243,7 +199,7 @@ CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 CONTROL "Afficher le numéro de la &version",ID_DESKTOP_VERSION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,120,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 @@ -251,10 +207,11 @@ CAPTION "Propriétés de la barre de tâches" FONT 8, "MS Sans Serif" BEGIN - CONTROL "afficher l'&heure",ID_SHOW_CLOCK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,152,52,10 - CONTROL "&masquer les icônes inactives",ID_HIDE_INACTIVE_ICONS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 + CONTROL "Afficher l'&heure",ID_SHOW_CLOCK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,152,70,10 + CONTROL "&Masquer les icônes inactives", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END @@ -269,30 +226,29 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Configurer Icônes de Notification" +CAPTION "Configurer les Icônes de Notification" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Texte conseil:",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "Titre de la &fenêtre:",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Repertoire du module:",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Mode d'affichage",IDC_LABEL4,7,96,157,28 + LTEXT "&Texte conseil:",IDC_LABEL1,7,44,70,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,79,42,122,14,ES_AUTOHSCROLL + LTEXT "Titre de la &fenêtre:",IDC_LABEL2,7,63,61,8 + EDITTEXT IDC_NOTIFY_TITLE,79,60,123,14,ES_AUTOHSCROLL + LTEXT "&Repertoire du module:",IDC_LABEL3,7,81,71,8 + EDITTEXT IDC_NOTIFY_MODULE,79,78,123,14,ES_AUTOHSCROLL + GROUPBOX "&Mode d'affichage",IDC_LABEL4,7,96,174,28 CONTROL "&afficher",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&cacher",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 + WS_TABSTOP,12,108,35,10 + CONTROL "&cacher",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,51,108,34,10 CONTROL "&cacher automatiquement",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Dernier changement:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + BS_AUTORADIOBUTTON,89,108,91,10 + ICON "",IDC_PICTURE,183,101,21,20 + LTEXT "&Dernier changement:",IDC_LABEL6,7,132,69,8 + EDITTEXT IDC_LAST_CHANGE,77,129,105,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "afficher les cac&hés",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + CONTROL "Afficher les cac&hés",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,70,10 DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP PUSHBUTTON "&Annuler",IDCANCEL,151,153,50,14 END @@ -300,7 +256,7 @@ IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Veuillez choisir un mode de fenêtres pour explorateur" +CAPTION "Veuillez choisir un mode de fenêtres pour l'explorateur" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Veuillez sélectionner l'interface que vous préférez pour l'explorateur:", @@ -311,7 +267,7 @@ BS_AUTORADIOBUTTON,7,62,118,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Ouvrir les sous-dossiers dans des fenêtres s&éparrées", + CONTROL "Ouvrir les sous-dossiers dans des fenêtres s&éparées", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 LTEXT "Ce paramètre sera utilisé par défaut.",IDC_STATIC,7,111, @@ -322,7 +278,7 @@ IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "A propos de ReactOS Explorer" +CAPTION "À propos de ReactOS Explorer" FONT 10, "MS Sans Serif" BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 @@ -334,6 +290,32 @@ CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, 154,90,38,12 END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -363,7 +345,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_STARTMENU "Menu démarrer" - IDS_MINIMIZE_ALL "mimimiser toutes les fenêtres" + IDS_MINIMIZE_ALL "Mimimiser toutes les fenêtres" IDS_DESKTOP_NUM "Bureau %d" IDS_VOLUME "Volume" IDS_ITEMS_CUR "objets actuels" @@ -373,16 +355,16 @@ IDS_NOTIFY_SHOW "afficher" IDS_NOTIFY_HIDE "cacher" IDS_NOTIFY_AUTOHIDE "cacher automatiquement" - IDS_SHOW_HIDDEN_ICONS "Afficher les icones cachés" - IDS_HIDE_ICONS "Cacher les icones" + IDS_SHOW_HIDDEN_ICONS "Afficher les icônes cachées" + IDS_HIDE_ICONS "Cacher les icônes" IDS_TERMINATE "Fermer ROS Explorer" END STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Réseaux" - IDS_CONNECTIONS "Connections Réseaux" - IDS_DRIVES "Drives" + IDS_CONNECTIONS "Connections réseau" + IDS_DRIVES "Lecteurs" IDS_SEARCH_COMPUTER "Rechercher un ordinateur..." IDS_SETTINGS_MENU "Paramètres du menu" IDS_CONTROL_PANEL "Panneau de configuration" @@ -391,9 +373,9 @@ IDS_SEARCH_PRG "Rechercher un programme..." IDS_ALL_USERS "Tous les utilisateurs\\" IDS_SEARCH "Rechercher" - IDS_ABOUT_EXPLORER "&A propos de l'explorateur..." + IDS_ABOUT_EXPLORER "&À propos de l'explorateur..." IDS_LAUNCH_MANY_PROGRAMS - "Vous avez selectionné plus d'un programme.\nEtes vous sur de vouloir tous les lancer?" + "Vous avez sélectionné plus d'un programme.\nÊtes-vous sûr de vouloir tous les lancer?" IDS_DESKTOPBAR_SETTINGS "Paramètres du bureau" IDS_DESKTOP "Bureau" IDS_TASKBAR "Barre de tâches"

1 0

[ekohl] 26527: Remove quotation marks from the scheme data string to make main.cpl work on WinXP.
by ekohl＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: ekohl Date: Fri Apr 27 03:34:48 2007 New Revision: 26527 URL: http://svn.reactos.org/svn/reactos?rev=26527&view=rev Log: Remove quotation marks from the scheme data string to make main.cpl work on WinXP. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Fri Apr 27 03:34:48 2007 @@ -462,10 +462,23 @@ if (_tcslen(szValueData) > 0) { - LPTSTR copy = _tcsdup(szValueData); + LPTSTR lpCopy, lpStart; + + /* Remove quotation marks */ + if (szValueData[0] == _T('"')) + { + lpStart = szValueData + 1; + szValueData[_tcslen(szValueData) - 1] = 0; + } + else + { + lpStart = szValueData; + } + + lpCopy = _tcsdup(lpStart); lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); - SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy); } } @@ -491,12 +504,26 @@ if (_tcslen(szValueData) > 0) { - LPTSTR copy = _tcsdup(szValueData); + LPTSTR lpCopy, lpStart; + + /* Remove quotation marks */ + if (szValueData[0] == _T('"')) + { + lpStart = szValueData + 1; + szValueData[_tcslen(szValueData) - 1] = 0; + } + else + { + lpStart = szValueData; + } + + lpCopy = _tcsdup(lpStart); + _tcscat(szValueName, TEXT(" ")); _tcscat(szValueName, szSystemScheme); lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); - SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy); } }

1 0

[jimtabor] 26526: Tooling up for big changes. GetOutlineTextMetricsW, minnor update.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 21:58:57 2007 New Revision: 26526 URL: http://svn.reactos.org/svn/reactos?rev=26526&view=rev Log: Tooling up for big changes. GetOutlineTextMetricsW, minnor update. 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 Thu Apr 26 21:58:57 2007 @@ -815,6 +815,9 @@ ) { return NtGdiGetOutlineTextMetrics(hdc, cbData, lpOTM); +// TMDIFF Tmd; // Should not be zero. +// if ( lpOTM == NULL) return 0; +// return NtGdiGetOutlineTextMetricsInternalW(hdc, cbData, lpOTM, &Tmd); }

1 0

[jimtabor] 26525: Dc allocation of DC_ATTR. If'ed out for now.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 20:28:50 2007 New Revision: 26525 URL: http://svn.reactos.org/svn/reactos?rev=26525&view=rev Log: Dc allocation of DC_ATTR. If'ed out for now. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Apr 26 20:28:50 2007 @@ -2264,10 +2264,42 @@ } return NULL; } - +#if 0 +#define TAG_DCATTR TAG('D', 'C', 'A', 'T') + PVOID NewMem = NULL; + ULONG MemSize = PAGE_SIZE; //sizeof(DC_ATTR); + NTSTATUS Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &NewMem, + 0, + &MemSize, + MEM_COMMIT, + PAGE_READWRITE); + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + + if (NT_SUCCESS(Status)) + { + RtlZeroMemory(NewMem, MemSize); + Entry->UserData = NewMem; + DPRINT1("DC_ATTR allocated! 0x%x\n",NewMem); + } + else + { + DPRINT1("DC_ATTR not allocated!\n"); + } + } + KeLeaveCriticalRegion(); +#endif NewDC = DC_LockDc(hDC); /* FIXME - Handle NewDC == NULL! */ - +#if 0 + if(NewMem) + { + NewDC->pDc_Attr = NewMem; // Store pointer + } +#endif if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); @@ -2331,6 +2363,23 @@ VOID FASTCALL DC_FreeDC(HDC DCToFree) { +#if 0 + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + if(Entry->UserData) + { + ULONG MemSize = PAGE_SIZE; + NTSTATUS Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &Entry->UserData, + &MemSize, + MEM_DECOMMIT); + if (NT_SUCCESS(Status)) Entry->UserData = NULL; + } + } + KeLeaveCriticalRegion(); +#endif if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT("DC_FreeDC failed\n");

1 0

[ekohl] 26524: Add a new cursor scheme to the scheme list and select it after it has been saved.
by ekohl＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: ekohl Date: Thu Apr 26 19:42:12 2007 New Revision: 26524 URL: http://svn.reactos.org/svn/reactos?rev=26524&view=rev Log: Add a new cursor scheme to the scheme list and select it after it has been saved. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Thu Apr 26 19:42:12 2007 @@ -27,7 +27,6 @@ //TODO: // add missing icons -// Options- pointer precision #define WINVER 0x0501 @@ -690,7 +689,7 @@ LPTSTR lpSchemeData; HKEY hCuKey; HKEY hCuCursorKey; - LONG lResult = ERROR_SUCCESS; + LONG lError = ERROR_SUCCESS; BOOL bSchemeExists; LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); @@ -775,15 +774,25 @@ return FALSE; } - lResult = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0, REG_EXPAND_SZ, - (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); + lError = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0, REG_EXPAND_SZ, + (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); + /* Add the new scheme to the scheme list and select it */ + if (lError == ERROR_SUCCESS) + { + LPTSTR copy = _tcsdup(lpSchemeData); + + nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNewSchemeName); + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_SETITEMDATA, (WPARAM)nSel, (LPARAM)copy); + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_SETCURSEL, (WPARAM)nSel, (LPARAM)0); + } + HeapFree(GetProcessHeap(), 0, lpSchemeData); - return (lResult == ERROR_SUCCESS); + return (lError == ERROR_SUCCESS); }

1 0

[jimtabor] 26523: Pluggin NtGdiArcInternal and NtGdiPolyPolyDraw
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 18:53:36 2007 New Revision: 26523 URL: http://svn.reactos.org/svn/reactos?rev=26523&view=rev Log: Pluggin NtGdiArcInternal and NtGdiPolyPolyDraw Modified: trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Apr 26 18:53:36 2007 @@ -37,13 +37,11 @@ int inPolygons, int Mode) { -/* return (HRGN) NtGdiPolyPolyDraw( (HDC) Mode, + return (HRGN) NtGdiPolyPolyDraw( (HDC) Mode, (PPOINT) Point, (PULONG) Count, (ULONG) inPolygons, GdiPolyPolyRgn ); -*/ - return (HRGN) NULL; } Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Thu Apr 26 18:53:36 2007 @@ -144,6 +144,7 @@ </directory> <directory name="objects"> <compilationunit name="objects.c"> + <file>arc.c</file> <file>bezier.c</file> <file>bitmaps.c</file> <file>brush.c</file> Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Thu Apr 26 18:53:36 2007 @@ -6,6 +6,7 @@ NtGdiAngleArc 6 NtGdiAnimatePalette 4 NtGdiArc 9 +NtGdiArcInternal 10 NtGdiArcTo 9 NtGdiBeginPath 1 NtGdiBitBlt 11 @@ -197,6 +198,7 @@ NtGdiPolyline 3 NtGdiPolylineTo 3 NtGdiPolyPatBlt 5 +NtGdiPolyPolyDraw 5 NtGdiPolyPolyline 4 NtGdiPolyTextOut 3 NtGdiPolygon 3

1 0

[jimtabor] 26522: Start NtGdiPolyPolyDraw stub.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 18:42:22 2007 New Revision: 26522 URL: http://svn.reactos.org/svn/reactos?rev=26522&view=rev Log: Start NtGdiPolyPolyDraw stub. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Apr 26 18:42:22 2007 @@ -998,6 +998,19 @@ return Ret; } + +ULONG_PTR +STDCALL +NtGdiPolyPolyDraw( IN HDC hdc, + IN PPOINT ppt, + IN PULONG pcpt, + IN ULONG ccpt, + IN INT iFunc ) +{ + return (ULONG_PTR) 0; +} + + BOOL FASTCALL IntRectangle(PDC dc,

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