Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 28150: Dc.c : - Update Get/SetDCBrush/PenColor code. * Added dcattr sync flags to Set functions. * if'ed out, does compile. Painting.c : - Update LP to DP to LP code. * Added update flags for Xforms, the best way I understand them. * if'ed out. - Moved Fixme line down and above GetDCObject.
by jimtabor＠svn.reactos.org 04 Aug '07

04 Aug '07

Author: jimtabor Date: Sat Aug 4 11:37:27 2007 New Revision: 28150 URL: http://svn.reactos.org/svn/reactos?rev=28150&view=rev Log: Dc.c : - Update Get/SetDCBrush/PenColor code. * Added dcattr sync flags to Set functions. * if'ed out, does compile. Painting.c : - Update LP to DP to LP code. * Added update flags for Xforms, the best way I understand them. * if'ed out. - Moved Fixme line down and above GetDCObject. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Aug 4 11:37:27 2007 @@ -544,6 +544,12 @@ HDC hdc ) { +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; + return (COLORREF) Dc_Attr->ulPenClr; +#endif return NtUserGetDCBrushColor(hdc); } @@ -556,6 +562,12 @@ HDC hdc ) { +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; + return (COLORREF) Dc_Attr->ulPenClr; +#endif return NtUserGetDCPenColor(hdc); } @@ -569,6 +581,24 @@ COLORREF crColor ) { +#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; + else + { + OldColor = (COLORREF) Dc_Attr->ulBrushClr; + Dc_Attr->ulBrushClr = (ULONG) crColor; + + if ( Dc_Attr->crBrushClr != crColor ) // if same, don't force a copy. + { + Dc_Attr->ulDirty_ |= DIRTY_FILL; + Dc_Attr->crBrushClr = crColor; + } + } + return OldColor; +#endif return NtUserSetDCBrushColor(hdc, crColor); } @@ -582,6 +612,24 @@ COLORREF crColor ) { +#if 0 + PDC_ATTR Dc_Attr; + COLORREF OldColor = CLR_INVALID; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; + else + { + OldColor = (COLORREF) Dc_Attr->ulPenClr; + Dc_Attr->ulPenClr = (ULONG) crColor; + + if ( Dc_Attr->crPenClr != crColor ) + { + Dc_Attr->ulDirty_ |= DIRTY_LINE; + Dc_Attr->crPenClr = crColor; + } + } + return OldColor; +#endif return NtUserSetDCPenColor(hdc, crColor); } Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Sat Aug 4 11:37:27 2007 @@ -18,7 +18,6 @@ __asm fistp out #endif -#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ LONG FASTCALL EFtoF( EFLOAT_S * efp) @@ -93,14 +92,26 @@ STDCALL DPtoLP ( HDC hDC, LPPOINT Points, INT Count ) { +#if 0 INT i; PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); + if (Dc_Attr->flXform & ( DEVICE_TO_WORLD_INVALID | // Force a full recalibration! + PAGE_XLATE_CHANGED | // Changes or Updates have been made, + PAGE_EXTENTS_CHANGED | // do processing in kernel space. + WORLD_XFORM_CHANGED ) +#endif + return NtGdiTransformPoints( hDC, Points, Points, Count, 0); // Last is 0 or 2 +#if 0 + else + { + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); + } return TRUE; +#endif } @@ -108,16 +119,28 @@ STDCALL LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) { +#if 0 INT i; PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); + if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates + PAGE_EXTENTS_CHANGED | + WORLD_XFORM_CHANGED ) +#endif + return NtGdiTransformPoints( hDC, Points, Points, Count, 0); +#if 0 + else + { + for ( i = 0; i < Count; i++ ) + CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); + } return TRUE; -} - +#endif +} + +#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ // Will move to dc.c HGDIOBJ Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Aug 4 11:37:27 2007 @@ -2753,6 +2753,10 @@ BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); HCURSOR WINAPI GetCursor(void); BOOL WINAPI GetDCOrgEx(HDC,LPPOINT); +#if (_WIN32_WINNT >= 0x0500) +COLORREF WINAPI GetDCBrushColor(HDC); +COLORREF WINAPI GetDCPenColor(HDC); +#endif int WINAPI GetDeviceCaps(HDC,int); BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID); UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);

