Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[gedmurphy] 27566: fix SetServiceStatus to now call ScmrSetServiceStatus to set the service data
by gedmurphy＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: gedmurphy Date: Tue Jul 10 18:54:30 2007 New Revision: 27566 URL: http://svn.reactos.org/svn/reactos?rev=27566&view=rev Log: fix SetServiceStatus to now call ScmrSetServiceStatus to set the service data Modified: trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Jul 10 18:54:30 2007 @@ -1829,6 +1829,69 @@ return TRUE; } +/********************************************************************** + * SetServiceObjectSecurity + * + * @implemented + */ +BOOL STDCALL +SetServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor) +{ + PSECURITY_DESCRIPTOR SelfRelativeSD = NULL; + ULONG Length; + NTSTATUS Status; + DWORD dwError; + + Length = 0; + Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, + SelfRelativeSD, + &Length); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SelfRelativeSD = HeapAlloc(GetProcessHeap(), 0, Length); + if (SelfRelativeSD == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, + SelfRelativeSD, + &Length); + if (!NT_SUCCESS(Status)) + { + HeapFree(GetProcessHeap(), 0, SelfRelativeSD); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrSetServiceObjectSecurity(BindingHandle, + (unsigned int)hService, + dwSecurityInformation, + (unsigned char *)SelfRelativeSD, + Length); + + HeapFree(GetProcessHeap(), 0, SelfRelativeSD); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + /********************************************************************** * QueryServiceStatus @@ -1896,66 +1959,34 @@ return TRUE; } - -/********************************************************************** - * SetServiceObjectSecurity - * - * @implemented - */ -BOOL STDCALL -SetServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor) -{ - PSECURITY_DESCRIPTOR SelfRelativeSD = NULL; - ULONG Length; - NTSTATUS Status; - DWORD dwError; - - Length = 0; - Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, - SelfRelativeSD, - &Length); - if (Status != STATUS_BUFFER_TOO_SMALL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - SelfRelativeSD = HeapAlloc(GetProcessHeap(), 0, Length); - if (SelfRelativeSD == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, - SelfRelativeSD, - &Length); - if (!NT_SUCCESS(Status)) - { - HeapFree(GetProcessHeap(), 0, SelfRelativeSD); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrSetServiceObjectSecurity(BindingHandle, - (unsigned int)hService, - dwSecurityInformation, - (unsigned char *)SelfRelativeSD, - Length); - - HeapFree(GetProcessHeap(), 0, SelfRelativeSD); - - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } +/********************************************************************** + * SetServiceStatus + * + * @implemented + */ +BOOL STDCALL +SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, + LPSERVICE_STATUS lpServiceStatus) +{ + DWORD dwError; + + DPRINT("SetServiceStatus() called\n"); + DPRINT("ThreadId %lu, data addr %p called\n", hServiceStatus, lpServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrSetServiceStatus(BindingHandle, + (unsigned long)hServiceStatus, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("SetServiceStatus() done (ret %lu\n", dwError); return TRUE; } Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Tue Jul 10 18:54:30 2007 @@ -64,7 +64,7 @@ return NULL; } - +/* static PACTIVE_SERVICE ScLookupServiceByThreadId(DWORD ThreadId) { @@ -82,7 +82,7 @@ return NULL; } - +*/ static DWORD WINAPI ScServiceMainStub(LPVOID Context) @@ -487,32 +487,6 @@ /********************************************************************** - * SetServiceStatus - * - * @implemented - */ -BOOL STDCALL -SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) -{ - PACTIVE_SERVICE Service; - - Service = ScLookupServiceByThreadId((DWORD)hServiceStatus); - if (!Service) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - RtlCopyMemory(&Service->ServiceStatus, - lpServiceStatus, - sizeof(SERVICE_STATUS)); - - return TRUE; -} - - -/********************************************************************** * StartServiceCtrlDispatcherA * * @unimplemented

1 0

