Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[jimtabor] 37099: Implement GetFontUnicodeRanges, port from wine. Tested with wine gdi32 font crosstests.
by jimtabor＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: jimtabor Date: Thu Oct 30 08:33:08 2008 New Revision: 37099 URL: http://svn.reactos.org/svn/reactos?rev=37099&view=rev Log: Implement GetFontUnicodeRanges, port from wine. Tested with wine gdi32 font crosstests. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Thu Oct 30 08:33:08 2008 @@ -92,6 +92,7 @@ BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); DWORD FASTCALL ftGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); +DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Thu Oct 30 08:33:08 2008 @@ -60,6 +60,81 @@ ExFreePool(SafeFileName.Buffer); return Ret; +} + + /* + * @implemented + */ +DWORD +APIENTRY +NtGdiGetFontUnicodeRanges( + IN HDC hdc, + OUT OPTIONAL LPGLYPHSET pgs) +{ + PDC pDc; + PDC_ATTR Dc_Attr; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + DWORD Size = 0; + PGLYPHSET pgsSafe; + NTSTATUS Status = STATUS_SUCCESS; + + pDc = DC_LockDc(hdc); + if (!pDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + Dc_Attr = pDc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr; + + hFont = Dc_Attr->hlfntNew; + TextObj = TEXTOBJ_LockText(hFont); + + if ( TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto Exit; + } + FontGdi = ObjToGDI(TextObj->Font, FONT); + + + Size = ftGetFontUnicodeRanges( FontGdi, NULL); + if (Size && pgs) + { + pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!pgsSafe) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + Size = 0; + goto Exit; + } + + Size = ftGetFontUnicodeRanges( FontGdi, pgsSafe); + + if (Size) + { + _SEH_TRY + { + ProbeForWrite(pgsSafe, Size, 1); + RtlCopyMemory(pgs, pgsSafe, Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) Size = 0; + } + ExFreePoolWithTag(pgsSafe, TAG_GDITEXT); + } +Exit: + TEXTOBJ_UnlockText(TextObj); + DC_UnlockDc(pDc); + return Size; } ULONG Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Oct 30 08:33:08 2008 @@ -3371,6 +3371,74 @@ return Ret; } + +DWORD +FASTCALL +ftGetFontUnicodeRanges(PFONTGDI Font, PGLYPHSET glyphset) +{ + DWORD size = 0; + DWORD num_ranges = 0; + FT_Face face = Font->face; + + if (face->charmap->encoding == FT_ENCODING_UNICODE) + { + FT_UInt glyph_code = 0; + FT_ULong char_code, char_code_prev; + + char_code_prev = char_code = FT_Get_First_Char(face, &glyph_code); + + DPRINT("face encoding FT_ENCODING_UNICODE, number of glyphs %ld, first glyph %u, first char %04lx\n", + face->num_glyphs, glyph_code, char_code); + + if (!glyph_code) return 0; + + if (glyphset) + { + glyphset->ranges[0].wcLow = (USHORT)char_code; + glyphset->ranges[0].cGlyphs = 0; + glyphset->cGlyphsSupported = 0; + } + + num_ranges = 1; + while (glyph_code) + { + if (char_code < char_code_prev) + { + DPRINT1("expected increasing char code from FT_Get_Next_Char\n"); + return 0; + } + if (char_code - char_code_prev > 1) + { + num_ranges++; + if (glyphset) + { + glyphset->ranges[num_ranges - 1].wcLow = (USHORT)char_code; + glyphset->ranges[num_ranges - 1].cGlyphs = 1; + glyphset->cGlyphsSupported++; + } + } + else if (glyphset) + { + glyphset->ranges[num_ranges - 1].cGlyphs++; + glyphset->cGlyphsSupported++; + } + char_code_prev = char_code; + char_code = FT_Get_Next_Char(face, char_code, &glyph_code); + } + } + else + DPRINT1("encoding %u not supported\n", face->charmap->encoding); + + size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + } + return size; +} + + DWORD FASTCALL ftGetFontLanguageInfo(PDC Dc) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Thu Oct 30 08:33:08 2008 @@ -2230,19 +2230,6 @@ /* * @unimplemented */ -DWORD -APIENTRY -NtGdiGetFontUnicodeRanges( - IN HDC hdc, - OUT OPTIONAL LPGLYPHSET pgs) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ UINT APIENTRY NtGdiGetStringBitmapW(

2 1

[tkreuzer] 37101: Add explorer back to shell.rbuild. It doesn't compile atm.
by tkreuzer＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: tkreuzer Date: Thu Oct 30 09:15:58 2008 New Revision: 37101 URL: http://svn.reactos.org/svn/reactos?rev=37101&view=rev Log: Add explorer back to shell.rbuild. It doesn't compile atm. Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild Modified: branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/shell.rbuild [iso-8859-1] Thu Oct 30 09:15:58 2008 @@ -4,6 +4,9 @@ <directory name="cmd"> <xi:include href="cmd/cmd.rbuild" /> </directory> + <directory name="explorer"> + <xi:include href="explorer/explorer.rbuild" /> + </directory> <directory name="explorer-new"> <xi:include href="explorer-new/explorer.rbuild" /> </directory>

