Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 29164: Update to RosBE 0.3.8
by dreimer＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: dreimer Date: Sun Sep 23 19:23:54 2007 New Revision: 29164 URL: http://svn.reactos.org/svn/reactos?rev=29164&view=rev Log: Update to RosBE 0.3.8 Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sun Sep 23 19:23:54 2007 @@ -107,10 +107,10 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 0.3.7</regname> - <version>0.3.7</version> + <regname>ReactOS Build Environment 0.3.8</regname> + <version>0.3.8</version> <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.7.exe</location> + <location>http://www.colinfinck.de/pphlogger/dlcount.php?id=reactos&url=files/RosBE-W…</location> </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname>

1 0

[greatlrd] 29163: Fix : UnrealizeObject behoivr as windows 2000/XP see msdn http://msdn2.microsoft.com/en-us/library/ms532602.aspx Redirect : XFORMOBJ_bApplyXform@20 to NtGdiXFORMOBJ_bApplyXform@20 Redirect : XFORMOBJ_iGetXform@8 to NtGdiXFORMOBJ_iGetXform@8 Redirect : XLATEOBJ_cGetPalette@16 to NtGdiXLATEOBJ_cGetPalette@16 Redirect : XLATEOBJ_hGetColorTransform@4 to NtGdiXLATEOBJ_hGetColorTransform@4
by greatlrd＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: greatlrd Date: Sun Sep 23 18:35:40 2007 New Revision: 29163 URL: http://svn.reactos.org/svn/reactos?rev=29163&view=rev Log: Fix : UnrealizeObject behoivr as windows 2000/XP see msdn http://msdn2.microsoft.com/en-us/library/ms532602.aspx Redirect : XFORMOBJ_bApplyXform@20 to NtGdiXFORMOBJ_bApplyXform@20 Redirect : XFORMOBJ_iGetXform@8 to NtGdiXFORMOBJ_iGetXform@8 Redirect : XLATEOBJ_cGetPalette@16 to NtGdiXLATEOBJ_cGetPalette@16 Redirect : XLATEOBJ_hGetColorTransform@4 to NtGdiXLATEOBJ_hGetColorTransform@4 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Sep 23 18:35:40 2007 @@ -536,7 +536,16 @@ TextOutA@20 TextOutW@20 TranslateCharsetInfo@12 - +UnloadNetworkFonts@4 +UnrealizeObject@4 +UpdateColors@4 +UpdateICMRegKeyA@16 +UpdateICMRegKeyW@16 +WidenPath@4 +XFORMOBJ_bApplyXform@20=NtGdiXFORMOBJ_bApplyXform@20 +XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8 +XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16 +XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4 ClearBitmapAttributes@8 @@ -605,17 +614,6 @@ GetTextExtentPoint32A@16 SetBitmapAttributes@8 SetBrushAttributes@8 -UnrealizeObject@4 -UnloadNetworkFonts@4 -UpdateColors@4 -UpdateICMRegKeyA@16 -UpdateICMRegKeyA@16 -UpdateICMRegKeyW@16 -WidenPath@4 -XFORMOBJ_bApplyXform@20 -XFORMOBJ_iGetXform@8 -XLATEOBJ_cGetPalette@16 -XLATEOBJ_hGetColorTransform@4 XLATEOBJ_iXlate@8 XLATEOBJ_piVector@4 bInitSystemAndFontsDirectoriesW@8 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Sep 23 18:35:40 2007 @@ -911,11 +911,16 @@ */ BOOL STDCALL -UnrealizeObject( - HGDIOBJ a0 - ) -{ - return NtGdiUnrealizeObject(a0); +UnrealizeObject(HGDIOBJ hgdiobj) +{ + BOOL retValue = TRUE; + + if (GDI_HANDLE_GET_TYPE(hgdiobj) != GDI_OBJECT_TYPE_BRUSH) + { + retValue = NtGdiUnrealizeObject(hgdiobj); + } + + return retValue; } @@ -2338,58 +2343,6 @@ NULL); } -/* - * @unimplemented - */ -BOOL STDCALL -XFORMOBJ_bApplyXform(XFORMOBJ *pxo, - ULONG iMode, - ULONG cPoints, - PVOID pvIn, - PVOID pvOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG STDCALL -XFORMOBJ_iGetXform(XFORMOBJ *pxo, - XFORML *pxform) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG -STDCALL -XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, - ULONG PalOutType, - ULONG cPal, - ULONG *OutPal) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HANDLE STDCALL -XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented

1 0

[greatlrd] 29162: implement StartFormPage it call on StartPage(hdc); and StartPage is unimplment Fix : do not redirect TranslateCharsetInfo and StretchDIBits some stuff need be done in user mode.
by greatlrd＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: greatlrd Date: Sun Sep 23 17:46:20 2007 New Revision: 29162 URL: http://svn.reactos.org/svn/reactos?rev=29162&view=rev Log: implement StartFormPage it call on StartPage(hdc); and StartPage is unimplment Fix : do not redirect TranslateCharsetInfo and StretchDIBits some stuff need be done in user mode. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Sep 23 17:46:20 2007 @@ -436,7 +436,6 @@ PolyPatBlt@20 PolyPolygon@16 PolyPolyline@16 - PolyTextOutA@12 PolyTextOutW@12 Polygon@12 @@ -527,6 +526,16 @@ SetWorldTransform@8 StartDocA@8 StartDocW@8 +StartFormPage@4 +StartPage@4 +StretchBlt@44 +StretchDIBits@52 +StrokeAndFillPath@4 +StrokePath@4 +SwapBuffers@4 +TextOutA@20 +TextOutW@20 +TranslateCharsetInfo@12 @@ -596,16 +605,6 @@ GetTextExtentPoint32A@16 SetBitmapAttributes@8 SetBrushAttributes@8 -StartFormPage@4 -StartPage@4 -StretchBlt@44 -StretchDIBits@52=NtGdiStretchDIBits@52 -StrokeAndFillPath@4 -StrokePath@4 -SwapBuffers@4 -TextOutA@20 -TextOutW@20 -TranslateCharsetInfo@12=NtGdiTranslateCharsetInfo@12 UnrealizeObject@4 UnloadNetworkFonts@4 UpdateColors@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Sep 23 17:46:20 2007 @@ -19,6 +19,45 @@ #define SIZEOF_DEVMODEW_500 220 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); + + +/* + * @unimplemented + */ +BOOL +STDCALL +TranslateCharsetInfo(DWORD * lpSrc, + LPCHARSETINFO lpCs, + DWORD dwFlags) +{ + /* FIXME share memory */ + return NtGdiTranslateCharsetInfo(lpSrc, lpCs, dwFlags ); +} + +/* + * @unimplemented + */ +int +STDCALL +StretchDIBits(HDC hdc, + int XDest, + int YDest, + int nDestWidth, + int nDestHeight, + int XSrc, + int YSrc, + int nSrcWidth, + int nSrcHeight, + CONST VOID *lpBits, + CONST BITMAPINFO *lpBitsInfo, + UINT iUsage, + DWORD dwRop) + +{ + /* FIXME share memory */ + return NtGdiStretchDIBits(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop); +} /* * @unimplemented @@ -1832,15 +1871,13 @@ /* - * @unimplemented + * @implemented */ int STDCALL StartFormPage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return StartPage(hdc); } /*

1 0