[gedmurphy] 27565: implement ScmrSetServiceStatus, this goes some way to being able to manually control services
by gedmurphy＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: gedmurphy Date: Tue Jul 10 18:49:51 2007 New Revision: 27565 URL: http://svn.reactos.org/svn/reactos?rev=27565&view=rev Log: implement ScmrSetServiceStatus, this goes some way to being able to manually control services Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Tue Jul 10 18:49:51 2007 @@ -128,6 +128,37 @@ } +PSERVICE +ScmGetServiceEntryByThreadId(ULONG ThreadId) +{ + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + + DPRINT("ScmGetServiceEntryByThreadId() called\n"); + DPRINT("Finding ThreadId %lu\n", ThreadId); + + ServiceEntry = ServiceListHead.Flink; + while (ServiceEntry != &ServiceListHead) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + DPRINT("Found threadId %lu\n", CurrentService->ThreadId); + if (CurrentService->ThreadId == ThreadId) + { + DPRINT("Found service: '%S'\n", CurrentService->lpDisplayName); + return CurrentService; + } + + ServiceEntry = ServiceEntry->Flink; + } + + DPRINT("Couldn't find a matching service\n"); + + return NULL; +} + + DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord) @@ -542,8 +573,8 @@ DPRINT("ScmControlService() called\n"); ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET)); + HEAP_ZERO_MEMORY, + sizeof(SCM_CONTROL_PACKET)); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -597,7 +628,7 @@ } } TotalLength++; - DPRINT("ArgsLength: %ld\nTotalLength: %ld\n\n", ArgsLength, TotalLength); + DPRINT("ArgsLength: %ld TotalLength: %ld\n", ArgsLength, TotalLength); /* Allocate a control packet */ ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(), Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Tue Jul 10 18:49:51 2007 @@ -700,11 +700,31 @@ /* Function 7 */ unsigned long ScmrSetServiceStatus(handle_t BindingHandle, - unsigned long hServiceStatus) /* FIXME */ -{ - DPRINT1("ScmrSetServiceStatus() is unimplemented\n"); - /* FIXME */ - return ERROR_CALL_NOT_IMPLEMENTED; + unsigned long hServiceStatus, + LPSERVICE_STATUS lpServiceStatus) +{ + PSERVICE lpService; + + DPRINT("ScmrSetServiceStatus() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + lpService = ScmGetServiceEntryByThreadId((ULONG)hServiceStatus); + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + RtlCopyMemory(&lpService->Status, + lpServiceStatus, + sizeof(SERVICE_STATUS)); + + DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); + DPRINT("ScmrSetServiceStatus() done\n"); + + return ERROR_SUCCESS; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Tue Jul 10 18:49:51 2007 @@ -102,6 +102,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); +PSERVICE ScmGetServiceEntryByThreadId(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); DWORD ScmMarkServiceForDelete(PSERVICE pService);

1 0

[cfinck] 27564: Update copyrights to 2007
by cfinck＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: cfinck Date: Tue Jul 10 18:17:15 2007 New Revision: 27564 URL: http://svn.reactos.org/svn/reactos?rev=27564&view=rev Log: Update copyrights to 2007 Modified: trunk/reactos/dll/win32/shell32/authors.c Modified: trunk/reactos/dll/win32/shell32/authors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/authors.… ============================================================================== --- trunk/reactos/dll/win32/shell32/authors.c (original) +++ trunk/reactos/dll/win32/shell32/authors.c Tue Jul 10 18:17:15 2007 @@ -1,1 +1,1 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2006 WINE team", "Copyright 1998-2006 ReactOS Team", 0 }; +const char * const SHELL_Authors[] = { "Copyright 1993-2007 WINE team", "Copyright 1998-2007 ReactOS Team", 0 };

1 0

