Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[hpoussin] 35072: Use generic .spec file instead of arch specific .def file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 3 11:16:09 2008 New Revision: 35072 URL: http://svn.reactos.org/svn/reactos?rev=35072&view=rev Log: Use generic .spec file instead of arch specific .def file Removed: trunk/reactos/hal/hal/hal_arm.def Modified: trunk/reactos/hal/halarm/up/halup.rbuild Removed: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=35… ============================================================================== --- trunk/reactos/hal/hal/hal_arm.def [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal_arm.def (removed) @@ -1,101 +1,0 @@ -; Hardware Abstraction Layer - ReactOS Operating System - -LIBRARY hal.dll - -EXPORTS -ExAcquireFastMutex=ExiAcquireFastMutex -ExReleaseFastMutex=ExiReleaseFastMutex -ExTryToAcquireFastMutex=ExiTryToAcquireFastMutex -HalClearSoftwareInterrupt -HalRequestSoftwareInterrupt -HalSystemVectorDispatchEntry -KeAcquireInStackQueuedSpinLock -KeAcquireInStackQueuedSpinLockRaiseToSynch -KeAcquireSpinLockRaiseToSynch -KeAcquireQueuedSpinLock -KeAcquireQueuedSpinLockRaiseToSynch -KeReleaseInStackQueuedSpinLock -KeReleaseQueuedSpinLock -KeTryToAcquireQueuedSpinLock -KeTryToAcquireQueuedSpinLockRaiseToSynch -KfAcquireSpinLock -KfLowerIrql -KfRaiseIrql -KfReleaseSpinLock - -HalAcquireDisplayOwnership -HalAdjustResourceList -HalAllProcessorsStarted -HalAllocateAdapterChannel -HalAllocateCommonBuffer -HalAllocateCrashDumpRegisters -HalAssignSlotResources -HalBeginSystemInterrupt -HalCalibratePerformanceCounter -HalDisableSystemInterrupt -HalDisplayString -HalEnableSystemInterrupt -HalEndSystemInterrupt -HalFlushCommonBuffer -HalFreeCommonBuffer -HalGetAdapter -HalGetBusData -HalGetBusDataByOffset -HalGetEnvironmentVariable -HalGetInterruptSource -HalGetInterruptVector -HalHandleNMI -HalInitSystem -HalInitializeProcessor -HalMakeBeep -HalProcessorIdle -HalQueryDisplayParameters -HalQueryRealTimeClock -HalReadDmaCounter -HalReportResourceUsage -HalRequestIpi -HalReturnToFirmware -HalSetBusData -HalSetBusDataByOffset -HalSetDisplayParameters -HalSetEnvironmentVariable -HalSetProfileInterval -HalSetRealTimeClock -HalSetTimeIncrement -HalStartNextProcessor -HalStartProfileInterrupt -HalStopProfileInterrupt -HalSweepIcache -HalSweepDcache -HalTranslateBusAddress -IoAssignDriveLetters=HalpAssignDriveLetters -IoFlushAdapterBuffers -IoFreeAdapterChannel -IoFreeMapRegisters -IoMapTransfer -IoReadPartitionTable=HalpReadPartitionTable -IoSetPartitionInformation=HalpSetPartitionInformation -IoWritePartitionTable=HalpWritePartitionTable -KeAcquireSpinLock -KdComPortInUse=_KdComPortInUse DATA -KeFlushWriteBuffer -KeGetCurrentIrql -KeLowerIrql -KeQueryPerformanceCounter -KeRaiseIrql -KeRaiseIrqlToDpcLevel -KeRaiseIrqlToSynchLevel -KeReleaseSpinLock -KeStallExecutionProcessor -READ_PORT_BUFFER_UCHAR -READ_PORT_BUFFER_ULONG -READ_PORT_BUFFER_USHORT -READ_PORT_UCHAR -READ_PORT_ULONG -READ_PORT_USHORT -WRITE_PORT_BUFFER_UCHAR -WRITE_PORT_BUFFER_ULONG -WRITE_PORT_BUFFER_USHORT -WRITE_PORT_UCHAR -WRITE_PORT_ULONG -WRITE_PORT_USHORT Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Sun Aug 3 11:16:09 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> - <importlibrary definition="../../hal/hal_arm.def" /> + <importlibrary base="hal" definition="hal.spec.def" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halarm_generic">../include</include> <include base="ntoskrnl">include</include>