1 0

[tkreuzer] 28149: fix some names
by tkreuzer＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: tkreuzer Date: Sat Aug 4 02:31:55 2007 New Revision: 28149 URL: http://svn.reactos.org/svn/reactos?rev=28149&view=rev Log: fix some names Modified: trunk/rostests/apitests/w32knapi/xp-2600.c Modified: trunk/rostests/apitests/w32knapi/xp-2600.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/xp-2600… ============================================================================== --- trunk/rostests/apitests/w32knapi/xp-2600.c (original) +++ trunk/rostests/apitests/w32knapi/xp-2600.c Sat Aug 4 02:31:55 2007 @@ -13,7 +13,7 @@ {L"NtGdiAlphaBlend", 0x1007,12}, {L"NtGdiAngleArc", 0x1008,6}, {L"NtGdiAnyLinkedFonts", 0x1009,0}, - {L"GreFontIsLinked", 0x100A,1}, + {L"NtGdiFontIsLinked", 0x100A,1}, {L"NtGdiArcInternal", 0x100B,10}, {L"NtGdiBeginPath", 0x100C,1}, {L"NtGdiBitBlt", 0x100D,11}, @@ -123,7 +123,7 @@ {L"NtGdiDvpReleaseNotification", 0x1075,2}, {L"NtGdiDxgGenericThunk", 0x1076,6}, {L"NtGdiDeleteClientObj", 0x1077,1}, - {L"bDeleteColorSpace", 0x1078,1}, + {L"NtGdiDeleteColorSpace", 0x1078,1}, {L"NtGdiDeleteColorTransform", 0x1079,2}, {L"NtGdiDeleteObjectApp", 0x107A,1}, {L"NtGdiDescribePixelFormat", 0x107B,4}, @@ -132,7 +132,7 @@ {L"NtGdiDoPalette", 0x107E,6}, {L"NtGdiDrawEscape", 0x107F,4}, {L"NtGdiEllipse", 0x1080,5}, - {L"GreEnableEUDC", 0x1081,1}, + {L"NtGdiEnableEUDC", 0x1081,1}, {L"NtGdiEndDoc", 0x1082,1}, {L"NtGdiEndPage", 0x1083,1}, {L"NtGdiEndPath", 0x1084,1}, @@ -215,7 +215,7 @@ {L"NtGdiGetUFI", 0x10D1,6}, {L"NtGdiGetEmbUFI", 0x10D2,7}, {L"NtGdiGetUFIPathname", 0x10D3,10}, - {L"GreGetEmbedFonts", 0x10D4,0}, + {L"NtGdiGetEmbedFonts", 0x10D4,0}, {L"NtGdiChangeGhostFont", 0x10D5,2}, {L"NtGdiAddEmbFontToDC", 0x10D6,2}, {L"NtGdiGetFontUnicodeRanges", 0x10D7,2}, @@ -261,7 +261,6 @@ {L"NtGdiScaleViewportExtEx", 0x10FF,6}, {L"NtGdiScaleWindowExtEx", 0x1100,6}, {L"NtGdiSelectBitmap", 0x1101,2}, - {L"GreSelectBitmap", 0x1101,2}, {L"NtGdiSelectBrush", 0x1102,2}, {L"NtGdiSelectClipPath", 0x1103,2}, {L"NtGdiSelectFont", 0x1104,2},

1 0