[hpoussin] 27563: Prevent possible access out of bounds when calculating CPU speed
by hpoussin＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: hpoussin Date: Tue Jul 10 17:30:43 2007 New Revision: 27563 URL: http://svn.reactos.org/svn/reactos?rev=27563&view=rev Log: Prevent possible access out of bounds when calculating CPU speed Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Tue Jul 10 17:30:43 2007 @@ -227,6 +227,13 @@ /* Move on */ CurrentSample++; Sample++; + + if (Sample == sizeof(Samples) / sizeof(Samples[0])) + { + /* Restart */ + CurrentSample = Samples; + Sample = 0; + } } /* Save the CPU Speed */

1 0

[cfinck] 27562: Delete the unneeded and wrong SUBLANG_NEUTRAL line from the dialog definition See issue #2381 for more details.
by cfinck＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: cfinck Date: Tue Jul 10 17:29:27 2007 New Revision: 27562 URL: http://svn.reactos.org/svn/reactos?rev=27562&view=rev Log: Delete the unneeded and wrong SUBLANG_NEUTRAL line from the dialog definition See issue #2381 for more details. Modified: trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc Modified: trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/regedit/clb/lang/pl-PL.rc Tue Jul 10 17:29:27 2007 @@ -9,7 +9,6 @@ IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Style kolumnowej listy elementów" -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Style kolumnowej listy elementów", -1, 6, 7, 158, 71

1 0