1 0

[tkreuzer] 37100: - add mising files to mingw library - readd getopt (needed by dosfsck) - reorder alphabetically
by tkreuzer＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: tkreuzer Date: Thu Oct 30 09:14:06 2008 New Revision: 37100 URL: http://svn.reactos.org/svn/reactos?rev=37100&view=rev Log: - add mising files to mingw library - readd getopt (needed by dosfsck) - reorder alphabetically Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_wgetopt.c - copied unchanged from r35808, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_wgetopt.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c - copied unchanged from r35808, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tgetopt.h - copied unchanged from r35808, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tgetopt.h Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Thu Oct 30 09:14:06 2008 @@ -4,21 +4,30 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="mingw_common">include</include> - <file>CRT_fp10.c</file> + <file>_newmode.c</file> + <file>_wgetopt.c</file> + <file>argv.c</file> <file>atonexit.c</file> + <file>binmode.c</file> <file>charmax.c</file> <file>cinitexe.c</file> + <file>CRT_fp10.c</file> + <file>crtdll.c</file> + <file>dllentry.c</file> + <file>dllmain.c</file> <file>gccmain.c</file> + <file>getopt.c</file> <file>gs_support.c</file> <file>merr.c</file> <file>mingw_helpers.c</file> <file>natstart.c</file> - <file>_newmode.c</file> <file>pesect.c</file> + <file>pseudo-reloc.c</file> + <file>tlssup.c</file> <file>wildcard.c</file> + <file>xncommod.c</file> + <file>xthdloc.c</file> <file>xtxtmode.c</file> - <file>xncommod.c</file> - <file>pseudo-reloc.c</file> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="mingw_common">include</include>

1 0

[cwittich] 37098: fix Armenian, Chinese, Hebrew, Hindi, Thai do not appear in the Input Language combo box patch by hto See issue #3818 for more details.
by cwittich＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: cwittich Date: Thu Oct 30 08:27:11 2008 New Revision: 37098 URL: http://svn.reactos.org/svn/reactos?rev=37098&view=rev Log: fix Armenian, Chinese, Hebrew, Hindi, Thai do not appear in the Input Language combo box patch by hto See issue #3818 for more details. Modified: trunk/reactos/base/setup/usetup/lang/th-TH.h trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/base/setup/usetup/lang/th-TH.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/th-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/th-TH.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/th-TH.h [iso-8859-1] Thu Oct 30 08:27:11 2008 @@ -3,8 +3,11 @@ MUI_LAYOUTS thTHLayouts[] = { + { L"041E", L"0000041E" }, + { L"041E", L"0001041E" }, + { L"041E", L"0002041E" }, + { L"041E", L"0003041E" }, { L"0409", L"00000409" }, - { L"041E", L"0000041E" }, { NULL, NULL } }; Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Oct 30 08:27:11 2008 @@ -997,6 +997,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Name",0x00000000,"Philippines" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","CountryCode",0x00010001,0x00000040 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","CountryCode",0x00010001,0x00000042 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","Name",0x00000000,"Thailand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Oct 30 08:27:11 2008 @@ -1003,6 +1003,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Name",0x00000000,"Philippines" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","CountryCode",0x00010001,0x00000040 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","CountryCode",0x00010001,0x00000042 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","Name",0x00000000,"Thailand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Thu Oct 30 08:27:11 2008 @@ -541,8 +541,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -587,7 +587,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"c" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" @@ -610,7 +610,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"b" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" @@ -622,15 +622,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"11" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"10" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Oct 30 08:27:11 2008 @@ -541,8 +541,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -587,7 +587,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"c" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" @@ -610,7 +610,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"b" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" @@ -622,15 +622,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"11" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"10" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5"

1 0

[mkupfer] 37097: replacement for the white power switch (better contrast for small resolutions)
by mkupfer＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: mkupfer Date: Thu Oct 30 08:09:58 2008 New Revision: 37097 URL: http://svn.reactos.org/svn/reactos?rev=37097&view=rev Log: replacement for the white power switch (better contrast for small resolutions) Modified: trunk/reactos/base/shell/explorer/res/shutdown.ico Modified: trunk/reactos/base/shell/explorer/res/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/sh… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 37096: add O_ACCMODE
by tkreuzer＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: tkreuzer Date: Thu Oct 30 07:55:23 2008 New Revision: 37096 URL: http://svn.reactos.org/svn/reactos?rev=37096&view=rev Log: add O_ACCMODE Modified: branches/ros-amd64-bringup/reactos/include/crt/fcntl.h Modified: branches/ros-amd64-bringup/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/fcntl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/fcntl.h [iso-8859-1] Thu Oct 30 07:55:23 2008 @@ -37,6 +37,7 @@ #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR +#define O_ACCMODE _O_ACCMODE #define O_APPEND _O_APPEND #define O_CREAT _O_CREAT #define O_TRUNC _O_TRUNC