[cfinck] 28148: - Define one LANGUAGE, SUBLANG pair per resource file and not per resource. This makes it easier for translators and also fixes a mix-up of languages. - Move the brazilian translations from pt-PT.rc to a new pt-BR.rc file. - Remove the "#ifdef LANG_WALON" statement from wa-WA.rc and disable this resource file in rsrc.rc instead like it's done for eo-EO.rc. These are WINE-specific LANG defines. We also have them in include/reactos/wine/winnt.h, but this file is not included. It ha
by cfinck＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: cfinck Date: Sat Aug 4 01:36:53 2007 New Revision: 28148 URL: http://svn.reactos.org/svn/reactos?rev=28148&view=rev Log: - Define one LANGUAGE, SUBLANG pair per resource file and not per resource. This makes it easier for translators and also fixes a mix-up of languages. - Move the brazilian translations from pt-PT.rc to a new pt-BR.rc file. - Remove the "#ifdef LANG_WALON" statement from wa-WA.rc and disable this resource file in rsrc.rc instead like it's done for eo-EO.rc. These are WINE-specific LANG defines. We also have them in include/reactos/wine/winnt.h, but this file is not included. It has to be decided later how to handle these languages. See issue #2523 for more details. Added: trunk/reactos/base/applications/winhelp/lang/pt-BR.rc Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc trunk/reactos/base/applications/winhelp/lang/da-DK.rc trunk/reactos/base/applications/winhelp/lang/de-DE.rc trunk/reactos/base/applications/winhelp/lang/en-US.rc trunk/reactos/base/applications/winhelp/lang/eo-EO.rc trunk/reactos/base/applications/winhelp/lang/es-ES.rc trunk/reactos/base/applications/winhelp/lang/fi-FI.rc trunk/reactos/base/applications/winhelp/lang/hu-HU.rc trunk/reactos/base/applications/winhelp/lang/it-IT.rc trunk/reactos/base/applications/winhelp/lang/ko-KO.rc trunk/reactos/base/applications/winhelp/lang/nb-NO.rc trunk/reactos/base/applications/winhelp/lang/nl-NL.rc trunk/reactos/base/applications/winhelp/lang/pl-PL.rc trunk/reactos/base/applications/winhelp/lang/pt-PT.rc trunk/reactos/base/applications/winhelp/lang/ru-RU.rc trunk/reactos/base/applications/winhelp/lang/sk-SK.rc trunk/reactos/base/applications/winhelp/lang/sl-SI.rc trunk/reactos/base/applications/winhelp/lang/sv-SE.rc trunk/reactos/base/applications/winhelp/lang/tr-TR.rc trunk/reactos/base/applications/winhelp/lang/wa-WA.rc trunk/reactos/base/applications/winhelp/lang/zh-CN.rc trunk/reactos/base/applications/winhelp/rsrc.rc Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/bg-BG.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Ôàéë" { MENUITEM "&Îòâàðÿíå", MNID_FILE_OPEN @@ -51,6 +53,7 @@ } /* Strings */ + STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ïîìîù" Modified: trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc Sat Aug 4 01:36:53 2007 @@ -23,9 +23,11 @@ /* Czech strings in CP1250 */ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Soubor" { MENUITEM "&Otevøít", MNID_FILE_OPEN @@ -55,7 +57,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Nápovìda WINE" STID_WHERROR, "CHYBA" Modified: trunk/reactos/base/applications/winhelp/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/da-DK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/da-DK.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Filer" { MENUITEM "Å&bn...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hjælp" STID_WHERROR, "FEJL" Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/de-DE.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Datei" { MENUITEM "Ö&ffnen...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hilfe" STID_WHERROR, "FEHLER" Modified: trunk/reactos/base/applications/winhelp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/en-US.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/en-US.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Open", MNID_FILE_OPEN @@ -51,7 +53,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Help" STID_WHERROR, "ERROR" Modified: trunk/reactos/base/applications/winhelp/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/eo-EO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/eo-EO.rc Sat Aug 4 01:36:53 2007 @@ -21,9 +21,11 @@ /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */ +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Dosiero" { MENUITEM "&Malfermu", MNID_FILE_OPEN @@ -53,7 +55,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Helpanto" STID_WHERROR, "ERARO" Modified: trunk/reactos/base/applications/winhelp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/es-ES.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Archivo" { MENUITEM "A&brir...", MNID_FILE_OPEN @@ -52,7 +54,8 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ayuda de WINE" STID_WHERROR, "ERROR" Modified: trunk/reactos/base/applications/winhelp/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/fi-FI.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/fi-FI.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Tiedosto" { MENUITEM "&Avaa...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Ohje" STID_WHERROR, "VIRHE" Modified: trunk/reactos/base/applications/winhelp/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/hu-HU.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Fájl" { MENUITEM "&Megnyitás...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE súgó" STID_WHERROR, "HIBA" Modified: trunk/reactos/base/applications/winhelp/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/it-IT.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&File" { MENUITEM "&Apri...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Guida di WINE" STID_WHERROR, "ERRORE" Modified: trunk/reactos/base/applications/winhelp/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/ko-KO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/ko-KO.rc Sat Aug 4 01:36:53 2007 @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "ÆÄÀÏ(&F)" { MENUITEM "¿±â(&O)...", MNID_FILE_OPEN @@ -52,7 +54,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Wine µµ¿ò¸»" STID_WHERROR, "¿À·ù" Modified: trunk/reactos/base/applications/winhelp/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/nb-NO.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Fil" { MENUITEM "&Åpne", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Hjelp" STID_WHERROR, "FEIL" Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/nl-NL.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Bestand" { MENUITEM "&Openen", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Help" STID_WHERROR, "FOUT" Modified: trunk/reactos/base/applications/winhelp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/pl-PL.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Plik" { MENUITEM "&Otwórz", MNID_FILE_OPEN @@ -52,7 +54,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE - Pomoc" STID_WHERROR, "B£¥D" Added: trunk/reactos/base/applications/winhelp/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/winhelp/lang/pt-BR.rc Sat Aug 4 01:36:53 2007 @@ -1,0 +1,77 @@ +/* + * Help Viewer + * Portuguese Language Support + * + * Copyright 1996 Ulrich Schmid + * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2003 Marcelo Duarte + * Copyright 2004 Américo José Melo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Menu */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +MAIN_MENU MENU +{ + POPUP "&Arquivo" { + MENUITEM "&Abrir...", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Imprimir", MNID_FILE_PRINT + MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "Sai&r", MNID_FILE_EXIT + } + POPUP "&Editar" { + MENUITEM "&Copiar...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE + } + POPUP "In&dicador" { + MENUITEM "&Definir...", MNID_BKMK_DEFINE + } + POPUP "Aj&uda" { + MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Informações...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Sobre WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ + +STRINGTABLE DISCARDABLE +{ +STID_WINE_HELP, "Ajuda WINE" +STID_WHERROR, "ERRO" +STID_WARNING, "AVISO" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" +STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" +STID_CONTENTS, "&Conteúdo" +STID_SEARCH, "&Procurar" +STID_BACK, "&Voltar" +STID_HISTORY, "&Histórico" +STID_TOPICS, "&Tópicos" +STID_ALL_FILES, "Todos os arquivos (*.*)" +STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +} Modified: trunk/reactos/base/applications/winhelp/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/pt-PT.rc Sat Aug 4 01:36:53 2007 @@ -24,37 +24,6 @@ */ /* Menu */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -MAIN_MENU MENU -{ - POPUP "&Arquivo" { - MENUITEM "&Abrir...", MNID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "&Imprimir", MNID_FILE_PRINT - MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP - MENUITEM SEPARATOR - MENUITEM "Sai&r", MNID_FILE_EXIT - } - POPUP "&Editar" { - MENUITEM "&Copiar...", MNID_EDIT_COPYDLG - MENUITEM SEPARATOR - MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE - } - POPUP "In&dicador" { - MENUITEM "&Definir...", MNID_BKMK_DEFINE - } - POPUP "Aj&uda" { - MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &visível", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Informações...", MNID_HELP_ABOUT -#ifdef WINELIB - MENUITEM "&Sobre WINE", MNID_HELP_WINE -#endif - } -} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -89,28 +58,6 @@ /* Strings */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE DISCARDABLE -{ -STID_WINE_HELP, "Ajuda WINE" -STID_WHERROR, "ERRO" -STID_WARNING, "AVISO" -STID_INFO, "Informação" -STID_NOT_IMPLEMENTED, "Não implementado" -STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_CONTENTS, "&Conteúdo" -STID_SEARCH, "&Procurar" -STID_BACK, "&Voltar" -STID_HISTORY, "&Histórico" -STID_TOPICS, "&Tópicos" -STID_ALL_FILES, "Todos os arquivos (*.*)" -STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ajuda WINE" Modified: trunk/reactos/base/applications/winhelp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/ru-RU.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Ôàéë" { MENUITEM "&Îòêðûòü", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Ñïðàâêà WINE" STID_WHERROR, "ÎØÈÁÊÀ" Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sk-SK.rc Sat Aug 4 01:36:53 2007 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +MAIN_MENU MENU { POPUP "&Súbor" { MENUITEM "&Otvori...", MNID_FILE_OPEN @@ -47,7 +49,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Pomoc" STID_WHERROR, "CHYBA" Modified: trunk/reactos/base/applications/winhelp/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sl-SI.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sl-SI.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Datoteka" { MENUITEM "&Odpri ...", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Pomoè" STID_WHERROR, "NAPAKA" Modified: trunk/reactos/base/applications/winhelp/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sv-SE.rc Sat Aug 4 01:36:53 2007 @@ -20,9 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Arkiv" { MENUITEM "&Öppna...", MNID_FILE_OPEN @@ -53,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Hjälp" STID_WHERROR, "FEL" Modified: trunk/reactos/base/applications/winhelp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/tr-TR.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/tr-TR.rc Sat Aug 4 01:36:53 2007 @@ -18,9 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Dosya" { MENUITEM "&Aç", MNID_FILE_OPEN @@ -50,7 +52,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE Yardým" STID_WHERROR, "HATA" Modified: trunk/reactos/base/applications/winhelp/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/wa-WA.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/wa-WA.rc Sat Aug 4 01:36:53 2007 @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef LANG_WALON +LANGUAGE LANG_WALON, SUBLANG_DEFAULT /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Fitchî" { MENUITEM "&Drovî...", MNID_FILE_OPEN @@ -55,7 +55,7 @@ /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Aidance di WINE" STID_WHERROR, "AROKE" @@ -72,5 +72,3 @@ STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" } - -#endif /* LANG_WALON */ Modified: trunk/reactos/base/applications/winhelp/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/zh-CN.rc Sat Aug 4 01:36:53 2007 @@ -21,7 +21,9 @@ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +MAIN_MENU MENU { POPUP "ÎÄ¼þ£¨&F£©" { MENUITEM "´ò¿ª£¨&O£©", MNID_FILE_OPEN @@ -51,7 +53,7 @@ } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE °ïÖú" STID_WHERROR, "´íÎó" Modified: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/rsrc.rc (original) +++ trunk/reactos/base/applications/winhelp/rsrc.rc Sat Aug 4 01:36:53 2007 @@ -38,11 +38,12 @@ #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc" -#include "lang/wa-WA.rc" +//#include "lang/wa-WA.rc" #include "lang/zh-CN.rc"