[dreimer] 29161: Bug 2682: Downloader ressources update (heis_spiter@hotmail.com) (Yeah, I tested it :-P)
by dreimer＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: dreimer Date: Sun Sep 23 17:38:32 2007 New Revision: 29161 URL: http://svn.reactos.org/svn/reactos?rev=29161&view=rev Log: Bug 2682: Downloader ressources update (heis_spiter(a)hotmail.com) (Yeah, I tested it :-P) Added: trunk/rosapps/downloader/lang/ trunk/rosapps/downloader/lang/de-DE.rc trunk/rosapps/downloader/lang/en-US.rc trunk/rosapps/downloader/lang/es-ES.rc trunk/rosapps/downloader/lang/fr-FR.rc trunk/rosapps/downloader/lang/id-ID.rc trunk/rosapps/downloader/lang/it-IT.rc trunk/rosapps/downloader/lang/ru-RU.rc trunk/rosapps/downloader/lang/uk-UA.rc Removed: trunk/rosapps/downloader/translations/ Modified: trunk/rosapps/downloader/main.c trunk/rosapps/downloader/resources.h trunk/rosapps/downloader/rsrc.rc Added: trunk/rosapps/downloader/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/de-DE.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/de-DE.rc (added) +++ trunk/rosapps/downloader/lang/de-DE.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Download..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" + IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.0." + IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" + IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." + IDS_UPDATE_TITLE "Update" + IDS_UPDATE "Diese Funktion wurde noch nicht implementiert." + IDS_HELP_TITLE "Hilfe" + IDS_HELP "Wählen Sie links eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." + IDS_NO_APPS "In dieser Kategorie sind bisher noch keine Anwendungen. Sie können helfen, indem Sie Anwendungen hinzufügen." + IDS_CHOOSE_APP "Bitte wählen Sie eine Anwendung." + IDS_CHOOSE_SUB "Bitte wählen Sie eine Unterkategorie." + IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." + IDS_CHOOSE_BOTH "Bitte wählen Sie eine Unterkategorie oder eine Anwendung." + IDS_XMLERROR_1 "XML Datei nicht gefunden!" + IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" + IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." + IDS_VERSION "Version: " + IDS_LICENCE "Lizenz: " + IDS_MAINTAINER "Maintainer: " + IDS_APPS_TITLE "Anwendungen" + IDS_CATS_TITLE "Kategorien" +END Added: trunk/rosapps/downloader/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/en-US.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/en-US.rc (added) +++ trunk/rosapps/downloader/lang/en-US.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Download..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" + IDS_WELCOME "Please choose a category on the left. This is version 1.0." + IDS_NO_APP_TITLE "No application selected" + IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_UPDATE_TITLE "Update" + IDS_UPDATE "Sorry this feature is not implemented yet." + IDS_HELP_TITLE "Help" + IDS_HELP "Choose a category on the left, then choose a application and click the download button. To update the application information click the button next to the help button." + IDS_NO_APPS "Sorry, there no applications in this category yet. You can help and add more applications." + IDS_CHOOSE_APP "Please choose an application." + IDS_CHOOSE_SUB "Please choose a subcategory." + IDS_CHOOSE_CATEGORY "Please choose a category." + IDS_CHOOSE_BOTH "Please choose a subcategory or an application." + IDS_XMLERROR_1 "Could not find the xml file !" + IDS_XMLERROR_2 "Could not parse the xml file !" + IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check your internet connection." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Added: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/es-ES.rc (added) +++ trunk/rosapps/downloader/lang/es-ES.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Descargar..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "¡Descargar! - Descargador de ReactOS" + IDS_WELCOME_TITLE "Bienvenido al descargador de ReactOS" + IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.0." + IDS_NO_APP_TITLE "Ninguna aplicación seleccionada" + IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_UPDATE_TITLE "Actualizar" + IDS_UPDATE "Perdona esta característica no a sido implementada todavía." + IDS_HELP_TITLE "Ayuda" + IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." + IDS_NO_APPS "Perdón, aun no hay ninguna aplicación en esta categoría. Puedes ayudar y añadir más aplicaciones." + IDS_CHOOSE_APP "Por favor selecciona una aplicación." + IDS_CHOOSE_SUB "Por favor selecciona una subcategoría." + IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." + IDS_CHOOSE_BOTH "Por favor selecciona una subcategoria o una aplicación." + IDS_XMLERROR_1 "¡No se a encontrado el archivo xml!" + IDS_XMLERROR_2 "¡No se ha podido analizar el archivo xml!" + IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Added: trunk/rosapps/downloader/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/fr-FR.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/fr-FR.rc (added) +++ trunk/rosapps/downloader/lang/fr-FR.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Téléchargement..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Télécharger ! - Téléchargeur de ReactOS" + IDS_WELCOME_TITLE "Bienvenue dans le Téléchargeur de ReactOS" + IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.0." + IDS_NO_APP_TITLE "Aucune application selectionnée" + IDS_NO_APP "Veuillez sélectionner une application avant de cliquer sur le bouton Télécharger, si vous avez besoin d'aide, veuillez cliquer sur le point d'interrogation dans le coin supérieur droit." + IDS_UPDATE_TITLE "Mise à jour" + IDS_UPDATE "Désolé, cette fonctionnalité n'est pas encore implémentée." + IDS_HELP_TITLE "Aide" + IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide." + IDS_NO_APPS "Désolé, il n'y a pas encore d'application dans cette catégorie. Vous pouvez contribuer et ajouter plus d'applications." + IDS_CHOOSE_APP "Veuillez choisir une application." + IDS_CHOOSE_SUB "Veuillez choisir une sous-catégorie." + IDS_CHOOSE_CATEGORY "Veuillez choisir une catégorie." + IDS_CHOOSE_BOTH "Veuillez choisir une sous-catégorie ou une application." + IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" + IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" + IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Catégories" +END Added: trunk/rosapps/downloader/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/id-ID.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/id-ID.rc (added) +++ trunk/rosapps/downloader/lang/id-ID.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Download..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Batal", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WELCOME_TITLE "Selamat datang di ReactOS Downloader" + IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.0." + IDS_NO_APP_TITLE "Tidak ada aplikasi yang dipilih" + IDS_NO_APP "Silahkan pilih Aplikasi sebelum anda mengklik tombol download, jika anda membutuhkan asistensi silahkan klik pada tombol di sudut kanan atas." + IDS_UPDATE_TITLE "Mutakhirkan" + IDS_UPDATE "Maaf fitur ini belum diimplementasikan." + IDS_HELP_TITLE "Bantuan" + IDS_HELP "Pilih kategori di sisi kiri, lalu pilih aplikasi dan klik tombol download. Untuk memutakhirkan informasi aplikasi klik tombol disebelah tombol bantuan." + IDS_NO_APPS "Maaf, belum ada aplikasi dalam kategori ini. Anda dapat membantu dan menambahkan aplikasi lebih banyak." + IDS_CHOOSE_APP "Silahkan pilih aplikasi." + IDS_CHOOSE_SUB "Silahkan pilih subkategori." + IDS_CHOOSE_CATEGORY "Silahkan pilih kategori." + IDS_CHOOSE_BOTH "Silahkan pilih subkategori atau aplikasi." + IDS_XMLERROR_1 "Tidak dapat menemukan file xml !" + IDS_XMLERROR_2 "Tidak dapat mengurai file xml !" + IDS_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." + IDS_VERSION "Versi: " + IDS_LICENCE "Lisensi: " + IDS_MAINTAINER "Pemelihara: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Added: trunk/rosapps/downloader/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/it-IT.rc (added) +++ trunk/rosapps/downloader/lang/it-IT.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,37 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Download..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WELCOME_TITLE "Benvenuto al ReactOS Downloader" + IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.0." + IDS_NO_APP_TITLE "Nessuna applicazione selezionata" + IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra." + IDS_UPDATE_TITLE "Aggiorna" + IDS_UPDATE "Funzione non ancora implementata." + IDS_HELP_TITLE "Aiuto" + IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." + IDS_NO_APPS "Non ci sono ancora applicazioni in questa categoria. Puoi aiutare aggiungendone altre." + IDS_CHOOSE_APP "Scegli una applicazione." + IDS_CHOOSE_SUB "Scegli una sottocategoria." + IDS_CHOOSE_CATEGORY "Scegli una categoria." + IDS_CHOOSE_BOTH "Scegli una sottocategoria o una applicazione." + IDS_XMLERROR_1 "File xml non trovato !" + IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" + IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." + IDS_VERSION "Versione: " + IDS_LICENCE "Licenza: " + IDS_MAINTAINER "Manutentore: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Added: trunk/rosapps/downloader/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/ru-RU.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/ru-RU.rc (added) +++ trunk/rosapps/downloader/lang/ru-RU.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,39 @@ +//Russian language file. (Dmitry Chapyshev, 2007.06.21) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàãðóçêà..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Ñêà÷àòü! - ReactOS Downloader" + IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â ReactOS Downloader" + IDS_WELCOME "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ ñïðàâà. Âåðñèÿ 1.0." + IDS_NO_APP_TITLE "Ïðèëîæåíèå íå âûáðàíî" + IDS_NO_APP "Ïîæàëóéñòà, âûáåðèòå ïðèëîæåíèå ïðåæäå, ÷åì íàæàòü êíîïêó çàãðóçêè. Åñëè âàì íóæíà ñïðàâêà, òî íàæìèòå êíîïêó ñî çíàêîì âîïðîñà â âåðõíåì ïðàâîì óãëó." + IDS_UPDATE_TITLE "Îáíîâèòü" + IDS_UPDATE "Èçâåíèòå, äàííàÿ âîçìîæíîñòü íà äàííûì ìîìåíò íåäîñòóïíà." + IDS_HELP_TITLE "Ñïðàâêà" + IDS_HELP "Âûáåðèòå êàòåãîðèþ ñëåâà, çàòåì âûáåðèòå ïðèëîæåíèå è íàæìèòå êíîïêó çàãðóçêè. Äëÿ ïîëó÷åíèÿ èíôîðìàöèè îá îáíîâëåíèÿõ íàæìèòå êíîïêó ðÿäîì ñ êíîïêîé ñïðàâêè." + IDS_NO_APPS "Èçâåíèòå, íà äàííûé ìîìåíò â ýòîé êàòåãîðèè ïðèëîæåíèé íåò, íî âû ìîæåòå ïîìî÷ü äîáàâèòü èõ." + IDS_CHOOSE_APP "Ïîæàëóéñòà âûáåðèòå ïðèëîæåíèå." + IDS_CHOOSE_SUB "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ." + IDS_CHOOSE_CATEGORY "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ." + IDS_CHOOSE_BOTH "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ èëè ïðèëîæåíèå." + IDS_XMLERROR_1 "Íå óäàëîñü íàéòè xml-ôàéë!" + IDS_XMLERROR_2 "Íå óäàëîñü îáðàáîòàòü xml-ôàéë!" + IDS_DOWNLOAD_ERROR "Íå óäàåòñÿ çàãðóçèòü ôàéë.\nÏîæàëóéñòà ïðîâåðüòå âàøå ïîäêëþ÷åíèå ê èíòåðíåò." + IDS_VERSION "Âåðñèÿ: " + IDS_LICENCE "Ëèöåíçèÿ: " + IDS_MAINTAINER "Ïðîèçâîäèòåëü: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Added: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (added) +++ trunk/rosapps/downloader/lang/uk-UA.rc Sun Sep 23 17:38:32 2007 @@ -1,0 +1,45 @@ +/* + * PROJECT: ReactOS Downloader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/downloader/translations/uk.rc + * PURPOSE: Ukraianian Language File for Downloader + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâàíòàæåííÿ..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Çàâàíòàæèòè ! - Çàâàíòàæóâà÷ ReactOS" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî ó Çàâàíòàæóâà÷ ReactOS" + IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.0." + IDS_NO_APP_TITLE "Äîäàòîê íå âèáðàíèé" + IDS_NO_APP "Áóäü ëàñêà, âèáåð³òü äîäàòîê ïåðø í³æ íàòèñíóòè êíîïêó çàâàíòàæåííÿ. ßêùî Âàì ïîòð³áíà äîïîìîãà, íàòèñí³òü êíîïêó ç³ çíàêîì ïèòàííÿ ó âåðõíüîìó ïðàâîìó êóòêó." + IDS_UPDATE_TITLE "Îíîâèòè" + IDS_UPDATE "Âèáà÷òå, äàíà ìîæëèâ³ñòü ùå íåäîñòóïíà." + IDS_HELP_TITLE "Äîâ³äêà" + IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." + IDS_NO_APPS "Âèáà÷òå, â ö³é êàòåãîð³¿ ùå íåìàº äîäàòê³â. Âè ìîæåòå äîïîìîãòè ³ äîäàòè á³ëüøå äîäàòê³â." + IDS_CHOOSE_APP "Áóäü ëàñêà âèáåð³òü äîäàòîê." + IDS_CHOOSE_SUB "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ." + IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." + IDS_CHOOSE_BOTH "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ àáî äîäàòîê." + IDS_XMLERROR_1 "Íå âäàëîñÿ çíàéòè ôàéë xml !" + IDS_XMLERROR_2 "Íå âäàëîñÿ îáðîáèòè ôàéë xml !" + IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." + IDS_VERSION "Âåðñ³ÿ: " + IDS_LICENCE "Ë³öåíç³ÿ: " + IDS_MAINTAINER "Âèðîáíèê: " + IDS_APPS_TITLE "Applications" + IDS_CATS_TITLE "Categories" +END Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=2916… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Sun Sep 23 17:38:32 2007 @@ -144,16 +144,20 @@ TV_INSERTSTRUCTW Insert = {0}; HIMAGELIST hImageList; HINSTANCE hInstance = GetModuleHandle(NULL); + WCHAR Cats[MAX_STRING_LENGHT], Apps[MAX_STRING_LENGHT]; // Parse the XML file if (ProcessXML (XML_PATH, &Root) == FALSE) return FALSE; + LoadStringW(hInstance, IDS_CATS_TITLE, Cats, MAX_STRING_LENGHT); + LoadStringW(hInstance, IDS_APPS_TITLE, Apps, MAX_STRING_LENGHT); + // Set up the controls - hCategories = CreateWindowExW(0, WC_TREEVIEWW, L"Categories", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, + hCategories = CreateWindowExW(0, WC_TREEVIEWW, Cats, WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); - hApps = CreateWindowExW(0, WC_TREEVIEWW, L"Applications", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, + hApps = CreateWindowExW(0, WC_TREEVIEWW, Apps, WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); hLogo = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_LOGO)); Modified: trunk/rosapps/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources.h?rev… ============================================================================== --- trunk/rosapps/downloader/resources.h (original) +++ trunk/rosapps/downloader/resources.h Sun Sep 23 17:38:32 2007 @@ -42,6 +42,9 @@ #define IDS_VERSION 17 #define IDS_LICENCE 18 #define IDS_MAINTAINER 19 +#define IDS_APPS_TITLE 20 +#define IDS_CATS_TITLE 21 + #define STRING_COUNT 20 #define MAX_STRING_LENGHT 0x100 Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=291… ============================================================================== --- trunk/rosapps/downloader/rsrc.rc (original) +++ trunk/rosapps/downloader/rsrc.rc Sun Sep 23 17:38:32 2007 @@ -20,11 +20,11 @@ IDB_TREEVIEW_ICON_10 BITMAP DISCARDABLE "resources/10.bmp" -#include "translations/de.rc" -#include "translations/en.rc" -#include "translations/fr.rc" -#include "translations/id.rc" -#include "translations/it.rc" -#include "translations/es.rc" -#include "translations/ru.rc" -#include "translations/uk.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/es-ES.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[hpoussin] 29160: Open the process with enough privileges before adjusting them
by hpoussin＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: hpoussin Date: Sun Sep 23 17:14:03 2007 New Revision: 29160 URL: http://svn.reactos.org/svn/reactos?rev=29160&view=rev Log: Open the process with enough privileges before adjusting them Modified: trunk/reactos/dll/win32/setupapi/misc.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Sun Sep 23 17:14:03 2007 @@ -432,7 +432,7 @@ TRACE("%s %s\n", debugstr_w(lpPrivilegeName), bEnable ? "TRUE" : "FALSE"); - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) return FALSE; Privileges.PrivilegeCount = 1;