16 years, 4 months

[hpoussin] 35071: Better support for kill_at option in fastcall entry points

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 3 11:12:02 2008 New Revision: 35071 URL: http://svn.reactos.org/svn/reactos?rev=35071&view=rev Log: Better support for kill_at option in fastcall entry points Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] Sun Aug 3 11:12:02 2008 @@ -611,15 +611,21 @@ case TYPE_FASTCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); - output( " @%s", name ); + output( " " ); + if (!kill_at) output( "@" ); + output( "%s", name ); if (!kill_at) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { - output( "=@%s", odp->link_name ); + output( "=" ); + if (!kill_at) output( "@" ); + output( "%s", odp->link_name ); } else if (strcmp(name, odp->link_name)) /* try to reduce output */ { - output( "=@%s", odp->link_name ); + output( "=" ); + if (!kill_at) output( "@" ); + output( "%s", odp->link_name ); if (!kill_at) output( "@%d", at_param ); } break;

16 years, 4 months

[fireball] 35070: - Add dosfsck to the bootcd.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 08:53:41 2008 New Revision: 35070 URL: http://svn.reactos.org/svn/reactos?rev=35070&view=rev Log: - Add dosfsck to the bootcd. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Aug 3 08:53:41 2008 @@ -586,7 +586,7 @@ modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional modules\rosapps\applications\net\niclist\niclist.exe 1 optional -modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional +modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional modules\rosapps\applications\notevil\notevil.exe 1 optional modules\rosapps\applications\magnify\magnify.exe 1 optional modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional @@ -596,6 +596,7 @@ modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\applications\sysutils\dosfsck\dosfsck.exe 1 optional modules\rosapps\applications\sysutils\kill\kill.exe 1 optional modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\applications\sysutils\man\man.exe 1 optional @@ -603,7 +604,7 @@ modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional +modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional

16 years, 4 months