1 0

[greatlrd] 28147: add ignore *.vcproj and *.user file
by greatlrd＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: greatlrd Date: Fri Aug 3 23:06:43 2007 New Revision: 28147 URL: http://svn.reactos.org/svn/reactos?rev=28147&view=rev Log: add ignore *.vcproj and *.user file Modified: trunk/reactos/dll/3rdparty/freetype/ (props changed) trunk/reactos/dll/3rdparty/freetype/devel/ (props changed) trunk/reactos/dll/3rdparty/freetype/i386/ (props changed) trunk/reactos/dll/3rdparty/freetype/include/ (props changed) trunk/reactos/dll/3rdparty/freetype/include/freetype/ (props changed) trunk/reactos/dll/3rdparty/freetype/include/freetype/config/ (props changed) trunk/reactos/dll/3rdparty/freetype/include/freetype/internal/ (props changed) trunk/reactos/dll/3rdparty/freetype/include/freetype/internal/services/ (props changed) trunk/reactos/dll/3rdparty/freetype/objs/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/autofit/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/base/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/bdf/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/cache/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/cff/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/cid/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/gxvalid/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/gzip/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/lzw/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/otvalid/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/pcf/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/pfr/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/psaux/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/pshinter/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/psnames/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/raster/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/sfnt/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/smooth/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/tools/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/tools/docmaker/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/tools/ftrandom/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/truetype/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/type1/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/type42/ (props changed) trunk/reactos/dll/3rdparty/freetype/src/winfonts/ (props changed) Propchange: trunk/reactos/dll/3rdparty/freetype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/devel/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/i386/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,2 +1,2 @@ -.*.d -*.o +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/include/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/include/freetype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/include/freetype/config/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/include/freetype/internal/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/include/freetype/internal/services/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/objs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/autofit/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/base/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/bdf/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/cache/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/cff/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/cid/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/gxvalid/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/gzip/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/lzw/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/otvalid/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/pcf/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/pfr/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/psaux/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/pshinter/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/psnames/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/raster/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/sfnt/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/smooth/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/tools/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/tools/docmaker/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/tools/ftrandom/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/truetype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/type1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/type42/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user Propchange: trunk/reactos/dll/3rdparty/freetype/src/winfonts/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 3 23:06:43 2007 @@ -1,0 +1,2 @@ +*.vcproj +*.user