1 0

[hpoussin] 29159: Remove useless code
by hpoussin＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: hpoussin Date: Sun Sep 23 17:10:51 2007 New Revision: 29159 URL: http://svn.reactos.org/svn/reactos?rev=29159&view=rev Log: Remove useless code Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Sep 23 17:10:51 2007 @@ -755,15 +755,6 @@ } } -bool -MingwBackend::IncludeDirectoryTarget ( const string& directory ) const -{ - if ( directory == "$(INTERMEDIATE)" + sSep + "tools") - return false; - else - return true; -} - void MingwBackend::GenerateDirectories () { Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Sun Sep 23 17:10:51 2007 @@ -88,7 +88,6 @@ std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); - bool IncludeDirectoryTarget ( const std::string& directory ) const; bool TryToDetectThisCompiler ( const std::string& compiler ); void DetectCompiler (); std::string GetCompilerVersion ( const std::string& compilerCommand );

1 0

[frik85] 29158: RosCMS update: * remove minor debug output
by frik85＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: frik85 Date: Sun Sep 23 17:07:22 2007 New Revision: 29158 URL: http://svn.reactos.org/svn/reactos?rev=29158&view=rev Log: RosCMS update: * remove minor debug output Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php Sun Sep 23 17:07:22 2007 @@ -111,7 +111,7 @@ break; } - echo "<p>OPT: ".$RosCMS_GET_d_value2."</p>"; + //echo "<p>OPT: ".$RosCMS_GET_d_value2."</p>"; $query_user_list = mysql_query("SELECT u.user_id, u.user_name, u.user_fullname, u.user_language FROM users u