1 0

[janderwald] 37095: - Forgot this one
by janderwald＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: janderwald Date: Thu Oct 30 07:44:25 2008 New Revision: 37095 URL: http://svn.reactos.org/svn/reactos?rev=37095&view=rev Log: - Forgot this one Modified: trunk/reactos/dll/cpl/sysdm/precomp.h Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] Thu Oct 30 07:44:25 2008 @@ -69,9 +69,9 @@ typedef struct _BOOTRECORD { DWORD BootType; - TCHAR szSectionName[128]; - TCHAR szBootPath[MAX_PATH]; - TCHAR szOptions[512]; + WCHAR szSectionName[128]; + WCHAR szBootPath[MAX_PATH]; + WCHAR szOptions[512]; }BOOTRECORD, *PBOOTRECORD;

1 0

[mkupfer] 37094: - new directory for generic graphics (available in alterable format e.g. svg) - replacement for shutdown/power off icon - additional question mark icon (allows to change to tango desktop project icon set for message box icons)
by mkupfer＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: mkupfer Date: Thu Oct 30 07:04:39 2008 New Revision: 37094 URL: http://svn.reactos.org/svn/reactos?rev=37094&view=rev Log: - new directory for generic graphics (available in alterable format e.g. svg) - replacement for shutdown/power off icon - additional question mark icon (allows to change to tango desktop project icon set for message box icons) Added: trunk/reactos/media/graphics/ trunk/reactos/media/graphics/dialog-question.svg trunk/reactos/media/graphics/system-shutdown.svg Added: trunk/reactos/media/graphics/dialog-question.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/graphics/dialog-ques… ============================================================================== --- trunk/reactos/media/graphics/dialog-question.svg (added) +++ trunk/reactos/media/graphics/dialog-question.svg [iso-8859-1] Thu Oct 30 07:04:39 2008 @@ -1,0 +1,402 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48.000000px" + height="48.000000px" + id="svg6361" + sodipodi:version="0.32" + inkscape:version="0.45.1" + sodipodi:docbase="/home/maku/projekte/reactos/reactos/media/graphics" + sodipodi:docname="dialog-question.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs3"> + <linearGradient + id="linearGradient5162"> + <stop + id="stop5164" + offset="0" + style="stop-color:#72a0cf;stop-opacity:1;" /> + <stop + id="stop5166" + offset="1" + style="stop-color:#bed2ed;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient17170"> + <stop + id="stop17172" + offset="0" + style="stop-color:#729fcf;stop-opacity:0" /> + <stop + id="stop17174" + offset="1" + style="stop-color:#3465a4;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient11333"> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="0" + id="stop11335" /> + <stop + style="stop-color:#3465a4;stop-opacity:0;" + offset="1" + id="stop11337" /> + </linearGradient> + <linearGradient + id="linearGradient9387"> + <stop + style="stop-color:#72a0cf;stop-opacity:1;" + offset="0" + id="stop9389" /> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="1" + id="stop9391" /> + </linearGradient> + <linearGradient + id="linearGradient2431"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop2433" /> + <stop + style="stop-color:#b8b8b8;stop-opacity:1;" + offset="1" + id="stop2435" /> + </linearGradient> + <linearGradient + id="linearGradient2933"> + <stop + id="stop2935" + offset="0" + style="stop-color:#9cbcde;stop-opacity:1" /> + <stop + id="stop2937" + offset="1" + style="stop-color:#204a87" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.903401,0,0,0.903401,2.335437,2.177737)" + gradientUnits="userSpaceOnUse" + y2="-6.8890476" + x2="17.444614" + y1="29.173397" + x1="34.797703" + id="linearGradient3117" + xlink:href="#linearGradient3111" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.351613,0,16.55413)" + r="9.6875" + fy="25.53125" + fx="17.3125" + cy="25.53125" + cx="17.3125" + id="radialGradient3107" + xlink:href="#linearGradient3101" + inkscape:collect="always" /> + <linearGradient + y2="31.452499" + x2="11.413211" + y1="34.807064" + x1="18.711395" + gradientTransform="matrix(2.151235,0.000000,0.000000,1.154539,-0.778091,-3.220331)" + gradientUnits="userSpaceOnUse" + id="linearGradient121" + xlink:href="#linearGradient6621" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.012297,0,0,1.079974,0.835129,-1.340661)" + y2="6.1003184" + x2="6.3578372" + y1="32.756931" + x1="11.355036" + id="linearGradient1697" + xlink:href="#linearGradient6621" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.946979,0,0,0.487322,3.734953,4.049714)" + y2="12.239423" + x2="12.849945" + y1="28.829224" + x1="22.819513" + id="linearGradient7881" + xlink:href="#linearGradient6621" + inkscape:collect="always" /> + <linearGradient + id="linearGradient6621"> + <stop + id="stop6622" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop6623" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.365022,0.732589)" + y2="8.8090458" + x2="7.5337296" + y1="21.47023" + x1="13.567193" + id="linearGradient117" + xlink:href="#linearGradient6621" + inkscape:collect="always" /> + <linearGradient + id="linearGradient118"> + <stop + id="stop119" + offset="0.0000000" + style="stop-color:#f5a108;stop-opacity:0.0000000;" /> + <stop + id="stop120" + offset="1.0000000" + style="stop-color:#fefdc3;stop-opacity:0.74251497;" /> + </linearGradient> + <linearGradient + id="linearGradient3101" + inkscape:collect="always"> + <stop + id="stop3103" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3105" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3111" + inkscape:collect="always"> + <stop + id="stop3113" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3115" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3111" + id="linearGradient26164" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.903401,0,0,0.903401,-19.809728,52.190387)" + x1="34.797703" + y1="29.173397" + x2="17.444614" + y2="-6.8890476" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6621" + id="linearGradient26167" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.012297,0,0,1.079974,-21.310036,48.671989)" + x1="11.355036" + y1="32.756931" + x2="6.3578372" + y2="6.1003184" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6621" + id="linearGradient26171" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.946979,0,0,0.487322,-18.410212,54.062364)" + x1="22.819513" + y1="28.829224" + x2="12.849945" + y2="12.239423" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3101" + id="radialGradient26175" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.351613,0,16.55413)" + cx="17.3125" + cy="25.53125" + fx="17.3125" + fy="25.53125" + r="9.6875" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3101" + id="radialGradient26179" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.351613,0,16.55413)" + cx="17.3125" + cy="25.53125" + fx="17.3125" + fy="25.53125" + r="9.6875" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient9387" + id="linearGradient11339" + x1="24.953392" + y1="40.171627" + x2="24.953392" + y2="36.164883" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5162" + id="linearGradient11343" + gradientUnits="userSpaceOnUse" + x1="24.953392" + y1="41.990429" + x2="24.953392" + y2="33.354214" + gradientTransform="matrix(1,0,0,0.5126094,0,15.149961)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient9387" + id="linearGradient17232" + gradientUnits="userSpaceOnUse" + x1="26.027708" + y1="26.78936" + x2="26.027708" + y2="15.860387" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5162" + id="linearGradient17234" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.5126094,8.0802436,-4.3908524)" + x1="24.862343" + y1="38.3965" + x2="24.862343" + y2="18.786358" /> + </defs> + <sodipodi:namedview + inkscape:guide-bbox="true" + showguides="true" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.15294118" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.5991076" + inkscape:cx="24.914345" + inkscape:cy="28.925977" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="1021" + inkscape:window-height="722" + inkscape:window-x="170" + inkscape:window-y="117" + inkscape:showpageshadow="false" + fill="#deb887" + gridcolor="#7171cd" + gridopacity="0.12156863" + gridempcolor="#7b7bc3" + gridempopacity="0.5372549" + gridempspacing="10" + stroke="#204a87" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Question mark icon</dc:title> + <dc:date>2008-10-30</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Matthias Kupfer</dc:title> + </cc:Agent> + </dc:creator> + <dc:subject> + <rdf:Bag> + <rdf:li>question mark</rdf:li> + <rdf:li>dialog</rdf:li> + <rdf:li>icon</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /> + <dc:contributor> + <cc:Agent> + <dc:title></dc:title> + </cc:Agent> + </dc:contributor> + <dc:source></dc:source> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Attribution" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <path + sodipodi:type="arc" + style="opacity:0.40909089;color:#000000;fill:url(#radialGradient26179);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path26177" + sodipodi:cx="17.3125" + sodipodi:cy="25.53125" + sodipodi:rx="9.6875" + sodipodi:ry="3.40625" + d="M 27 25.53125 A 9.6875 3.40625 0 1 1 7.625,25.53125 A 9.6875 3.40625 0 1 1 27 25.53125 z" + transform="matrix(0.9586923,0,0,1.5642847,8.2432652,2.7335115)" /> + <path + id="path6476" + d="M 20.234717,31.083815 L 20.187293,40.125024 L 29.672067,40.171628 L 29.719491,31.130419 L 20.234717,31.083815 z " + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient11339);fill-opacity:1.0;stroke:none;stroke-width:1.65403736px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans" /> + <path + id="path7447" + d="M 25.641038,2.5154597 C 21.954737,2.5621647 18.256265,3.3850789 14.828396,4.6126473 C 14.861661,7.2464444 14.76294,9.9339665 14.87582,12.535356 C 16.37995,12.090685 17.863809,10.829408 19.493015,10.37192 C 22.187204,9.4245106 25.679873,8.4723915 28.095133,10.489054 C 29.950071,12.356101 28.649507,15.236359 26.929567,16.711969 C 24.235354,19.219314 20.604007,21.476906 20.191486,25.426937 L 20.195644,27.821523 L 29.719491,27.774919 C 29.76773,26.430834 29.795021,24.886016 30.885118,23.8479 C 33.642669,20.880764 37.696712,18.587713 38.478449,14.313862 C 39.32648,10.443555 37.776396,5.9254243 33.951445,4.1790301 C 31.407026,2.8688695 28.476084,2.525901 25.641038,2.5154597 z " + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient17232);fill-opacity:1.0;stroke:none;stroke-width:1.65403736px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans;opacity:1;color:#000000;fill-rule:nonzero;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient17234);fill-opacity:1.0;stroke:none;stroke-width:1.65403736px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 25.65625 2.5 C 21.969948 2.5467049 18.271619 3.3974316 14.84375 4.625 C 14.877015 7.2587969 14.76212 9.9298605 14.875 12.53125 C 16.37913 12.086579 17.870794 10.832488 19.5 10.375 C 22.194189 9.427591 25.67849 8.4833375 28.09375 10.5 C 29.716821 12.133666 28.938301 14.528381 27.5625 16.09375 L 28.28125 16.15625 C 32.432501 13.356756 33.827133 18.335108 37.75 16.1875 L 37.875 16.1875 C 38.139498 15.606302 38.346604 14.980289 38.46875 14.3125 C 39.316779 10.442193 37.762451 5.9338942 33.9375 4.1875 C 31.393079 2.8773396 28.491296 2.5104413 25.65625 2.5 z " + id="path17190" /> + <path + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans;stroke-miterlimit:4;stroke-dasharray:none" + d="M 25.641038,2.5154597 C 21.954737,2.5621647 18.256265,3.3850789 14.828396,4.6126473 C 14.861661,7.2464444 14.76294,9.9339665 14.87582,12.535356 C 16.37995,12.090685 17.863809,10.829408 19.493015,10.37192 C 22.187204,9.4245106 25.679873,8.4723915 28.095133,10.489054 C 29.950071,12.356101 28.649507,15.236359 26.929567,16.711969 C 24.235354,19.219314 20.604007,21.476906 20.191486,25.426937 L 20.195644,27.821523 L 29.719491,27.774919 C 29.76773,26.430834 29.795021,24.886016 30.885118,23.8479 C 33.642669,20.880764 37.696712,18.587713 38.478449,14.313862 C 39.32648,10.443555 37.776396,5.9254243 33.951445,4.1790301 C 31.407026,2.8688695 28.476084,2.525901 25.641038,2.5154597 z " + id="path2241" /> + <path + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient11343);fill-opacity:1.0;stroke:none;stroke-width:1.65403736px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 20.234717,31.083815 L 20.187293,35.718423 C 24.338543,32.91893 25.7492,37.889921 29.672067,35.742313 L 29.719491,31.107705 L 20.234717,31.083815 z " + id="path11341" + sodipodi:nodetypes="ccccc" /> + <path + style="font-size:34.15322876px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans;stroke-miterlimit:4;stroke-dasharray:none" + d="M 20.234717,31.083815 L 20.187293,40.125024 L 29.672067,40.171628 L 29.719491,31.130419 L 20.234717,31.083815 z " + id="path1554" /> + </g> +</svg> Added: trunk/reactos/media/graphics/system-shutdown.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/graphics/system-shut… ============================================================================== --- trunk/reactos/media/graphics/system-shutdown.svg (added) +++ trunk/reactos/media/graphics/system-shutdown.svg [iso-8859-1] Thu Oct 30 07:04:39 2008 @@ -1,0 +1,335 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg1306" + sodipodi:version="0.32" + inkscape:version="0.45.1" + sodipodi:docbase="/home/maku/projekte/reactos/reactos/media/graphics" + sodipodi:docname="system-shutdown.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs1308"> + <linearGradient + id="linearGradient3957"> + <stop + style="stop-color:#fffeff;stop-opacity:0.33333334;" + offset="0" + id="stop3959" /> + <stop + style="stop-color:#fffeff;stop-opacity:0.21568628;" + offset="1" + id="stop3961" /> + </linearGradient> + <linearGradient + id="linearGradient2536"> + <stop + style="stop-color:#a40000;stop-opacity:1;" + offset="0" + id="stop2538" /> + <stop + style="stop-color:#ff1717;stop-opacity:1;" + offset="1" + id="stop2540" /> + </linearGradient> + <linearGradient + id="linearGradient2479"> + <stop + style="stop-color:#ffe69b;stop-opacity:1;" + offset="0" + id="stop2481" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop2483" /> + </linearGradient> + <linearGradient + id="linearGradient4126" + inkscape:collect="always"> + <stop + id="stop4128" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop4130" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4126" + id="radialGradient2169" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.500000,1.899196e-14,20.00000)" + cx="23.857143" + cy="40.000000" + fx="23.857143" + fy="40.000000" + r="17.142857" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2479" + id="linearGradient2485" + x1="43.93581" + y1="53.835983" + x2="20.064686" + y2="-8.5626707" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2536" + id="linearGradient2542" + x1="36.917976" + y1="66.288063" + x2="19.071495" + y2="5.5410109" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2536" + id="linearGradient3046" + gradientUnits="userSpaceOnUse" + x1="36.917976" + y1="66.288063" + x2="19.071495" + y2="5.5410109" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2479" + id="linearGradient3048" + gradientUnits="userSpaceOnUse" + x1="43.93581" + y1="53.835983" + x2="20.064686" + y2="-8.5626707" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2536" + id="linearGradient3064" + gradientUnits="userSpaceOnUse" + x1="36.917976" + y1="66.288063" + x2="19.071495" + y2="5.5410109" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2479" + id="linearGradient3066" + gradientUnits="userSpaceOnUse" + x1="43.93581" + y1="53.835983" + x2="20.064686" + y2="-8.5626707" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3957" + id="linearGradient3963" + x1="21.993773" + y1="33.955299" + x2="20.917078" + y2="15.814602" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4126" + id="radialGradient3976" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.5,1.893048e-14,20)" + cx="23.857143" + cy="40.000000" + fx="23.857143" + fy="40.000000" + r="17.142857" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2536" + id="linearGradient3978" + gradientUnits="userSpaceOnUse" + x1="36.917976" + y1="66.288063" + x2="19.071495" + y2="5.5410109" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2479" + id="linearGradient3980" + gradientUnits="userSpaceOnUse" + x1="43.93581" + y1="53.835983" + x2="20.064686" + y2="-8.5626707" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3957" + id="linearGradient3982" + gradientUnits="userSpaceOnUse" + x1="21.993773" + y1="33.955299" + x2="20.917078" + y2="15.814602" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.21568627" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="4.4200503" + inkscape:cx="30.940227" + inkscape:cy="23.669753" + inkscape:current-layer="layer3" + showgrid="true" + inkscape:grid-bbox="false" + inkscape:document-units="px" + inkscape:window-width="1125" + inkscape:window-height="811" + inkscape:window-x="93" + inkscape:window-y="129" + inkscape:showpageshadow="false" + fill="#ef2929" + gridempspacing="4" + inkscape:grid-points="true" /> + <metadata + id="metadata1311"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Matthias Kupfer</dc:title> + </cc:Agent> + </dc:creator> + <dc:contributor> + <cc:Agent> + <dc:title>Rodney Dawes, Jakub Steiner, Garrett LeSage</dc:title> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /> + <dc:title>Power button</dc:title> + <dc:date>2008-10-30</dc:date> + <dc:subject> + <rdf:Bag> + <rdf:li>power</rdf:li> + <rdf:li>button</rdf:li> + <rdf:li>switch</rdf:li> + <rdf:li>icon</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Attribution" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Shadow"> + <path + inkscape:r_cy="true" + inkscape:r_cx="true" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + d="M 41 40 A 17.142857 8.5714283 0 1 1 6.7142868,40 A 17.142857 8.5714283 0 1 1 41 40 z" + sodipodi:ry="8.5714283" + sodipodi:rx="17.142857" + sodipodi:cy="40" + sodipodi:cx="23.857143" + id="path6548" + style="opacity:0.6;color:#000000;fill:url(#radialGradient3976);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" + sodipodi:type="arc" /> + </g> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <g + id="g4006"> + <path + transform="matrix(0.920488,0,0,0.920488,2.368532,0.97408)" + d="M 46.857143 23.928572 A 23.357143 23.357143 0 1 1 0.1428566,23.928572 A 23.357143 23.357143 0 1 1 46.857143 23.928572 z" + sodipodi:ry="23.357143" + sodipodi:rx="23.357143" + sodipodi:cy="23.928572" + sodipodi:cx="23.5" + id="path1314" + style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:nonzero;stroke:#b20000;stroke-width:1.08638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:type="arc" + inkscape:r_cx="true" + inkscape:r_cy="true" /> + <path + transform="matrix(0.856093,0,0,0.856093,1.818275,0.197769)" + d="M 49.901535 26.635273 A 23.991123 23.991123 0 1 1 1.9192886,26.635273 A 23.991123 23.991123 0 1 1 49.901535 26.635273 z" + sodipodi:ry="23.991123" + sodipodi:rx="23.991123" + sodipodi:cy="26.635273" + sodipodi:cx="25.910412" + id="path3560" + style="opacity:0.34659089;fill:#cc0000;fill-opacity:0;stroke:url(#linearGradient3980);stroke-width:1.16809607;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:type="arc" + inkscape:r_cx="true" + inkscape:r_cy="true" /> + </g> + </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Error Box"> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:3.60102482;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5991" + sodipodi:cx="31.087576" + sodipodi:cy="50.928089" + sodipodi:rx="14.391242" + sodipodi:ry="14.391242" + d="M 23.903015,38.458529 A 14.391242,14.391242 0 1 1 23.879414,38.472157" + sodipodi:start="4.1896774" + sodipodi:end="10.470969" + sodipodi:open="true" + transform="matrix(1.110787,0,0,1.1108028,-10.531447,-33.571062)" /> + <path + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 24,15 L 24,31" + id="path8900" + sodipodi:nodetypes="cc" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Glossy Shine"> + <path + sodipodi:nodetypes="czssc" + id="path3955" + d="M 43.370686,21.715486 C 43.370686,32.546102 33.016357,15.449178 24.695948,22.101874 C 16.569626,28.599385 4.0989837,34.292422 4.0989837,23.461806 C 4.0989837,12.377753 12.79438,2.0948032 23.625,2.0948032 C 34.455619,2.0948032 43.370686,10.884868 43.370686,21.715486 z " + style="fill:url(#linearGradient3982);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" + inkscape:r_cx="true" + inkscape:r_cy="true" + transform="matrix(1.002994,0,0,1.002994,-7.185874e-2,1.968356e-2)" /> + </g> +</svg>