1 0

[ekohl] 28146: Enable "Deck" menu item.
by ekohl＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: ekohl Date: Fri Aug 3 22:04:34 2007 New Revision: 28146 URL: http://svn.reactos.org/svn/reactos?rev=28146&view=rev Log: Enable "Deck" menu item. Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Ðàçäàâàíå\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Òåñòå...", IDM_GAME_DECK, GRAYED + MENUITEM "&Òåñòå...", IDM_GAME_DECK MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Èç&õîä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Karten geben\t F2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Deckblatt...", IDM_GAME_DECK, GRAYED + MENUITEM "&Deckblatt...", IDM_GAME_DECK MENUITEM "&Optionen...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED + MENUITEM "De&ck...", IDM_GAME_DECK MENUITEM "&ÅðéëïãÝò...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "¸&îïäïò", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Barajar...", IDM_GAME_DECK, GRAYED + MENUITEM "&Barajar...", IDM_GAME_DECK MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Salir", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Donne\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Jeux...", IDM_GAME_DECK, GRAYED + MENUITEM "&Jeux...", IDM_GAME_DECK MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Fri Aug 3 22:04:34 2007 @@ -62,7 +62,7 @@ BEGIN MENUITEM "&Giliran\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Dek...", IDM_GAME_DECK, GRAYED + MENUITEM "&Dek...", IDM_GAME_DECK MENUITEM "&Opsi...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Keluar", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Fri Aug 3 22:04:34 2007 @@ -62,7 +62,7 @@ BEGIN MENUITEM "&Dai carte\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Maz&zo...", IDM_GAME_DECK, GRAYED + MENUITEM "Maz&zo...", IDM_GAME_DECK MENUITEM "O&pzioni...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Esci", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Fri Aug 3 22:04:34 2007 @@ -62,7 +62,7 @@ BEGIN MENUITEM "&Del ut\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Kort&stokk...", IDM_GAME_DECK, GRAYED + MENUITEM "Kort&stokk...", IDM_GAME_DECK MENUITEM "&Valg...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Fri Aug 3 22:04:34 2007 @@ -60,7 +60,7 @@ BEGIN MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Talia...", IDM_GAME_DECK, GRAYED + MENUITEM "&Talia...", IDM_GAME_DECK MENUITEM "&Opcje...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Zakoñcz", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Fri Aug 3 22:04:34 2007 @@ -56,7 +56,7 @@ BEGIN MENUITEM "Í&îâàÿ èãðà\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK, GRAYED + MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Âûõîä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Aug 3 22:04:34 2007 @@ -63,7 +63,7 @@ BEGIN MENUITEM "&Rozda\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK, GRAYED + MENUITEM "&Balíèek...", IDM_GAME_DECK MENUITEM "&Monosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Sk&onèi", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Fri Aug 3 22:04:34 2007 @@ -62,7 +62,7 @@ BEGIN MENUITEM "á&¨¡ä¾è\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK, GRAYED + MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK MENUITEM "&µÑÇàÅ×Í¡...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&ÍÍ¡", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Fri Aug 3 22:04:34 2007 @@ -61,7 +61,7 @@ BEGIN MENUITEM "&Ðîçäàòè êàðòè\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Êîëîäà...", IDM_GAME_DECK, GRAYED + MENUITEM "&Êîëîäà...", IDM_GAME_DECK MENUITEM "&Ïàðàìåòðè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Â&èõ³ä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Fri Aug 3 22:04:34 2007 @@ -62,7 +62,7 @@ BEGIN MENUITEM "·¢ÅÆ(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK, GRAYED + MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK MENUITEM "Ñ¡Ïî(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "ÍË³ö(&X)", IDM_GAME_EXIT