[cfinck] 27561: Adding/updating french translations for WordPad and ImageSoft by Heis Spiter (heis_spiter AT hotmail DOT com) This patch also removes the call to a wrong window in ImageSoft I slightly modified the patch to match with our new SUBLANG rules. See issue #2377 for more details.
by cfinck＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: cfinck Date: Tue Jul 10 17:17:54 2007 New Revision: 27561 URL: http://svn.reactos.org/svn/reactos?rev=27561&view=rev Log: Adding/updating french translations for WordPad and ImageSoft by Heis Spiter (heis_spiter AT hotmail DOT com) This patch also removes the call to a wrong window in ImageSoft I slightly modified the patch to match with our new SUBLANG rules. See issue #2377 for more details. Added: trunk/rosapps/imagesoft/lang/fr-FR.rc Modified: trunk/reactos/base/applications/wordpad/lang/fr-FR.rc trunk/rosapps/imagesoft/mainwnd.c trunk/rosapps/imagesoft/rsrc.rc Modified: trunk/reactos/base/applications/wordpad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/wordpad/lang/fr-FR.rc Tue Jul 10 17:17:54 2007 @@ -147,9 +147,9 @@ IDS_HINT_OPEN " Ouvre un document existant." IDS_HINT_CLOSE " Ferme cette fenêtre." IDS_HINT_CLOSEALL " Ferme toutes les fenêtres." - IDS_HINT_SAVE " Enregistre le document en cours." - IDS_HINT_SAVEAS " Enregistre le document en cours sous un nouveau nom." - IDS_HINT_PRINT " Imprime le document en cours." + IDS_HINT_SAVE " Enregistre le document courant." + IDS_HINT_SAVEAS " Enregistre le document courant sous un nouveau nom." + IDS_HINT_PRINT " Imprime le document courant." IDS_HINT_PRINTPRE " Aperçu avant impression." IDS_HINT_PAGESETUP " Change la mise en page." IDS_HINT_EXIT " Quitte cette application." Added: trunk/rosapps/imagesoft/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/fr-FR.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/fr-FR.rc (added) +++ trunk/rosapps/imagesoft/lang/fr-FR.rc Tue Jul 10 17:17:54 2007 @@ -1,0 +1,234 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau...", ID_NEW + MENUITEM "&Ouvrir...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "Fermer\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Fermer tout", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "Enregistrer", ID_SAVE, GRAYED + MENUITEM "Enregistrer sous...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aperçu a&vant impression", ID_PRINTPRE,GRAYED + MENUITEM "Im&primer...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pr&opriétés...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Quitter\tAlt+F4", ID_EXIT + END + POPUP "&Édition" + BEGIN + MENUITEM "Annuler", ID_UNDO, GRAYED + MENUITEM "&Rétablir", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Couper", ID_CUT, GRAYED + MENUITEM "&Copier", ID_COPY, GRAYED + MENUITEM "Coller", ID_PASTE, GRAYED + MENUITEM "Coller en tant qu'&image", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Tout sélectionner", ID_SELALL, GRAYED + END + POPUP "Affichage" + BEGIN + MENUITEM "Ou&tils", ID_TOOLS + MENUITEM "&Couleurs", ID_COLOR + MENUITEM "&Historique", ID_HISTORY + MENUITEM "Barre de &status", ID_STATUSBAR + END + POPUP "Régl&age" + BEGIN + MENUITEM "Luminosité...", ID_BRIGHTNESS + MENUITEM "Contraste...", ID_CONTRAST + MENUITEM "Teinte/Saturation...", -1, GRAYED + POPUP "Couleur" + BEGIN + MENUITEM "Noir et blanc" ID_BLACKANDWHITE + MENUITEM "Inverser les couleurs" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Rendre flou", ID_BLUR + MENUITEM "Accentuer", ID_SHARPEN + MENUITEM "Lisser les bords", -1, GRAYED + MENUITEM "Ajouter une ombre", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Taille de l'image...", -1, GRAYED + MENUITEM "Retourner", -1, GRAYED + MENUITEM "Inverser", -1, GRAYED // FIXME : Pourrait-être amélioré pour mieux dégager le sens de "mirror" + MENUITEM "Tourner", -1, GRAYED + + END + POPUP "&Couleurs" + BEGIN + MENUITEM "&Éditer les couleurs...", ID_EDITCOLOURS + END + POPUP "Fenêtre" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaïque &verticale", ID_WINDOW_TILE_VERT + MENUITEM "&Arranger les icônes", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Suivan&te\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "Aide" + BEGIN + MENUITEM "&À propos...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Luminosité" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Composante de la couleur:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Complète (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Rouge", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Vert", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Bleu", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Annuler", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "À propos d'ImageSoft" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Propriétés de l'image" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Nom:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Propriétés du support", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Type de l'image:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "Largeur:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Hauteur:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Résolution:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unité:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Taille de l'image:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Annuler", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " Prêt." + IDS_TOOLBAR_STANDARD "Standard" + IDS_TOOLBAR_TEST "Test" + IDS_IMAGE_NAME "Image %1!u!" + IDS_FLT_TOOLS "Outils" + IDS_FLT_COLORS "Couleurs" + IDS_FLT_HISTORY "Historique" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" + IDS_IMAGE_GREYSCALE "Variantes de gris (8 bit)" + IDS_IMAGE_PALETTE "Palette ou 256 couleurs (8 bit)" + IDS_IMAGE_TRUECOLOR "Couleurs vraies (24 bit)" + + IDS_UNIT_PIXELS "Pixels" + IDS_UNIT_CM "Cm" + IDS_UNIT_INCHES "Pouces" + IDS_UNIT_DOTSCM "Points / Cm" + IDS_UNIT_DPI "DPI" + IDS_UNIT_KB "%d Ko" + IDS_UNIT_MB "%d Mo" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nouveau" + IDS_TOOLTIP_OPEN "Ouvrir" + IDS_TOOLTIP_SAVE "Enregistrer" + IDS_TOOLTIP_PRINTPRE "Aperçu avant impression" + IDS_TOOLTIP_PRINT "Imprimer" + IDS_TOOLTIP_CUT "Couper" + IDS_TOOLTIP_COPY "Copier" + IDS_TOOLTIP_PASTE "Coller" + IDS_TOOLTIP_UNDO "Annuler" + IDS_TOOLTIP_REDO "Rétablir" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Créé un nouveau document." + IDS_HINT_OPEN " Ouvre un document existant." + IDS_HINT_CLOSE " Ferme cette fenêtre." + IDS_HINT_CLOSEALL " Ferme toutes les fenêtres." + IDS_HINT_SAVE " Enregistre le document courant." + IDS_HINT_SAVEAS " Enregistre le document courant sous un nouveau nom." + IDS_HINT_PRINTPRE " Aperçu avant impression." + IDS_HINT_PRINT " Imprime le document courant." + IDS_HINT_PROP " Montre les propriétés de l'image courante." + IDS_HINT_EXIT " Quitte cette application." + + IDS_HINT_TOOLS " Montre ou cache la fenêtre flottante des outils." + IDS_HINT_COLORS " Montre ou cache la fenêtre flottante des couleurs." + IDS_HINT_HISTORY " Montre ou cache la fenêtre flottante de l'historique." + IDS_HINT_STATUS " Montre ou cache la barre de status." + + IDS_HINT_CASCADE " Arrange les fenêtres en cascade." + IDS_HINT_TILE_HORZ " Arrange les fenêtres en mosaïque horizontale." + IDS_HINT_TILE_VERT " Arrange les fenêtres en mosaïque verticale." + IDS_HINT_ARRANGE " Arrange les icônes en bas de la fenêtre." + IDS_HINT_NEXT " Active la prochaine fenêtre." + + IDS_HINT_SYS_RESTORE " Restaure la taille normale de la fenêtre." + IDS_HINT_SYS_MOVE " Bouge la fenêtre." + IDS_HINT_SYS_SIZE " Retaille la fenêtre." + IDS_HINT_SYS_MINIMIZE " Réduit la fenêtre." + IDS_HINT_SYS_MAXIMIZE " Affiche la fenêtre en plein écran." +END Modified: trunk/rosapps/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/mainwnd.c?rev=27… ============================================================================== --- trunk/rosapps/imagesoft/mainwnd.c (original) +++ trunk/rosapps/imagesoft/mainwnd.c Tue Jul 10 17:17:54 2007 @@ -907,11 +907,7 @@ break; case ID_CONTRAST: - DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_BRIGHTNESS), - Info->hSelf, - ContrastProc, - (LPARAM)Info); + /* FIXME : Create a window for contrast */ break; case ID_BLACKANDWHITE: Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=2756… ============================================================================== --- trunk/rosapps/imagesoft/rsrc.rc (original) +++ trunk/rosapps/imagesoft/rsrc.rc Tue Jul 10 17:17:54 2007 @@ -9,9 +9,10 @@ /* include localised resources */ #include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/nb-NO.rc" +#include "lang/ru-RU.rc" #include "lang/th-TH.rc" -#include "lang/es-ES.rc" -#include "lang/ru-RU.rc"