[pschweitzer] 35069: Updated French translation for Shell32.dll by Amine Khaldi

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Aug 3 08:53:37 2008 New Revision: 35069 URL: http://svn.reactos.org/svn/reactos?rev=35069&view=rev Log: Updated French translation for Shell32.dll by Amine Khaldi Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Aug 3 08:53:37 2008 @@ -278,7 +278,7 @@ LTEXT "Type :", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "Système de fichier :", -1, 15, 70, 100, 10 + LTEXT "Système de fichiers :", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 @@ -333,7 +333,7 @@ BEGIN LTEXT "Quel compte d'utilisateur désirez-vous utiliser pour lancer ce programme?", -1, 10, 20, 220, 20 CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10 - LTEXT "Protéger mon ordinateur et mes données de l'activé de programme non autorisés", -1, 25, 57, 200, 10, WS_DISABLED + LTEXT "Protéger mon ordinateur et mes données des activités des programmes non autorisés", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "L'utilisateur suivant :", 14002, 10, 100, 90, 10 LTEXT "Nom d'utilisateur :", -1, 20, 118, 54, 10 @@ -385,8 +385,8 @@ GROUPBOX "Tâches", -1, 7, 10, 249, 45 //ICON -AUTORADIOBUTTON "Montrer les tâches communes dans les dossiers", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Utilisez les dossiers ReactOS class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", 14001, 40, 25, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", 14004, 40, 70, 140, 10, WS_TABSTOP @@ -394,9 +394,9 @@ GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60 //ICON AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", 14007, 40, 120, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Toujours souligner les titres des icônes avec mon navigateur", 14008, 50, 132, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", 14008, 50, 132, 170, 10, WS_TABSTOP AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour sélectionner)", 14010, 40, 156, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", 14010, 40, 156, 170, 10, WS_TABSTOP PUSHBUTTON "Pa&ramètres par défaut", 14011, 180, 180, 60, 14, WS_TABSTOP END @@ -417,19 +417,19 @@ FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Types de fichier" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -LTEXT "&Types de fichier enregistrés :", -1, 7, 10, 70, 10 +CAPTION "Types de fichiers" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "&Types de fichiers enregistrés :", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Détails pour l'extension '%s'", 14003, 7, 130, 249, 70 +GROUPBOX "Détails concernant l'extension '%s'", 14003, 7, 130, 249, 70 LTEXT "Ouvrir avec :", -1, 12, 140, 40, 10 //ICON LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Changer...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Les fichiers avec l'extension '%s' sont du type '%s'. Pour\nchanger les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 +PUSHBUTTON "&Modifier...", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "Les fichiers avec l'extension '%s' sont de type '%s'. Pour\nmodifier les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -481,7 +481,7 @@ CAPTION "Exécution automatique" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Sélectionnez un type de contenu, puis choisissez une action que ReactOS réalisera automatiquement que ce type sera utilisé dans ce périphérique :", 1000, 7, 7, 215, 20 + LTEXT "Sélectionnez un type de contenu, puis choisissez une action que ReactOS réalisera automatiquement quand ce type sera utilisé dans ce périphérique :", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 GROUPBOX "Actions", -1, 7, 45, 212, 146 AUTORADIOBUTTON "Sélectionnez une action à réaliser :", 1005, 14, 54, 202, 10, WS_GROUP @@ -496,7 +496,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "Ce disque ou dispositif contient plus d'un type de fichier.", 1001, 32, 7, 191, 20 + LTEXT "Ce disque ou dispositif contient plus d'un type de fichiers.", 1001, 32, 7, 191, 20 LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 @@ -556,7 +556,7 @@ PUSHBUTTON "Fermer", IDCANCEL, 118, 198, 60, 14 LTEXT "Ca&pacité :", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Système de fichier", -1, 7, 35, 170, 9 + LTEXT "Système de fichiers", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 LTEXT "Taille d'unité d'&allocation", -1, 7, 64, 170, 9 @@ -603,7 +603,7 @@ IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" - IDS_CONTROLPANEL "Panneau de contrôle" + IDS_CONTROLPANEL "Panneau de configuration" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes"

16 years, 4 months

[fireball] 35068: - Fix a typo, now dosfsck really performs writes (and actually works).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 08:20:44 2008 New Revision: 35068 URL: http://svn.reactos.org/svn/reactos?rev=35068&view=rev Log: - Fix a typo, now dosfsck really performs writes (and actually works). Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 08:20:44 2008 @@ -181,7 +181,7 @@ if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); /* Patch data in memory */ - memcpy(data, (char *)scratch+seek_delta, size); + memcpy((char *)scratch+seek_delta, data, size); } /* Write it back */

16 years, 4 months

[fireball] 35067: - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 07:50:10 2008 New Revision: 35067 URL: http://svn.reactos.org/svn/reactos?rev=35067&view=rev Log: - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list. Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -24,7 +24,7 @@ #include "check.h" -int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0; +int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0; int atari_format = 0; unsigned n_files = 0; void *mem_queue = NULL; Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -162,7 +162,7 @@ #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed,no_change_list; +extern int interactive,list,verbose,test,write_immed; extern int atari_format; extern unsigned n_files; extern void *mem_queue; Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -194,16 +194,14 @@ die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - if (!no_change_list) - { - new = alloc(sizeof(CHANGE)); - new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); - new->next = NULL; - if (last) last->next = new; - else changes = new; - last = new; - } + new = alloc(sizeof(CHANGE)); + new->pos = pos; + memcpy(new->data = alloc(new->size = size),data,size); + new->next = NULL; + if (last) last->next = new; + else changes = new; + last = new; + #else //SAE if (write_immed) { did_change = 1; @@ -230,7 +228,6 @@ int old_write_immed = write_immed; /* Disable writes to the list now */ - no_change_list = 1; write_immed = 1; while (changes) { @@ -255,7 +252,6 @@ } /* Restore values */ - no_change_list = 0; write_immed = old_write_immed; }

16 years, 4 months