1 0

[gedmurphy] 28145: build sol as unicode
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 22:01:04 2007 New Revision: 28145 URL: http://svn.reactos.org/svn/reactos?rev=28145&view=rev Log: build sol as unicode Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp Fri Aug 3 22:01:04 2007 @@ -88,11 +88,11 @@ //If Windows NT/2000/XP if(GetVersion() < 0x80000000) { - hCardDll = LoadLibrary("cards.dll"); + hCardDll = LoadLibrary(TEXT("cards.dll")); if(hCardDll == 0) { - MessageBox(0, "Error loading cards.dll (32bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + MessageBox(0, TEXT("Error loading cards.dll (32bit)"), TEXT("Shed"), MB_OK | MB_ICONEXCLAMATION); PostQuitMessage(0); return; } Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp Fri Aug 3 22:01:04 2007 @@ -117,6 +117,6 @@ void PaintRect(HDC hdc, RECT *rect, COLORREF colour) { COLORREF oldcr = SetBkColor(hdc, colour); - ExtTextOut(hdc, 0, 0, ETO_OPAQUE, rect, "", 0, 0); + ExtTextOut(hdc, 0, 0, ETO_OPAQUE, rect, TEXT(""), 0, 0); SetBkColor(hdc, oldcr); } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Aug 3 22:01:04 2007 @@ -119,7 +119,7 @@ // // Main entry point // -int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdShow) +int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCmdShow) { HWND hwnd; MSG msg; @@ -421,7 +421,7 @@ switch(iMsg) { case WM_CREATE: - hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, "Ready", hwnd, 0); + hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0); //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Fri Aug 3 22:01:04 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="yes" stdlib="host"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="yes" allowwarnings="yes" stdlib="host"> <include base="sol">.</include> <include base="sol">cardlib</include> <linkerflag>-lstdc++</linkerflag>