1 0

[frik85] 29157: RosCMS update: * automatic page generation fixed * user page got several new search options * maintain page improved
by frik85＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: frik85 Date: Sun Sep 23 17:04:13 2007 New Revision: 29157 URL: http://svn.reactos.org/svn/reactos?rev=29157&view=rev Log: RosCMS update: * automatic page generation fixed * user page got several new search options * maintain page improved Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php trunk/web/reactos.org/htdocs/roscms/inc/data_user.php trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Sun Sep 23 17:04:13 2007 @@ -1401,7 +1401,7 @@ if ($RosCMS_GET_debug) echo "<p>! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")</p>"; - //echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); + echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); echo "Page generation process finished"; } else { 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 Sun Sep 23 17:04:13 2007 @@ -281,7 +281,7 @@ $fp = fopen($RosCMS_current_page_out_file, "w"); flock($fp,2); fputs($fp,$RosCMS_current_page_content); // write content - fputs($fp,"\n\n"); + fputs($fp,"\n\n"); flock($fp,3); fclose($fp); Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php Sun Sep 23 17:04:13 2007 @@ -64,7 +64,6 @@ ?> <p><a href="javascript:optimizedb()">Optimize Database Tables</a></p> - <p><a href="javascript:analyzedb()">Analyze Database Tables</a></p> <p> </p> <p><a href="javascript:ppreview()">Page Preview</a></p> <div><label for="textfield">Entry-Name:</label> <input name="textfield" type="text" id="textfield" size="20" maxlength="100" /> @@ -174,7 +173,9 @@ function makeRequest(url, action, objid) { var http_request = false; + document.getElementById('ajaxloading').style.display = 'block'; + document.getElementById(objid).innerHTML = ''; if (window.XMLHttpRequest) { // Mozilla, Safari,... Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_user.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_user.php Sun Sep 23 17:04:13 2007 @@ -52,14 +52,26 @@ } if (roscms_security_grp_member("transmaint") ||roscms_security_grp_member("ros_admin") || roscms_security_grp_member("ros_sadmin")) { - - echo '<div><label for="textfield">Username: </label><input type="text" name="textfield" id="textfield" onkeyup="getuser(this.value)" /> <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /></div>'; - echo '<div id="userarea"></div>'; +?> +<div><label for="textfield">Username: </label><input type="text" name="textfield" id="textfield" onkeyup="getuser()" /> <br /> + <input name="searchopt" type="radio" id="searchopt1" value="accountname" checked="checked" onclick="getuser()" /> + <label>account name</label> + <input name="searchopt" type="radio" id="searchopt2" value="fullname" onclick="getuser()" /> + <label>full name </label> + <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getuser()" /> + <label>email address</label> + <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getuser()" /> + <label>website</label> + <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getuser()" /> + <label>language</label> + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /><br /><br /> +</div> +<div id="userarea"></div> - echo "<br />"; - echo "<br />"; +<br /> +<br /> - +<?php echo "<h4>Translators</h4>"; echo "<ul>"; @@ -80,16 +92,24 @@ echo "<br />"; +/* if (roscms_security_grp_member("transmaint")) { echo get_content("log_website_en_2007-30", "system", "en", "content", "text", "archive"); } +*/ } ?> <script type="text/javascript" language="javascript"> <!-- - function getuser(username) { - makeRequest('?page=data_out&d_f=user&d_u=usrtbl&d_fl=list&d_val='+encodeURIComponent(username), 'usrtbl', 'userarea'); + function getuser() { + var soptckd = ''; + if (document.getElementById('searchopt1').checked) soptckd = 'accountname'; + if (document.getElementById('searchopt2').checked) soptckd = 'fullname'; + if (document.getElementById('searchopt3').checked) soptckd = 'email'; + if (document.getElementById('searchopt4').checked) soptckd = 'website'; + if (document.getElementById('searchopt5').checked) soptckd = 'language'; + makeRequest('?page=data_out&d_f=user&d_u=usrtbl&d_fl=list&d_val='+encodeURIComponent(document.getElementById('textfield').value)+'&d_val2='+encodeURIComponent(soptckd), 'usrtbl', 'userarea'); } function getuserdetails(userid) { Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_user_out.php Sun Sep 23 17:04:13 2007 @@ -86,14 +86,36 @@ } if ($RosCMS_GET_d_flag == "list") { - echo "<fieldset><legend>Results</legend>"; if (strlen($RosCMS_GET_d_value) > 2) { + echo "<fieldset><legend>Results</legend>"; echo "<ul>"; $tmp_counter = 0; + + switch ($RosCMS_GET_d_value2) { + default: + case "accountname": + $tmp_sql_search_opt = "u.user_name"; + break; + case "fullname": + $tmp_sql_search_opt = "u.user_fullname"; + break; + case "email": + $tmp_sql_search_opt = "u.user_email"; + break; + case "website": + $tmp_sql_search_opt = "u.user_website"; + break; + case "language": + $tmp_sql_search_opt = "u.user_language"; + break; + } + + echo "<p>OPT: ".$RosCMS_GET_d_value2."</p>"; + $query_user_list = mysql_query("SELECT u.user_id, u.user_name, u.user_fullname, u.user_language FROM users u - WHERE u.user_name LIKE '".mysql_real_escape_string($RosCMS_GET_d_value)."%' + WHERE ". $tmp_sql_search_opt ." LIKE '".mysql_real_escape_string($RosCMS_GET_d_value)."%' ORDER BY u.user_name ASC LIMIT 25;"); while ($result_user_list = mysql_fetch_array($query_user_list)) { @@ -106,11 +128,12 @@ if ($tmp_counter >= 25) { echo "<p>... more than 25 users</p>"; } + + echo "</fieldset><br />"; } else if (strlen($RosCMS_GET_d_value) > 0) { echo "<p>more than 2 characters requiered</p>"; } - echo "</fieldset><br />"; } else if ($RosCMS_GET_d_flag == "detail") { $query_user_detail = mysql_query("SELECT user_id, user_name, user_timestamp_touch2 as 'visit', user_login_counter 'visitcount', user_register, user_fullname, user_email, user_language