[fireball] 35066: - Fix warnings in io.c.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 07:46:43 2008 New Revision: 35066 URL: http://svn.reactos.org/svn/reactos?rev=35066&view=rev Log: - Fix warnings in io.c. Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:46:43 2008 @@ -68,7 +68,7 @@ #endif #define llseek WIN32llseek -static int is_device = 0; +//static int is_device = 0; void fs_open(char *path,int rw) { @@ -139,8 +139,6 @@ #if 1 // TMN const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const loff_t seekpos_aligned = pos - (pos % 512); // TMN: - const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: scratch = alloc(readsize_aligned); if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned; @@ -166,7 +164,6 @@ const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; const loff_t seekpos_aligned = pos - (pos % 512); const size_t seek_delta = (size_t)(pos - seekpos_aligned); - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0); /* Aloc temp buffer if write is not aligned */ @@ -184,7 +181,7 @@ if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); /* Patch data in memory */ - memcpy(data, scratch+seek_delta, size); + memcpy(data, (char *)scratch+seek_delta, size); } /* Write it back */ @@ -229,7 +226,7 @@ static void fs_flush(void) { CHANGE *this; - int size; + //int size; int old_write_immed = write_immed; /* Disable writes to the list now */ @@ -300,9 +297,9 @@ static int WIN32open(const char *path, int oflag, ...) { HANDLE fh; - DWORD desiredAccess; - DWORD shareMode; - DWORD creationDisposition; + DWORD desiredAccess = 0; + DWORD shareMode = 0; + DWORD creationDisposition = 0; DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL; SECURITY_ATTRIBUTES securityAttributes; va_list ap;

16 years, 4 months

[fireball] 35065: - Add proper write support. - Change fs_flush logic, so it reuses the same fs_write routine instead of duplicating code. - RosBE supports %I64d, so use it instead of %lld.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 07:24:15 2008 New Revision: 35065 URL: http://svn.reactos.org/svn/reactos?rev=35065&view=rev Log: - Add proper write support. - Change fs_flush logic, so it reuses the same fs_write routine instead of duplicating code. - RosBE supports %I64d, so use it instead of %lld. Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -24,7 +24,7 @@ #include "check.h" -int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0; +int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0; int atari_format = 0; unsigned n_files = 0; void *mem_queue = NULL; Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -162,7 +162,7 @@ #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed; +extern int interactive,list,verbose,test,write_immed,no_change_list; extern int atari_format; extern unsigned n_files; extern void *mem_queue; Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -107,13 +107,8 @@ const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: char* tmpBuf = malloc(readsize_aligned); // TMN: -#ifdef _MSC_VER if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); - if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64dd",size,pos); -#else - if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); - if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %lld",size,pos); -#endif + if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64d",size,pos); assert(got >= size); got = size; assert(seek_delta + size <= readsize); @@ -123,7 +118,7 @@ if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); if ((got = read(fd,data,size)) < 0) pdie("Read %d bytes at %lld",size,pos); #endif // TMN: - if (got != size) die("Got %d bytes instead of %d at %lld",got,size,pos); + if (got != size) die("Got %d bytes instead of %d at %I64d",got,size,pos); for (walk = changes; walk; walk = walk->next) { if (walk->pos < pos+size && walk->pos+walk->size > pos) { if (walk->pos < pos) @@ -166,32 +161,52 @@ int did; #if 1 //SAE - void *scratch; - const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; - const loff_t seekpos_aligned = pos - (pos % 512); - const size_t seek_delta = (size_t)(pos - seekpos_aligned); - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; - scratch = alloc(readsize_aligned); - if (write_immed) { - did_change = 1; - if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); - if ((did = write(fd,data,readsize_aligned)) == (int)readsize_aligned) - { - free(scratch); - return; - } - if (did < 0) pdie("Write %d bytes at %lld",size,pos); - die("Wrote %d bytes instead of %d at %lld",did,size,pos); + void *scratch; + const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; + const loff_t seekpos_aligned = pos - (pos % 512); + const size_t seek_delta = (size_t)(pos - seekpos_aligned); + const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; + boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0); + + /* Aloc temp buffer if write is not aligned */ + if (use_read) + scratch = alloc(readsize_aligned); + else + scratch = data; + + did_change = 1; + if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",seekpos_aligned); + + if (use_read) + { + /* Read aligned data */ + if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); + + /* Patch data in memory */ + memcpy(data, scratch+seek_delta, size); + } + + /* Write it back */ + if ((did = write(fd,scratch,readsize_aligned)) == (int)readsize_aligned) + { + if (use_read) free(scratch); + return; + } + if (did < 0) pdie("Write %d bytes at %I64d",size,pos); + die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - new = alloc(sizeof(CHANGE)); - new->pos = pos; - memcpy(new->data = alloc(new->size = readsize_aligned),data,readsize_aligned); - new->next = NULL; - if (last) last->next = new; - else changes = new; - last = new; - + + if (!no_change_list) + { + new = alloc(sizeof(CHANGE)); + new->pos = pos; + memcpy(new->data = alloc(new->size = size),data,size); + new->next = NULL; + if (last) last->next = new; + else changes = new; + last = new; + } #else //SAE if (write_immed) { did_change = 1; @@ -215,10 +230,16 @@ { CHANGE *this; int size; + int old_write_immed = write_immed; + + /* Disable writes to the list now */ + no_change_list = 1; + write_immed = 1; while (changes) { this = changes; changes = changes->next; +#if 0 if (llseek(fd,this->pos,0) != this->pos) fprintf(stderr,"Seek to %lld failed: %s\n Did not write %d bytes.\n", (__int64)this->pos,strerror(errno),this->size); @@ -228,9 +249,17 @@ else if (size != this->size) fprintf(stderr,"Wrote %d bytes instead of %d bytes at %lld." "\n",size,this->size,(__int64)this->pos); +#else + fs_write(this->pos, this->size, this->data); +#endif + free(this->data); free(this); } + + /* Restore values */ + no_change_list = 0; + write_immed = old_write_immed; }