1 0

[gedmurphy] 28144: don't rename the executable for make install. This should keep w3seek happy for a while :)
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 21:48:24 2007 New Revision: 28144 URL: http://svn.reactos.org/svn/reactos?rev=28144&view=rev Log: don't rename the executable for make install. This should keep w3seek happy for a while :) Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Fri Aug 3 21:48:24 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" unicode="no" allowwarnings="yes" stdlib="host"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="yes" stdlib="host"> <include base="sol">.</include> <include base="sol">cardlib</include> <linkerflag>-lstdc++</linkerflag>

1 0

[gedmurphy] 28143: don't link to a non existent lib
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 21:34:55 2007 New Revision: 28143 URL: http://svn.reactos.org/svn/reactos?rev=28143&view=rev Log: don't link to a non existent lib Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Aug 3 21:34:55 2007 @@ -415,7 +415,6 @@ static int nWidth, nHeight; int nStatusHeight = 0;//20; int parts[] = { 100, -1 }; - UINT ret; MINMAXINFO *mmi; Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Fri Aug 3 21:34:55 2007 @@ -8,13 +8,10 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__REACTOS__" /> - <library>kernel32</library> <library>user32</library> <library>gdi32</library> - <library>cards</library> <library>comctl32</library> - <file>solcreate.cpp</file> <file>solgame.cpp</file> <file>solitaire.cpp</file>

1 0

[gedmurphy] 28142: don't ask everytime the user wants to close the window
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 21:25:22 2007 New Revision: 28142 URL: http://svn.reactos.org/svn/reactos?rev=28142&view=rev Log: don't ask everytime the user wants to close the window Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp Fri Aug 3 21:25:22 2007 @@ -30,7 +30,6 @@ fVisible = visible; nThreedCount = 1; - nBackCardIdx = 53; Update(); //Update this stack's size+card count Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Aug 3 21:25:22 2007 @@ -493,13 +493,7 @@ return 0; case WM_CLOSE: - ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); - if(ret == IDOK) - { - WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); - DestroyWindow(hwnd); - } - + DestroyWindow(hwnd); return 0; }

1 0