1 0

[dreimer] 29156: Fix another Build breaking Bug, I missed...
by dreimer＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: dreimer Date: Sun Sep 23 15:42:26 2007 New Revision: 29156 URL: http://svn.reactos.org/svn/reactos?rev=29156&view=rev Log: Fix another Build breaking Bug, I missed... Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sun Sep 23 15:42:26 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[cfinck] 29155: Don't run "make clean" anymore, only remove the appropriate files and directories in "clean.sh". This speeds up the cleaning process significantly and should fix possible endless loops when running "clean". (same change as r29141 for RosBE-Windows)
by cfinck＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: cfinck Date: Sun Sep 23 15:40:59 2007 New Revision: 29155 URL: http://svn.reactos.org/svn/reactos?rev=29155&view=rev Log: Don't run "make clean" anymore, only remove the appropriate files and directories in "clean.sh". This speeds up the cleaning process significantly and should fix possible endless loops when running "clean". (same change as r29141 for RosBE-Windows) Modified: trunk/tools/RosBE-Unix/scripts/clean.sh Modified: trunk/tools/RosBE-Unix/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/scripts/clean.sh?… ============================================================================== --- trunk/tools/RosBE-Unix/scripts/clean.sh (original) +++ trunk/tools/RosBE-Unix/scripts/clean.sh Sun Sep 23 15:40:59 2007 @@ -11,10 +11,6 @@ if [ -d "obj-i386" ]; then echo "Cleaning ReactOS source directory..." - if [ -f "makefile.auto" ]; then - make clean >& /dev/null - fi - rm -rf "obj-i386" rm -rf "output-i386" rm -rf "reactos."

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