1 0

[dreimer] 27560: - Some more cleanup - Added chdefdir to Help.
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 16:56:57 2007 New Revision: 27560 URL: http://svn.reactos.org/svn/reactos?rev=27560&view=rev Log: - Some more cleanup - Added chdefdir to Help. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Tue Jul 10 16:56:57 2007 @@ -23,6 +23,8 @@ echo with the appropriate number. echo basedir - Switch back to the ReactOS source directory. echo. + echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one + echo Session. echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. echo clean [logs] - Fully clean the ReactOS source directory and/or @@ -79,6 +81,14 @@ echo Revision Number. goto :EOF ) +if "%1" == "chdefdir" ( + echo Usage: chdefdir [OPTIONS] + echo Reconfigures the Default Source Folder for one Session. A Reset sets + echo back to the Default. + echo. + echo default - Sets back to the Default Source Folder without a restart. + goto :EOF +) if "%1" == "config" ( echo Usage: config [OPTIONS] echo Creates a Configuration File, which tells RosBE how to build the Tree. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jul 10 16:56:57 2007 @@ -10,5 +10,5 @@ for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 -for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i +for /f %%i in ('echoh %baseaddr%"') do set relbase=%%i raddr2line %1 %relbase% 2>NUL

1 0

[dreimer] 27559: - Set eol:style native - New RC File Standard counts here too.
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 16:33:56 2007 New Revision: 27559 URL: http://svn.reactos.org/svn/reactos?rev=27559&view=rev Log: - Set eol:style native - New RC File Standard counts here too. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (contents, props changed) Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Jul 10 16:33:56 2007 @@ -1,20 +1,20 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RosBE Einstellungen" -FONT 8, "MS Shell Dlg" -{ - // x, pos_hight, width, hight - LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 130, 13 - LTEXT "Schriftfarbe", 0x0, 10, 35, 114, 13 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Hintergrundfarbe", 0x0, 10, 70, 114, 13 - COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 - EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP - PUSHBUTTON "Speichern", ID_OK, 92, 160, 59, 26, WS_TABSTOP - PUSHBUTTON "Abbrechen", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP -} +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE Einstellungen" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 130, 13 + LTEXT "Schriftfarbe", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Hintergrundfarbe", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Speichern", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Abbrechen", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP +} Propchange: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Tue Jul 10 16:33:56 2007 @@ -1,20 +1,20 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RosBE Settings" -FONT 8, "MS Shell Dlg" -{ - // x, pos_hight, width, hight - LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 130, 13 - LTEXT "Font Color", 0x0, 10, 35, 114, 13 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Background Color", 0x0, 10, 70, 114, 13 - COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 - CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 - EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP - PUSHBUTTON "Save", ID_OK, 92, 160, 59, 26, WS_TABSTOP - PUSHBUTTON "Cancel", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP -} +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE Settings" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 130, 13 + LTEXT "Font Color", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Background Color", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Cancel", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP +} Propchange: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 27558: SUBLANG fixes for rosapps
by cfinck＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: cfinck Date: Tue Jul 10 16:20:59 2007 New Revision: 27558 URL: http://svn.reactos.org/svn/reactos?rev=27558&view=rev Log: SUBLANG fixes for rosapps Modified: trunk/rosapps/downloader/translations/de.rc trunk/rosapps/downloader/translations/fr.rc trunk/rosapps/downloader/translations/it.rc trunk/rosapps/fontview/lang/de-DE.rc trunk/rosapps/fontview/lang/fr-FR.rc trunk/rosapps/imagesoft/lang/it-IT.rc trunk/rosapps/imagesoft/lang/nb-NO.rc trunk/rosapps/packmgr/gui/de.rc trunk/rosapps/sysutils/ctm/De.rc trunk/rosapps/sysutils/ctm/Fr.rc trunk/rosapps/winefile/lang/de-DE.rc trunk/rosapps/winefile/lang/es-ES.rc trunk/rosapps/winefile/lang/fr-FR.rc trunk/rosapps/winefile/lang/it-IT.rc trunk/rosapps/winefile/lang/nb-NO.rc trunk/rosapps/winefile/lang/nl-NL.rc trunk/rosapps/winefile/lang/pt-PT.rc trunk/rosapps/winefile/lang/sv-SE.rc Modified: trunk/rosapps/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/de… ============================================================================== --- trunk/rosapps/downloader/translations/de.rc (original) +++ trunk/rosapps/downloader/translations/de.rc Tue Jul 10 16:20:59 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +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 Modified: trunk/rosapps/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/fr… ============================================================================== --- trunk/rosapps/downloader/translations/fr.rc (original) +++ trunk/rosapps/downloader/translations/fr.rc Tue Jul 10 16:20:59 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +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 Modified: trunk/rosapps/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/it… ============================================================================== --- trunk/rosapps/downloader/translations/it.rc (original) +++ trunk/rosapps/downloader/translations/it.rc Tue Jul 10 16:20:59 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +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 Modified: trunk/rosapps/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/de-DE.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/de-DE.rc (original) +++ trunk/rosapps/fontview/lang/de-DE.rc Tue Jul 10 16:20:59 2007 @@ -2,7 +2,7 @@ #include "windows.h" #include "../resource.h" -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/rosapps/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/fr-FR.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/fr-FR.rc (original) +++ trunk/rosapps/fontview/lang/fr-FR.rc Tue Jul 10 16:20:59 2007 @@ -2,7 +2,7 @@ #include "windows.h" #include "../resource.h" -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/rosapps/imagesoft/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/it-IT.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/it-IT.rc (original) +++ trunk/rosapps/imagesoft/lang/it-IT.rc Tue Jul 10 16:20:59 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN Modified: trunk/rosapps/imagesoft/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/nb-NO.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/nb-NO.rc (original) +++ trunk/rosapps/imagesoft/lang/nb-NO.rc Tue Jul 10 16:20:59 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN Modified: trunk/rosapps/packmgr/gui/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/de.rc?rev=2755… ============================================================================== --- trunk/rosapps/packmgr/gui/de.rc (original) +++ trunk/rosapps/packmgr/gui/de.rc Tue Jul 10 16:20:59 2007 @@ -1,5 +1,5 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Dialogs */ IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200 Modified: trunk/rosapps/sysutils/ctm/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/De.rc?rev=275… ============================================================================== --- trunk/rosapps/sysutils/ctm/De.rc (original) +++ trunk/rosapps/sysutils/ctm/De.rc Tue Jul 10 16:20:59 2007 @@ -1,6 +1,6 @@ // German (Germany) resources -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN Modified: trunk/rosapps/sysutils/ctm/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/Fr.rc?rev=275… ============================================================================== --- trunk/rosapps/sysutils/ctm/Fr.rc (original) +++ trunk/rosapps/sysutils/ctm/Fr.rc Tue Jul 10 16:20:59 2007 @@ -1,6 +1,6 @@ // French (France) resources -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN Modified: trunk/rosapps/winefile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/de-DE.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/de-DE.rc (original) +++ trunk/rosapps/winefile/lang/de-DE.rc Tue Jul 10 16:20:59 2007 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(1252) Modified: trunk/rosapps/winefile/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/es-ES.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/es-ES.rc (original) +++ trunk/rosapps/winefile/lang/es-ES.rc Tue Jul 10 16:20:59 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ Modified: trunk/rosapps/winefile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/fr-FR.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/fr-FR.rc (original) +++ trunk/rosapps/winefile/lang/fr-FR.rc Tue Jul 10 16:20:59 2007 @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ Modified: trunk/rosapps/winefile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/it-IT.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/it-IT.rc (original) +++ trunk/rosapps/winefile/lang/it-IT.rc Tue Jul 10 16:20:59 2007 @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* Menu */ Modified: trunk/rosapps/winefile/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nb-NO.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/nb-NO.rc (original) +++ trunk/rosapps/winefile/lang/nb-NO.rc Tue Jul 10 16:20:59 2007 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL #pragma code_page(850) Modified: trunk/rosapps/winefile/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nl-NL.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/nl-NL.rc (original) +++ trunk/rosapps/winefile/lang/nl-NL.rc Tue Jul 10 16:20:59 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* Menu */ Modified: trunk/rosapps/winefile/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pt-PT.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/pt-PT.rc (original) +++ trunk/rosapps/winefile/lang/pt-PT.rc Tue Jul 10 16:20:59 2007 @@ -23,7 +23,7 @@ /* Menu */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_WINEFILE MENU FIXED IMPURE { Modified: trunk/rosapps/winefile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sv-SE.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/sv-SE.rc (original) +++ trunk/rosapps/winefile/lang/sv-SE.rc Tue Jul 10 16:20:59 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL #pragma code_page(1252)

1 0

[cfinck] 27557: Change the sublanguage of "nl-NL.rc" to SUBLANG_NEUTRAL again, since LANG_DUTCH has two sublanguages (SUBLANG_DUTCH and SUBLANG_DUTCH_BELGIAN) This reverts tkreuzer's change in r27541
by cfinck＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: cfinck Date: Tue Jul 10 14:16:07 2007 New Revision: 27557 URL: http://svn.reactos.org/svn/reactos?rev=27557&view=rev Log: Change the sublanguage of "nl-NL.rc" to SUBLANG_NEUTRAL again, since LANG_DUTCH has two sublanguages (SUBLANG_DUTCH and SUBLANG_DUTCH_BELGIAN) This reverts tkreuzer's change in r27541 Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc Tue Jul 10 14:16:07 2007 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Regedit (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS {

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007