16 years, 4 months

[fireball] 35064: - Revert 35039 on hpoussin's request.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 3 06:14:34 2008 New Revision: 35064 URL: http://svn.reactos.org/svn/reactos?rev=35064&view=rev Log: - Revert 35039 on hpoussin's request. Modified: trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sun Aug 3 06:14:34 2008 @@ -3299,9 +3299,8 @@ print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", iface, name, callback_offset); print_file(file, 0, "{\n"); - print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", - is_struct(eval->structure->type) ? "struct " : "", name, var_name, - is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); + print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", + name, var_name, name, eval->baseoff); print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); write_struct_expr(file, eval->expr, 1, fields, var_name); Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Sun Aug 3 06:14:34 2008 @@ -46,22 +46,6 @@ print_server("#include \"%s\"\n", header_name); fprintf(server, "\n"); } -Index: typegen.c -=================================================================== ---- typegen.c (revision 32187) -+++ typegen.c (working copy) -@@ -3299,8 +3299,9 @@ - print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", - iface, name, callback_offset); - print_file(file, 0, "{\n"); -- print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", -- name, var_name, name, eval->baseoff); -+ print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", -+ is_struct(eval->structure->type) ? "struct " : "", name, var_name, -+ is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); - print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ - print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); - write_struct_expr(file, eval->expr, 1, fields, var_name); Index: typelib.c =================================================================== --- typelib.c (revision 32187)

16 years, 4 months

[hpoussin] 35063: Workaround WIDL bug

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 3 06:06:40 2008 New Revision: 35063 URL: http://svn.reactos.org/svn/reactos?rev=35063&view=rev Log: Workaround WIDL bug Modified: trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Aug 3 06:06:40 2008 @@ -38,8 +38,10 @@ SECURITY_DESCRIPTOR_CONTROL Control; PRPC_SID Owner; PRPC_SID Group; - PLSAPR_ACL Sacl; - PLSAPR_ACL Dacl; + LSAPR_ACL *Sacl; + /* FIXME: should be PLSAPR_ACL Sacl; */ + LSAPR_ACL *Dacl; + /* FIXME: should be PLSAPR_ACL Dacl; */ } LSAPR_SECURITY_DESCRIPTOR, *PLSAPR_SECURITY_DESCRIPTOR; cpp_quote("#if 0");

16 years, 4 months

← Newer
1
...
75
76
77
78
79
80
81
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008