1 0

[dchapyshev] 37093: - Attempt to fix a bug 3255. By means of Christoph_vW. Not tested.
by dchapyshev＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: dchapyshev Date: Thu Oct 30 06:14:40 2008 New Revision: 37093 URL: http://svn.reactos.org/svn/reactos?rev=37093&view=rev Log: - Attempt to fix a bug 3255. By means of Christoph_vW. Not tested. Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Thu Oct 30 06:14:40 2008 @@ -211,7 +211,7 @@ CBBackend::CbpFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.cbp" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.cbp" ) ); } @@ -219,7 +219,7 @@ CBBackend::LayoutFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.layout" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.layout" ) ); } @@ -227,7 +227,7 @@ CBBackend::DependFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.depend" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.depend" ) ); } @@ -236,8 +236,8 @@ { string basepath = module.output->relative_path; size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + string intenv = Environment::GetIntermediatePath () + sSep + basepath + sSep; + string outenv = Environment::GetOutputPath () + sSep + basepath + sSep; vector<string> cfgs; @@ -265,7 +265,7 @@ for ( i = 0; i < files.size (); i++ ) { string file = files[i]->file.relative_path + sSep + files[i]->file.name; - string::size_type pos = file.find_last_of ("\\"); + string::size_type pos = file.find_last_of (sSep); if ( pos != string::npos ) file.erase ( 0, pos+1 ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) @@ -273,7 +273,7 @@ else file = ReplaceExtension ( file, ".obj" ); for ( size_t j = 0; j < cfgs.size () / 2; j++ ) - out.push_back ( cfgs[j] + "\\" + file ); + out.push_back ( cfgs[j] + sSep + file ); } } @@ -334,7 +334,7 @@ ifs_list.pop_back(); const vector<Library*>& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->output->relative_path.c_str(), libs[j]->name.c_str() ); + fprintf ( OUT, "\t\t\t<Depends filename=\"%s%s%s_auto.cbp\" />\r\n", libs[j]->importedModule->output->relative_path.c_str(), sSep.c_str(), libs[j]->name.c_str() ); } fprintf ( OUT, "\t\t</Project>\r\n" ); } @@ -447,7 +447,7 @@ const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = intdir + "\\" + libs[i]->importedModule->output->relative_path; + string libpath = intdir + sSep + libs[i]->importedModule->output->relative_path; libraries.push_back ( libs[i]->name ); libpaths.push_back ( libpath ); } @@ -516,18 +516,18 @@ if ( configuration.UseConfigurationInPath ) { if ( IsStaticLibrary ( module ) ||module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s%s%s%s%s%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), sSep.c_str(), module.output->relative_path.c_str (), cfg.name.c_str(), sSep.c_str(), module.name.c_str(), module_type.c_str()); else - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); - fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s%s\" />\r\n", intdir.c_str(), module.output->relative_path.c_str (), cfg.name.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s%s%s%s%s%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), sSep.c_str(), module.output->relative_path.c_str (), cfg.name.c_str(), sSep.c_str(), module.name.c_str(), module_type.c_str()); + fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s%s%s%s\" />\r\n", intdir.c_str(), sSep.c_str(), module.output->relative_path.c_str (), cfg.name.c_str() ); } else { if ( IsStaticLibrary ( module ) || module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.output->relative_path.c_str (), module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s%s%s%s%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), sSep.c_str(), module.output->relative_path.c_str (), sSep.c_str(), module.name.c_str(), module_type.c_str() ); else - fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.output->relative_path.c_str (), module.name.c_str(), module_type.c_str() ); - fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s\\%s\" />\r\n", intdir.c_str(), module.output->relative_path.c_str () ); + fprintf ( OUT, "\t\t\t\t<Option output=\"%s%s%s%s%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), sSep.c_str(), module.output->relative_path.c_str (), sSep.c_str(), module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\t<Option object_output=\"%s%s%s\" />\r\n", intdir.c_str(), sSep.c_str(), module.output->relative_path.c_str () ); } if ( lib ) @@ -674,8 +674,8 @@ { const string& resource_file = resource_files[i]; #ifdef WIN32 - fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)\\%s.rci.tmp 2>NUL\" />\r\n", resource_file.c_str() ); - fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)\\%s.res.tmp 2>NUL\" />\r\n", resource_file.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)%s%s.rci.tmp 2>NUL\" />\r\n", sSep.c_str(), resource_file.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del $(TARGET_OBJECT_DIR)%s%s.res.tmp 2>NUL\" />\r\n", sSep.c_str(), resource_file.c_str() ); #else fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.rci.tmp 2>/dev/null\" />\r\n", resource_file.c_str() ); fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.res.tmp 2>/dev/null\" />\r\n", resource_file.c_str() ); @@ -686,9 +686,9 @@ if ( dll ) { if (IsSpecDefinitionFile( module )) - fprintf ( OUT, "\t\t\t\t\t<Add before=\"%s\\tools\\winebuild\\winebuild.exe -o %s --def -E %s.spec\" />\r\n", outdir.c_str(), module.importLibrary->definition.c_str(), module.name.c_str()); + fprintf ( OUT, "\t\t\t\t\t<Add before=\"%s%stools%swinebuild%swinebuild.exe -o %s --def -E %s.spec\" />\r\n", outdir.c_str(), sSep, sSep, sSep, module.importLibrary->definition.c_str(), module.name.c_str()); fprintf ( OUT, "\t\t\t\t\t<Add before=\"dlltool --dllname %s --def %s --output-exp %s.temp.exp %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->definition.c_str(), module.name.c_str(), module.mangledSymbols ? "" : "--kill-at" ); - fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s\\tools\\pefixup $exe_output -exports\" />\r\n", outdir.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s%stools%spefixup $exe_output -exports\" />\r\n", outdir.c_str(), sSep, sSep ); #ifdef WIN32 fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del %s.temp.exp 2>NUL\" />\r\n", module.name.c_str() ); #else @@ -764,13 +764,13 @@ else if ( extension == ".idl" || extension == ".IDL" ) { fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file\\ngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%stools%swidl%swidl.exe %s %s -h -H "$(TARGET_OUTPUT_DIR)$filetitle_c.h" -c -C "$(TARGET_OUTPUT_DIR)$filetitle_c.c" $file%sngcc %s -c "$(TARGET_OUTPUT_DIR)$filetitle_c.c" -o "$(TARGET_OUTPUT_DIR)$file_c.o"\" />\r\n", outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), widl_options.c_str(), windres_defines.c_str(), sSep.c_str(), widl_options.c_str() ); } else if ( extension == ".spec" || extension == ".SPEC" ) { fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" ); fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s\\tools\\winebuild\\winebuild.exe -o $file.stubs.c --pedll $file\\n$compiler -c $options $includes $file.stubs.c -o $(TARGET_OBJECT_DIR)\\$file.o\" />\r\n", outdir.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"%s%stools%swinebuild%swinebuild.exe -o $file.stubs.c --pedll $file\\n$compiler -c $options $includes $file.stubs.c -o $(TARGET_OBJECT_DIR)%s$file.o\" />\r\n", outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str() ); } for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) @@ -788,7 +788,7 @@ fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n", resource_file.c_str() ); fprintf ( OUT, "\t\t\t<Option compilerVar=\"WINDRES\" />\r\n" ); string extension = GetExtension ( resource_file ); - fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o $(TARGET_OBJECT_DIR)\\$file.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s $(TARGET_OBJECT_DIR)\\$file.rci.tmp $(TARGET_OBJECT_DIR)\\$file.res.tmp\\n$rescomp --output-format=coff $(TARGET_OBJECT_DIR)\\$file.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), outdir.c_str(), windres_defines.c_str() ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o $(TARGET_OBJECT_DIR)%s$file.rci.tmp\\n%s%stools%swrc%swrc.exe $includes %s $(TARGET_OBJECT_DIR)%s$file.rci.tmp $(TARGET_OBJECT_DIR)%s$file.res.tmp\\n$rescomp --output-format=coff $(TARGET_OBJECT_DIR)%s$file.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), sSep.c_str(), outdir.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str(), windres_defines.c_str(), sSep.c_str(), sSep.c_str(), sSep.c_str() ); for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const CBConfiguration& cfg = *m_configurations[icfg];

1 0

[jimtabor] 37092: - Update Gdi GetFontLanguageInfo.
by jimtabor＠svn.reactos.org 30 Oct '08

30 Oct '08

Author: jimtabor Date: Thu Oct 30 05:48:49 2008 New Revision: 37092 URL: http://svn.reactos.org/svn/reactos?rev=37092&view=rev Log: - Update Gdi GetFontLanguageInfo. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Thu Oct 30 05:48:49 2008 @@ -166,21 +166,6 @@ HMETAFILE a0, UINT a1, LPVOID a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD -STDCALL -GetFontLanguageInfo( - HDC hDc ) { UNIMPLEMENTED; 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Thu Oct 30 05:48:49 2008 @@ -909,6 +909,18 @@ */ DWORD STDCALL +GetFontLanguageInfo( + HDC hDc + ) +{ + return GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); +} + +/* + * @implemented + */ +DWORD +STDCALL GetGlyphIndicesA( HDC hdc, LPCSTR lpstr,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008