[frik85] 28141: removed some debug and unused sql code cleaned up code
by frik85＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: frik85 Date: Fri Aug 3 21:00:01 2007 New Revision: 28141 URL: http://svn.reactos.org/svn/reactos?rev=28141&view=rev Log: removed some debug and unused sql code cleaned up code Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php Fri Aug 3 21:00:01 2007 @@ -28,18 +28,6 @@ $g_lang = ""; $g_cur_page_name = ""; $g_page_dynid = ""; - - - /*function generate_pages($g_language) { - $query_lang = mysql_query("SELECT * - FROM languages - ORDER BY lang_level DESC ;"); - while($result_lang = mysql_fetch_array($query_lang)) { - $g_log .= "\n<hr />\n<h2>".$RosCMS_result_update_per_lang['lang_name']."</h2>\n"; - $g_log .= generate_page("file", "all", $RosCMS_result_update_per_lang['lang_id'], "", "0"); - } - return $g_log; - }*/ function generate_page_output_update($g_data_id, $g_lang_id, $g_page_dynida) { @@ -324,11 +312,9 @@ $result_g_page = mysql_fetch_assoc($query_g_page); - // Try to get the dataset with r.rev_language == $g_lang - if( mysql_num_rows($query_g_page) == 2 ) - { - if( $result_g_page['rev_language'] == $roscms_standard_language ) - { + // Try to get the dataset with rev_language == $g_lang, to boost the translated content + if( mysql_num_rows($query_g_page) == 2 ) { + if( $result_g_page['rev_language'] == $roscms_standard_language ) { $result_g_page = mysql_fetch_assoc($query_g_page); } } @@ -492,11 +478,9 @@ $query_content = mysql_query($query_content_temp); $result_content = mysql_fetch_assoc($query_content); - // Try to get the dataset with r.rev_language == $g_lang - if( mysql_num_rows($query_content) == 2 ) - { - if( $result_content['rev_language'] == $roscms_standard_language ) - { + // Try to get the dataset with rev_language == $g_lang, to boost the translated content + if( mysql_num_rows($query_content) == 2 ) { + if( $result_content['rev_language'] == $roscms_standard_language ) { $result_content = mysql_fetch_assoc($query_content); } } @@ -559,33 +543,12 @@ $g_link_page_name2 = $g_link_page_name; $g_link_page_number = ""; - /*$sql_page_link = "SELECT * - FROM data_revision r, data_ d - WHERE r.rev_version >= 0 - AND d.data_name = '".mysql_real_escape_string($g_link_page_name2)."' - AND d.data_type = 'content' - AND r.data_id = d.data_id - ORDER BY r.rev_version DESC - LIMIT 1;"; - - */ if ( is_numeric(substr(strrchr($g_link_page_name,"_"), 1, strlen(strrchr($g_link_page_name,"_")-1))) ) { // dynamic $g_link_page_name2 = substr($g_link_page_name, 0, strlen($g_link_page_name) - strlen(strrchr($g_link_page_name,"_"))); $g_link_page_number = substr(strrchr($g_link_page_name,"_"), 1, strlen(strrchr($g_link_page_name,"_")-1)); } if ($g_linkstyle == "show") { // dynamic preview - /*$query_data = mysql_query("SELECT * - FROM data_ d, data_revision r - WHERE d.data_name = '".mysql_real_escape_string($g_link_page_name2)."' - AND r.data_id = d.data_id - AND r.rev_language = '".mysql_real_escape_string($g_lang)."' - AND rev_version > 0 - LIMIT 1;"); - $result_data = mysql_fetch_array($query_data); - - $tmp_dynamic = getTagValueG($result_data['data_id'], $result_data['rev_id'], '-1', 'number'); // get dynamic content number*/ - $RosCMS_current_page_link = $roscms_intern_webserver_roscms."?page=data_out&d_f=page&d_u=show&d_val=".$g_link_page_name2."&d_val2=".$g_lang."&d_val3=".$g_link_page_number; if ($g_link_page_name == "") { @@ -642,6 +605,7 @@ global $h_a2; //echo "<p>=> getTagValueG(".$RosCMS_GET_d_id.", ".$RosCMS_GET_d_r_id.", ".$RosCMS_intern_current_usrid.", ".$RosCMS_intern_current_tag_name.")</p>"; + // tag name $query_edit_mef_tag_get_id = mysql_query("SELECT tn_id, tn_name FROM data_tag_name".$h_a."

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs