Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20417: revert my last code did miss POLYGONFILL_DestroyEdgeList was at end

by greatlrd＠svn.reactos.org

revert my last code did miss POLYGONFILL_DestroyEdgeList was at end Modified: trunk/reactos/subsys/win32k/objects/polyfill.c _____ Modified: trunk/reactos/subsys/win32k/objects/polyfill.c --- trunk/reactos/subsys/win32k/objects/polyfill.c 2005-12-29 11:16:28 UTC (rev 20416) +++ trunk/reactos/subsys/win32k/objects/polyfill.c 2005-12-29 11:20:30 UTC (rev 20417) @@ -292,22 +292,7 @@ return list; fail: - if (list != NULL) - { - EngFreeMem(list); - } - if (list->Edges != NULL) - { - int t; - for (t=0; Count;t++) - { - if (list->Edges[t] != NULL) - EngFreeMem(list->Edges[t]); - } - EngFreeMem(list->Edges); - } - DPRINT1("Out Of MEMORY!!\n"); POLYGONFILL_DestroyEdgeList ( list ); return 0;

18 years, 8 months

[greatlrd] 20416: Fix memory leak in POLYGONFILL_MakeEdgeList when it fail.

by greatlrd＠svn.reactos.org

Fix memory leak in POLYGONFILL_MakeEdgeList when it fail. Modified: trunk/reactos/subsys/win32k/objects/polyfill.c _____ Modified: trunk/reactos/subsys/win32k/objects/polyfill.c --- trunk/reactos/subsys/win32k/objects/polyfill.c 2005-12-29 10:53:01 UTC (rev 20415) +++ trunk/reactos/subsys/win32k/objects/polyfill.c 2005-12-29 11:16:28 UTC (rev 20416) @@ -266,13 +266,15 @@ list->Edges = (FILL_EDGE**)EngAllocMem(FL_ZERO_MEMORY, Count*sizeof(FILL_EDGE*), FILL_EDGE_ALLOC_TAG); if ( !list->Edges ) goto fail; + memset ( list->Edges, 0, Count * sizeof(FILL_EDGE*) ); for ( CurPt = 1; CurPt < Count; ++CurPt ) { e = POLYGONFILL_MakeEdge ( Points[CurPt-1], Points[CurPt] ); - if ( !e ) + if ( !e ) goto fail; + // if a straight horizontal line - who cares? if ( !e->absdy ) EngFreeMem ( e ); @@ -282,6 +284,7 @@ e = POLYGONFILL_MakeEdge ( Points[CurPt-1], Points[0] ); if ( !e ) goto fail; + if ( !e->absdy ) EngFreeMem ( e ); else @@ -289,6 +292,22 @@ return list; fail: + if (list != NULL) + { + EngFreeMem(list); + } + + if (list->Edges != NULL) + { + int t; + for (t=0; Count;t++) + { + if (list->Edges[t] != NULL) + EngFreeMem(list->Edges[t]); + } + EngFreeMem(list->Edges); + } + DPRINT1("Out Of MEMORY!!\n"); POLYGONFILL_DestroyEdgeList ( list ); return 0;

18 years, 8 months

[greatlrd] 20415: EngSetPointerShape did not check for NULL pointer when it alloc memmory.

by greatlrd＠svn.reactos.org

EngSetPointerShape did not check for NULL pointer when it alloc memmory. Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-29 08:43:45 UTC (rev 20414) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-29 10:53:01 UTC (rev 20415) @@ -389,6 +389,11 @@ PBYTE Bits; Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + memcpy(Bits, psoColor->pvBits, psoColor->cjBits); pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, @@ -407,6 +412,11 @@ Size.cx = pgp->Size.cx; Size.cy = pgp->Size.cy << 1; Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + memcpy(Bits, psoMask->pvBits, psoMask->cjBits); pgp->MaskSurface = (HSURF)EngCreateBitmap(Size,

18 years, 8 months

[ion] 20414: Fix kernel-mode executive atom implementation (mostly add SEH and tidy up the code). Then fix kernel32 implementation which was sending incorrect sizes, and also re-factored the entire code, since most functions were quatriplicated. now there are 3 main functions instead of 12. Also fixed a bug in RtlCreateAtomTable.

by ion＠svn.reactos.org

Fix kernel-mode executive atom implementation (mostly add SEH and tidy up the code). Then fix kernel32 implementation which was sending incorrect sizes, and also re-factored the entire code, since most functions were quatriplicated. now there are 3 main functions instead of 12. Also fixed a bug in RtlCreateAtomTable. Modified: trunk/reactos/lib/kernel32/misc/atom.c Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/ntoskrnl/ex/atom.c _____ Modified: trunk/reactos/lib/kernel32/misc/atom.c --- trunk/reactos/lib/kernel32/misc/atom.c 2005-12-29 05:18:21 UTC (rev 20413) +++ trunk/reactos/lib/kernel32/misc/atom.c 2005-12-29 08:43:45 UTC (rev 20414) @@ -1,635 +1,584 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/atom.c * PURPOSE: Atom functions - * PROGRAMMER: Eric Kohl ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 - * Full rewrite 27/05/2001 + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ +/* INCLUDES ******************************************************************/ #include <k32.h> #define NDEBUG #include "../include/debug.h" - /* GLOBALS *******************************************************************/ -static PRTL_ATOM_TABLE LocalAtomTable = NULL; +PRTL_ATOM_TABLE BaseLocalAtomTable = NULL; -static PRTL_ATOM_TABLE GetLocalAtomTable(VOID); - - /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ -ATOM STDCALL -GlobalAddAtomA(LPCSTR lpString) +PVOID +WINAPI +InternalInitAtomTable(VOID) { - UNICODE_STRING AtomName; - NTSTATUS Status; - ATOM Atom; + /* Create or return the local table */ + if (!BaseLocalAtomTable) RtlCreateAtomTable(0, &BaseLocalAtomTable); + return BaseLocalAtomTable; +} - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } +ATOM +WINAPI +InternalAddAtom(BOOLEAN Local, + BOOLEAN Unicode, + LPCSTR AtomName) +{ + NTSTATUS Status; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + PUNICODE_STRING AtomNameString; + ATOM Atom = INVALID_ATOM; - if (lstrlenA(lpString) > 255) - { - /* This limit does not exist with NtAddAtom so the limit is probably - * added for compability. -Gunnar - */ - SetLastError(ERROR_INVALID_PARAMETER); - return (ATOM)0; - } + /* Check if it's an integer atom */ + if ((ULONG_PTR)AtomName <= 0xFFFF) + { + /* Convert the name to an atom */ + Atom = (ATOM)PtrToShort((PVOID)AtomName); + if (Atom >= MAXINTATOM) + { + /* Fail, atom number too large */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return INVALID_ATOM; + } - RtlCreateUnicodeStringFromAsciiz(&AtomName, - (LPSTR)lpString); + /* Return it */ + return Atom; + } + else + { + /* Check if this is a unicode atom */ + if (Unicode) + { + /* Use a unicode string */ + AtomNameString = &UnicodeString; + RtlInitUnicodeString(AtomNameString, (LPWSTR)AtomName); + Status = STATUS_SUCCESS; + } + else + { + /* Use an ansi string */ + RtlInitAnsiString(&AnsiString, AtomName ); - Status = NtAddAtom(AtomName.Buffer, - AtomName.Length, - &Atom); - RtlFreeUnicodeString(&AtomName); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } + /* Check if we can abuse the TEB */ + if (AnsiString.MaximumLength > 260) + { + /* We can't, allocate a new string */ + AtomNameString = &UnicodeString; + Status = RtlAnsiStringToUnicodeString(AtomNameString, + &AnsiString, + TRUE); + } + else + { + /* We can! Use the TEB */ + AtomNameString = &NtCurrentTeb()->StaticUnicodeString; + Status = RtlAnsiStringToUnicodeString(AtomNameString, + &AnsiString, + FALSE); + } + } - return Atom; -} + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return Atom; + } + } + /* Check if we're doing local add */ + if (Local) + { + /* Do a local add */ + Status = RtlAddAtomToAtomTable(InternalInitAtomTable(), + AtomNameString->Buffer, + &Atom); + } + else + { + /* Do a global add */ + Status = NtAddAtom(AtomNameString->Buffer, + AtomNameString->Length, + &Atom); + } -/* - * @implemented - */ -ATOM STDCALL -GlobalAddAtomW(LPCWSTR lpString) + /* Check for failure */ + if (!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); + + /* Check if we were non-static ANSI */ + if (!(Unicode) && (AtomNameString == &UnicodeString)) + { + /* Free the allocated buffer */ + RtlFreeUnicodeString(AtomNameString); + } + + /* Return the atom */ + return Atom; +} + +ATOM +WINAPI +InternalFindAtom(BOOLEAN Local, + BOOLEAN Unicode, + LPCSTR AtomName) { - ATOM Atom; - NTSTATUS Status; + NTSTATUS Status; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + PUNICODE_STRING AtomNameString; + ATOM Atom = INVALID_ATOM; - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } + /* Check if it's an integer atom */ + if ((ULONG_PTR)AtomName <= 0xFFFF) + { + /* Convert the name to an atom */ + Atom = (ATOM)PtrToShort((PVOID)AtomName); + if (Atom >= MAXINTATOM) + { + /* Fail, atom number too large */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + DPRINT1("Invalid atom\n"); + } - if (lstrlenW(lpString) > 255) - { - /* This limit does not exist with NtAddAtom so the limit is probably - * added for compability. -Gunnar - */ - SetLastError(ERROR_INVALID_PARAMETER); - return (ATOM)0; - } + /* Return it */ + return Atom; + } + else + { + /* Check if this is a unicode atom */ + if (Unicode) + { + /* Use a unicode string */ + AtomNameString = &UnicodeString; + RtlInitUnicodeString(AtomNameString, (LPWSTR)AtomName); + Status = STATUS_SUCCESS; + } + else + { + /* Use an ansi string */ + RtlInitAnsiString(&AnsiString, AtomName); - Status = NtAddAtom((LPWSTR)lpString, - wcslen(lpString), - &Atom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } + /* Check if we can abuse the TEB */ + if (AnsiString.MaximumLength > 260) + { + /* We can't, allocate a new string */ + AtomNameString = &UnicodeString; + Status = RtlAnsiStringToUnicodeString(AtomNameString, + &AnsiString, + TRUE); + } + else + { + /* We can! Use the TEB */ + AtomNameString = &NtCurrentTeb()->StaticUnicodeString; + Status = RtlAnsiStringToUnicodeString(AtomNameString, + &AnsiString, + FALSE); + } + } - return Atom; -} + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed\n"); + SetLastErrorByStatus(Status); + return Atom; + } + } + /* Check if we're doing local lookup */ + if (Local) + { + /* Do a local lookup */ + Status = RtlLookupAtomInAtomTable(InternalInitAtomTable(), + AtomNameString->Buffer, + &Atom); + } + else + { + /* Do a global search */ + if (!AtomNameString->Length) + { + /* This is illegal in win32 */ + DPRINT1("No name given\n"); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* Call the global function */ + Status = NtFindAtom(AtomNameString->Buffer, + AtomNameString->Length, + &Atom); + } + } -/* - * @implemented - */ -ATOM STDCALL -GlobalDeleteAtom(ATOM nAtom) + /* Check for failure */ + if (!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); + + /* Check if we were non-static ANSI */ + if (!(Unicode) && (AtomNameString == &UnicodeString)) + { + /* Free the allocated buffer */ + RtlFreeUnicodeString(AtomNameString); + } + + /* Return the atom */ + return Atom; +} + +ATOM +WINAPI +InternalDeleteAtom(BOOLEAN Local, + ATOM Atom) { - NTSTATUS Status; + NTSTATUS Status; - if (nAtom < 0xC000) - { - return 0; - } + /* Validate it */ + if (Atom >= MAXINTATOM) + { + /* Check if it's a local delete */ + if (Local) + { + /* Delete it locally */ + Status = RtlDeleteAtomFromAtomTable(InternalInitAtomTable(), Atom); + } + else + { + /* Delete it globall */ + Status = NtDeleteAtom(Atom); + } - Status = NtDeleteAtom(nAtom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return nAtom; - } + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return INVALID_ATOM; + } + } - return 0; + /* Return failure */ + return 0; } - -/* - * @implemented - */ -ATOM STDCALL -GlobalFindAtomA(LPCSTR lpString) +UINT +WINAPI +InternalGetAtomName(BOOLEAN Local, + BOOLEAN Unicode, + ATOM Atom, + LPSTR AtomName, + DWORD Size) { - UNICODE_STRING AtomName; - NTSTATUS Status; - ATOM Atom; + NTSTATUS Status; + DWORD RetVal = 0; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + PVOID TempBuffer = NULL; + PWSTR AtomNameString; + ULONG AtomInfoLength; + ULONG AtomNameLength; + PATOM_BASIC_INFORMATION AtomInfo; - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } + /* Normalize the size as not to overflow */ + if (!Unicode && Size > 0x7000) Size = 0x7000; - if (lstrlenA(lpString) > 255) - { - /* This limit does not exist with NtAddAtom so the limit is probably - * added for compability. -Gunnar - */ - SetLastError(ERROR_INVALID_PARAMETER); - return (ATOM)0; - } + /* Make sure it's valid too */ + if (!Size) + { + SetLastErrorByStatus(STATUS_BUFFER_OVERFLOW); + return 0; + } - RtlCreateUnicodeStringFromAsciiz(&AtomName, - (LPSTR)lpString); - Status = NtFindAtom(AtomName.Buffer, - AtomName.Length, - &Atom); - RtlFreeUnicodeString(&AtomName); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } + /* Check if this is a global query */ + if (Local) + { + /* Set the query length */ + AtomNameLength = Size * sizeof(WCHAR); - return Atom; -} + /* If it's unicode, just keep the name */ + if (Unicode) + { + AtomNameString = (PWSTR)AtomName; + } + else + { + /* Allocate memory for the ansi buffer */ + TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + AtomNameLength); + AtomNameString = TempBuffer; + } + /* Query the name */ + Status = RtlQueryAtomInAtomTable(InternalInitAtomTable(), + Atom, + NULL, + NULL, + AtomNameString, + &AtomNameLength); + } + else + { + /* We're going to do a global query, so allocate a buffer */ + AtomInfoLength = sizeof(ATOM_BASIC_INFORMATION) + + (Size * sizeof(WCHAR)); + AtomInfo = TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + AtomInfoLength); -/* - * @implemented - */ -ATOM STDCALL -GlobalFindAtomW(LPCWSTR lpString) -{ - ATOM Atom; - NTSTATUS Status; + /* Query the name */ + Status = NtQueryInformationAtom(Atom, + AtomBasicInformation, + AtomInfo, + AtomInfoLength, + &AtomInfoLength); + if (NT_SUCCESS(Status)) + { + /* Success. Update the length and get the name */ + AtomNameLength = (ULONG)AtomInfo->NameLength; + AtomNameString = AtomInfo->Name; + } + } - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } + /* Check for global success */ + if (NT_SUCCESS(Status)) + { + /* Check if it was unicode */ + if (Unicode) + { + /* We return the length in chars */ + RetVal = AtomNameLength / sizeof(WCHAR); - if (lstrlenW(lpString) > 255) - { - /* This limit does not exist with NtAddAtom so the limit is probably - * added for compability. -Gunnar - */ - SetLastError(ERROR_INVALID_PARAMETER); - return (ATOM)0; - } + /* Copy the memory if this was a global query */ + if (AtomNameString != (PWSTR)AtomName) + { + RtlMoveMemory(AtomName, AtomNameString, AtomNameLength); + } - Status = NtFindAtom((LPWSTR)lpString, - wcslen(lpString), - &Atom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } + /* And null-terminate it if the buffer was too large */ + if (RetVal < Size) + { + ((PWCHAR)AtomName)[RetVal] = UNICODE_NULL; + } + } + else + { + /* First create a unicode string with our data */ + UnicodeString.Buffer = AtomNameString; + UnicodeString.Length = (USHORT)AtomNameLength; + UnicodeString.MaximumLength = (USHORT)(UnicodeString.Length + + sizeof(WCHAR)); - return Atom; -} + /* Now prepare an ansi string for conversion */ + AnsiString.Buffer = AtomName; + AnsiString.Length = 0; + AnsiString.MaximumLength = (USHORT)Size; + /* Convert it */ + Status = RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); -UINT STDCALL -GlobalGetAtomNameA(ATOM nAtom, - LPSTR lpBuffer, - int nSize) -{ - PATOM_BASIC_INFORMATION Buffer; - UNICODE_STRING AtomNameU; - ANSI_STRING AtomName; - ULONG BufferSize; - ULONG ReturnLength; - NTSTATUS Status; + /* Return the length */ + if (NT_SUCCESS(Status)) RetVal = AnsiString.Length; + } + } - BufferSize = sizeof(ATOM_BASIC_INFORMATION) + nSize * sizeof(WCHAR); - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - BufferSize); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } + /* Free the temporary buffer if we have one */ + if (TempBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, TempBuffer); - Status = NtQueryInformationAtom(nAtom, - AtomBasicInformation, - Buffer, - BufferSize, - &ReturnLength); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("Failed: %lx\n", Status); SetLastErrorByStatus(Status); - return 0; - } + } - RtlInitUnicodeString(&AtomNameU, - Buffer->Name); - AtomName.Buffer = lpBuffer; - AtomName.Length = 0; - AtomName.MaximumLength = nSize; - RtlUnicodeStringToAnsiString(&AtomName, - &AtomNameU, - FALSE); + /* Return length */ + return RetVal; +} - ReturnLength = AtomName.Length; - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); +/* FUNCTIONS *****************************************************************/ - return ReturnLength; +/* + * @implemented + */ +ATOM +WINAPI +GlobalAddAtomA(LPCSTR lpString) +{ + return InternalAddAtom(FALSE, FALSE, lpString); } +/* + * @implemented + */ +ATOM +WINAPI +GlobalAddAtomW(LPCWSTR lpString) +{ + return InternalAddAtom(FALSE, TRUE, (LPSTR)lpString); +} /* * @implemented */ -UINT STDCALL -GlobalGetAtomNameW(ATOM nAtom, - LPWSTR lpBuffer, - int nSize) +ATOM +WINAPI +GlobalDeleteAtom(ATOM nAtom) { - PATOM_BASIC_INFORMATION Buffer; - ULONG BufferSize; - ULONG ReturnLength; - NTSTATUS Status; + return InternalDeleteAtom(FALSE, nAtom); +} - BufferSize = sizeof(ATOM_BASIC_INFORMATION) + nSize * sizeof(WCHAR); - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - BufferSize); - if (Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } +/* + * @implemented + */ +ATOM +WINAPI +GlobalFindAtomA(LPCSTR lpString) +{ + return InternalFindAtom(FALSE, FALSE, lpString); +} - Status = NtQueryInformationAtom(nAtom, - AtomBasicInformation, - Buffer, - BufferSize, - &ReturnLength); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); - SetLastErrorByStatus(Status); - return 0; - } +/* + * @implemented + */ +ATOM +WINAPI +GlobalFindAtomW(LPCWSTR lpString) +{ + return InternalFindAtom(FALSE, TRUE, (LPSTR)lpString); +} - memcpy(lpBuffer, Buffer->Name, Buffer->NameLength); - ReturnLength = Buffer->NameLength / sizeof(WCHAR); - *(lpBuffer + ReturnLength) = 0; - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); - - return ReturnLength; +/* + * @implemented + */ +UINT +WINAPI +GlobalGetAtomNameA(ATOM nAtom, + LPSTR lpBuffer, + int nSize) +{ + return InternalGetAtomName(FALSE, FALSE, nAtom, lpBuffer, (DWORD)nSize); } - -static PRTL_ATOM_TABLE -GetLocalAtomTable(VOID) +/* + * @implemented + */ +UINT +WINAPI +GlobalGetAtomNameW(ATOM nAtom, + LPWSTR lpBuffer, + int nSize) { - if (LocalAtomTable != NULL) - { - return LocalAtomTable; - } - RtlCreateAtomTable(37, - &LocalAtomTable); - return LocalAtomTable; + return InternalGetAtomName(FALSE, + TRUE, + nAtom, + (LPSTR)lpBuffer, + (DWORD)nSize); } - /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI InitAtomTable(DWORD nSize) { - NTSTATUS Status; + /* Normalize size */ + if (nSize < 4 || nSize > 511) nSize = 37; - /* nSize should be a prime number */ - - if ( nSize < 4 || nSize >= 512 ) - { - nSize = 37; - } - - if (LocalAtomTable == NULL) - { - Status = RtlCreateAtomTable(nSize, - &LocalAtomTable); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - } - - return TRUE; + DPRINT("Here\n"); + return NT_SUCCESS(RtlCreateAtomTable(nSize, &BaseLocalAtomTable)); } - /* * @implemented */ -ATOM STDCALL +ATOM +WINAPI AddAtomA(LPCSTR lpString) { - PRTL_ATOM_TABLE AtomTable; - UNICODE_STRING AtomName; - NTSTATUS Status; - ATOM Atom; - - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } - - AtomTable = GetLocalAtomTable(); - - RtlCreateUnicodeStringFromAsciiz(&AtomName, - (LPSTR)lpString); - - Status = RtlAddAtomToAtomTable(AtomTable, - AtomName.Buffer, - &Atom); - RtlFreeUnicodeString(&AtomName); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } - - return Atom; + return InternalAddAtom(TRUE, FALSE, lpString); } - /* * @implemented */ -ATOM STDCALL +ATOM +WINAPI AddAtomW(LPCWSTR lpString) { - PRTL_ATOM_TABLE AtomTable; - ATOM Atom; - NTSTATUS Status; - - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } - - AtomTable = GetLocalAtomTable(); - - Status = RtlAddAtomToAtomTable(AtomTable, - (LPWSTR)lpString, - &Atom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } - - return Atom; + return InternalAddAtom(TRUE, TRUE, (LPSTR)lpString); } - /* * @implemented */ -ATOM STDCALL +ATOM +WINAPI DeleteAtom(ATOM nAtom) { - PRTL_ATOM_TABLE AtomTable; - NTSTATUS Status; - - if (nAtom < 0xC000) - { - return 0; - } - - AtomTable = GetLocalAtomTable(); - - Status = RtlDeleteAtomFromAtomTable(AtomTable, - nAtom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return nAtom; - } - - return 0; + return InternalDeleteAtom(TRUE, nAtom); } - /* * @implemented */ -ATOM STDCALL +ATOM +WINAPI FindAtomA(LPCSTR lpString) { - PRTL_ATOM_TABLE AtomTable; - UNICODE_STRING AtomName; - NTSTATUS Status; - ATOM Atom; - - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } - - AtomTable = GetLocalAtomTable(); - RtlCreateUnicodeStringFromAsciiz(&AtomName, - (LPSTR)lpString); - Status = RtlLookupAtomInAtomTable(AtomTable, - AtomName.Buffer, - &Atom); - RtlFreeUnicodeString(&AtomName); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } - - return Atom; + return InternalFindAtom(TRUE, FALSE, lpString); } - /* * @implemented */ -ATOM STDCALL +ATOM +WINAPI FindAtomW(LPCWSTR lpString) { - PRTL_ATOM_TABLE AtomTable; - ATOM Atom; - NTSTATUS Status; + return InternalFindAtom(TRUE, TRUE, (LPSTR)lpString); - if (HIWORD((ULONG)lpString) == 0) - { - if ((ULONG)lpString >= 0xC000) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return (ATOM)0; - } - return (ATOM)LOWORD((ULONG)lpString); - } - - AtomTable = GetLocalAtomTable(); - - Status = RtlLookupAtomInAtomTable(AtomTable, - (LPWSTR)lpString, - &Atom); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return (ATOM)0; - } - - return Atom; } - /* * @implemented */ -UINT STDCALL +UINT +WINAPI GetAtomNameA(ATOM nAtom, - LPSTR lpBuffer, - int nSize) [truncated at 1000 lines; 539 more skipped]

18 years, 8 months

[amunger] 20413: Use Bitstream Vera Sans when asked for Tahoma. Addresses bug 1188.

by amunger＠svn.reactos.com

Use Bitstream Vera Sans when asked for Tahoma. Addresses bug 1188. Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-12-29 01:59:55 UTC (rev 20412) +++ trunk/reactos/bootdata/hivesft.inf 2005-12-29 05:18:21 UTC (rev 20413) @@ -41,6 +41,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Bitstream Vera Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Bitstream Vera Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Bitstream Vera Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"

18 years, 8 months

[gedmurphy] 20412: change service pack from 6 to 4

by gedmurphy＠svn.reactos.com

change service pack from 6 to 4 addresses bug 1169 Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-12-29 01:57:50 UTC (rev 20411) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-12-29 01:59:55 UTC (rev 20412) @@ -21,7 +21,7 @@ ULONG NtMajorVersion = 5; ULONG NtMinorVersion = 0; -ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0); +ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(4, 0); ULONG NtBuildNumber = KERNEL_VERSION_BUILD; ULONG NtGlobalFlag = 0; CHAR KeNumberProcessors;

18 years, 8 months

[greatlrd] 20411: DIB_CreateDIBSection fix do not zero out memmory if it is a null pointer it got from ExAllocatePoolWithTag

by greatlrd＠svn.reactos.com

DIB_CreateDIBSection fix do not zero out memmory if it is a null pointer it got from ExAllocatePoolWithTag DIB_MapPaletteColors do not try write to NULL pointer if ExAllocatePoolWithTag do return a NULLL pointer. Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-12-29 00:04:34 UTC (rev 20410) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-12-29 01:57:50 UTC (rev 20411) @@ -866,7 +866,7 @@ if (bm.bmBits) { dib = ExAllocatePoolWithTag(PagedPool, sizeof(DIBSECTION), TAG_DIB); - RtlZeroMemory(dib, sizeof(DIBSECTION)); + if (dib != NULL) RtlZeroMemory(dib, sizeof(DIBSECTION)); } if (dib) @@ -1125,6 +1125,12 @@ } lpRGB = (RGBQUAD *)ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD) * nNumColors, TAG_COLORMAP); + if (lpRGB == NULL) + { + PALETTE_UnlockPalette(palGDI); + return NULL; + } + lpIndex = (USHORT *)&lpbmi->bmiColors[0]; for (i = 0; i < nNumColors; i++)

18 years, 8 months

[mf] 20410: update of french Explore resource script from G. Maton Bugzilla entry 1184)

by mf＠svn.reactos.com

update of french Explore resource script from G. Maton Bugzilla entry 1184) Modified: trunk/reactos/subsys/system/explorer/explorer-fr.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-fr.rc --- trunk/reactos/subsys/system/explorer/explorer-fr.rc 2005-12-28 23:51:32 UTC (rev 20409) +++ trunk/reactos/subsys/system/explorer/explorer-fr.rc 2005-12-29 00:04:34 UTC (rev 20410) @@ -82,62 +82,95 @@ BEGIN MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR + MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR MENUITEM "Barre d'&Útat", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&SDI", ID_VIEW_SDI + MENUITEM "A&ctualiser\tF5", ID_REFRESH + MENUITEM "&Plein Úcran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI END - POPUP "&Window" + POPUP "&FenÛtre" BEGIN - MENUITEM "New &Window", ID_WINDOW_NEW - MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "Nouvelle &fenÛtre", ID_WINDOW_NEW + MENUITEM "Cascade\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Mosa´que &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "Mosa´que &verticale\tCtrl+Shift+S", ID_WINDOW_TILE_VERT + MENUITEM "Organisation automatique", ID_WINDOW_AUTOSORT + MENUITEM "&Organisation des symboles", ID_WINDOW_ARRANGE END - POPUP "&Tools" + POPUP "&Outils" BEGIN MENUITEM "&Options", ID_TOOLS_OPTIONS END - POPUP "A&ide" + POPUP "&Aide" BEGIN - MENUITEM "&FAQ Explorateur...", ID_EXPLORER_FAQ - MENUITEM "A propos de l'&explorateur...", ID_ABOUT_WINDOWS - MENUITEM "A propos de l'&OS...", ID_ABOUT_EXPLORER + 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 END END +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&ParamÞtres...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Gestionnaire de tÔches...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&A propos de l'explorateur...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Ouvrir le contr¶le du volume", ID_TRAY_VOLUME + MENUITEM "Ajuster les propriÚtÚs audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +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 + END +END + IDM_SDIFRAME MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN - MENUITEM "E&xÚcuter...", ID_EXECUTE + MENUITEM "&ExÚcuter...", ID_EXECUTE MENUITEM SEPARATOR MENUITEM "&Fermer", ID_FILE_EXIT END POPUP "&Affichage" BEGIN - MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR - MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "Barre d'&Útat", ID_VIEW_STATUSBAR + MENUITEM "&Barre d'outils", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Barre d'Útat", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "A&ctualiser\tF5", ID_REFRESH + MENUITEM "&Plein Úcran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END - POPUP "&Tools" + POPUP "&Outils" BEGIN MENUITEM "&Options", ID_TOOLS_OPTIONS END - POPUP "A&ide" + POPUP "&Aide" BEGIN - MENUITEM "&FAQ Explorateur...", ID_EXPLORER_FAQ - MENUITEM "A propos de l'&explorateur...", ID_ABOUT_WINDOWS - MENUITEM "A propos de l'&OS...", ID_ABOUT_EXPLORER + 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 END END @@ -149,21 +182,160 @@ IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" +CAPTION "ExÚcuter" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Commande:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 + CONTROL "Comme &Symbole",214,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,3,45,71,12 DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Cancel",2,158,23,47,14 - PUSHBUTTON "&Help",254,158,43,47,14 + PUSHBUTTON "&Annuler",2,158,23,47,14 + PUSHBUTTON "&Aide",254,158,43,47,14 END +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Rechercher un programme dans le menu dÚmarrer" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtre:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + 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 +END +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "PropriÚtÚs du bureau" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Please select your prefered icon alignment algorithm:", + IDC_STATIC,7,7,166,8 + CONTROL "gauche/haut descend",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", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "droite/haut descend",IDC_ICON_ALIGN_3,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "gauche/fond monte",IDC_ICON_ALIGN_4,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "gauche/fond right",IDC_ICON_ALIGN_5,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "droite/fond 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", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "bord descend",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 + CONTROL "faire le tour",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + 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 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +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 + PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "PropriÚtÚs du menu dÚmarrer" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +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" +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 + 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 + 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 | + ES_READONLY + CONTROL "afficher les cac&hÚs",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Annuler",IDCANCEL,151,153,50,14 +END + +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" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Veuillez sÚlectionner l'interface que vous prÚfÚrez pour l'explorateur:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + 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", + 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, + 174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Annuler",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "A propos de ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + //////////////////////////////////////////////////////////////////////// ///// // // String Table @@ -171,13 +343,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "Explorateur Reactos" + IDS_TITLE "Reactos Explorer" IDS_START "DÚmarrer" - IDS_LOGOFF "DÚconnexion ..." + IDS_LOGOFF "Se dÚconnecter..." IDS_SHUTDOWN "ArrÛter..." IDS_LAUNCH "ExÚcuter..." IDS_START_HELP "Aide" - IDS_SEARCH_FILES "Rechercher Fichiers..." + IDS_SEARCH_FILES "Rechercher..." IDS_DOCUMENTS "Documents" IDS_FAVORITES "Favoris" IDS_PROGRAMS "Programmes" @@ -190,41 +362,41 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" + IDS_STARTMENU "Menu dÚmarrer" + IDS_MINIMIZE_ALL "mimimiser toutes les fenÛtres" IDS_DESKTOP_NUM "Bureau %d" IDS_VOLUME "Volume" - IDS_ITEMS_CUR "current items" + IDS_ITEMS_CUR "abjets actuels" IDS_ITEMS_CONFIGURED "configuration" IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "hidden" - IDS_NOTIFY_SHOW "show" - IDS_NOTIFY_HIDE "hide" - IDS_NOTIFY_AUTOHIDE "autohide" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" - IDS_TERMINATE "DÚconnexion" + IDS_ITEMS_HIDDEN "cachÚ" + 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_TERMINATE "Fermer ROS Explorer" END STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "RÚseaux" - IDS_CONNECTIONS "Connexions rÚseaux" - IDS_DRIVES "Disques" - IDS_SEARCH_COMPUTER "Recherche Ordinateurs..." - IDS_SETTINGS_MENU "Barre des tÔches et menu dÚmarrer" + IDS_CONNECTIONS "Connections RÚseaux" + IDS_DRIVES "Drives" + IDS_SEARCH_COMPUTER "Rechercher un ordinateur..." + IDS_SETTINGS_MENU "ParamÞtres du menu" IDS_CONTROL_PANEL "Panneau de configuration" IDS_PRINTERS "Imprimantes" IDS_BROWSE "Parcourir" - IDS_SEARCH_PRG "Recherche Programme..." + 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 "&A propos de l'explorateur..." IDS_LAUNCH_MANY_PROGRAMS - "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "Bureau" + "Vous avez selectionnÚ plus d'un programme.\nEtes vous sur de vouloir tous les lancer?" + IDS_DESKTOPBAR_SETTINGS "ParamÞtres du bureau" IDS_DESKTOP "Bureau" - IDS_TASKBAR "Taskbar" + IDS_TASKBAR "Barre de tÔches" END #endif // French (France) resources

18 years, 8 months

[mf] 20409: clean up ibrowser resource scripts

by mf＠svn.reactos.com

clean up ibrowser resource scripts Added: trunk/reactos/subsys/system/ibrowser/De.rc Modified: trunk/reactos/subsys/system/ibrowser/En.rc Modified: trunk/reactos/subsys/system/ibrowser/Es.rc Added: trunk/reactos/subsys/system/ibrowser/Fr.rc Modified: trunk/reactos/subsys/system/ibrowser/Hu.rc Modified: trunk/reactos/subsys/system/ibrowser/Ja.rc Added: trunk/reactos/subsys/system/ibrowser/Ro.rc Added: trunk/reactos/subsys/system/ibrowser/Sv.rc Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.dsp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.rc Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc _____ Added: trunk/reactos/subsys/system/ibrowser/De.rc --- trunk/reactos/subsys/system/ibrowser/De.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/De.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -0,0 +1,148 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_GERMAN, SUBLANG_GERMAN\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", ID_FILE_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hilfe" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Web Browser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Empty)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&?ber..." +END + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/subsys/system/ibrowser/En.rc --- trunk/reactos/subsys/system/ibrowser/En.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/En.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -1,9 +1,161 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Open", ID_FILE_OPEN + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Help" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Web Browser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + STRINGTABLE DISCARDABLE BEGIN - IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION - IDS_IBROWSER_VERSION_STR "ReactOS %s Web Browser" + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Empty)" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&About..." +END + +#endif // English (U.S.) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/subsys/system/ibrowser/Es.rc --- trunk/reactos/subsys/system/ibrowser/Es.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Es.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -1,9 +1,122 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_SPANISH, SUBLANG_SPANISH\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""Nevegador de Web ReactOS%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""Nevegador de Web ReactOS Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// Spanish (Castilian) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Ayuda" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Acerca de IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +#endif // Spanish (Castilian) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH STRINGTABLE DISCARDABLE BEGIN - IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION - IDS_IBROWSER_VERSION_STR "Nevegador de Web ReactOS %s" +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "Nevegador de Web ReactOS%0s" +#else +IDS_IBROWSER_VERSION_STR "Nevegador de Web ReactOS Ansi%0s" +#endif END +#endif +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/subsys/system/ibrowser/Fr.rc --- trunk/reactos/subsys/system/ibrowser/Fr.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Fr.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -0,0 +1,151 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// French (France) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_FRENCH, SUBLANG_FRENCH\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""Navigateur Internet de ReactOS%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""Navigateur Internet de ReactOS Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Ouvrir", ID_FILE_OPEN + MENUITEM "&Quitter", ID_FILE_EXIT + END + POPUP "&Affichage" + BEGIN + MENUITEM "Barre d'ou&tils", ID_VIEW_TOOL_BAR + MENUITEM "Pann&eau lat?al", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Barre d'?at", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Actualise&r", ID_REFRESH + MENUITEM "&Plein ?ran", ID_VIEW_FULLSCREEN + END + POPUP "&Aide" + BEGIN + MENUITEM "&Rubriques d'aide de iBrowser", ID_IBROWSER_FAQ + MENUITEM "? propos de iBrowser...", ID_ABOUT_IBROWSER + MENUITEM "? propos de ReactOS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Navigateur internet de Reactos" + IDS_EMPTY "(Vide)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "? propos de iBrowser..." +END + +#endif // French (France) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "Navigateur Internet de ReactOS%0s" +#else +IDS_IBROWSER_VERSION_STR "Navigateur Internet de ReactOS Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/subsys/system/ibrowser/Hu.rc --- trunk/reactos/subsys/system/ibrowser/Hu.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Hu.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -1,10 +1,81 @@ -// Hungarian (HU) resource by Robert Horvath (talley at cubeclub.hu) +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""A ReactOS %s webb÷ngÚsz§%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""A ReactOS %s webb÷ngÚsz§ Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION - IDS_IBROWSER_VERSION_STR "A ReactOS %s webb÷ngÚsz§" +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "A ReactOS %s webb÷ngÚsz§%0s" +#else +IDS_IBROWSER_VERSION_STR "A ReactOS %s webb÷ngÚsz§ Ansi%0s" +#endif END +#endif +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/subsys/system/ibrowser/Ja.rc --- trunk/reactos/subsys/system/ibrowser/Ja.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Ja.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -1,4 +1,17 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS //////////////////////////////////////////////////////////////////////// ///// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// // Japanese resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) @@ -55,3 +68,73 @@ #endif // Japanese resources //////////////////////////////////////////////////////////////////////// ///// + + +/////////////////////////////////////////////////////////////////////// ////// +// 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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/subsys/system/ibrowser/Ro.rc --- trunk/reactos/subsys/system/ibrowser/Ro.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Ro.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -0,0 +1,122 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Neutral (Default) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Fisier" + BEGIN + MENUITEM "&Iesire", ID_FILE_EXIT + END + POPUP "&Prezentare" + BEGIN + MENUITEM "&Bara cu instrumente", ID_VIEW_TOOL_BAR + MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Bara de stare", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Resetare\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Ajutor" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Despre IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Despre &OS...", ID_ABOUT_WINDOWS + END +END + +#endif // Neutral (Default) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// 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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/subsys/system/ibrowser/Sv.rc --- trunk/reactos/subsys/system/ibrowser/Sv.rc 2005-12-28 22:52:35 UTC (rev 20408) +++ trunk/reactos/subsys/system/ibrowser/Sv.rc 2005-12-28 23:51:32 UTC (rev 20409) @@ -0,0 +1,140 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#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 + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// Swedish resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) +#ifdef _WIN32 +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + [truncated at 1000 lines; 587 more skipped]

18 years, 8 months

[mf] 20408: commit patch of bugzilla entry 1073 to to compile Explorer in a Wine environment

by mf＠svn.reactos.com

commit patch of bugzilla entry 1073 to to compile Explorer in a Wine environment Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine --- trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-12-28 22:46:09 UTC (rev 20407) +++ trunk/reactos/subsys/system/explorer/Makefile.Wine 2005-12-28 22:52:35 UTC (rev 20408) @@ -5,7 +5,7 @@ MODULE = explorer.exe APPMODE = gui IMPORTS = shell32 comctl32 msimg32 ole32 user32 gdi32 kernel32 advapi32 oleaut32 -EXTRADEFS = -D__WINE__ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -D__MINGW32__ +EXTRADEFS = -D__WINE__ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -D__MINGW32__ -DCINTERFACE EXTRA_OBJS = notifyhook.dll libexpat.dll EXTRALIBS = $(LIBUUID) _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h --- trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-12-28 22:46:09 UTC (rev 20407) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-12-28 22:52:35 UTC (rev 20408) @@ -843,7 +843,7 @@ }; -#ifdef __WINE__ // Wine doesn't know of unnamed union members and uses some macros instead. +#if defined(__WINE__) && defined(NONAMELESSUNION) // Wine doesn't know of unnamed union members and uses some macros instead. #define UNION_MEMBER(x) DUMMYUNIONNAME.##x #else #define UNION_MEMBER(x) x @@ -1160,5 +1160,6 @@ CtxMenuInterfaces _cm_ifs; }; + extern HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* ppidl, int x, int y, CtxMenuInterfaces& cm_ifs);

18 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005