Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [TRANSLATION] Fix a few bits in shortcuts French translation.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4035f79ac62d526c1f142… commit 4035f79ac62d526c1f14244599aba7fcbf786dd7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 14:30:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 14:30:05 2018 +0100 [TRANSLATION] Fix a few bits in shortcuts French translation. --- media/inf/shortcuts.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 422919d8b4..d0ecb7a052 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -538,7 +538,7 @@ CALC_DESC=Lancer la Calculatrice NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Lancer l'Éditeur de Texte MSTSC_TITLE=Bureau Distant -MSTSC_DESC=Launch Remote Desktop Connection +MSTSC_DESC=Lancer l'outil de connexion distante WORDPAD_TITLE=WordPad WORDPAD_DESC=Lancer l'Éditeur de Documents MSPAINT_TITLE=Paint @@ -559,7 +559,7 @@ MAGNIFY_TITLE=Loupe MAGNIFY_DESC=Loupe OSK_TITLE=Clavier visuel OSK_DESC=Lancement Sur le Clavier d'Écran -MPLAY_TITLE=Multimedia Player +MPLAY_TITLE=Lecteur multimédia MPLAY_DESC=Lancer le lecteur multimédia SNDVOL_TITLE=Contrôleur de volume SNDVOL_DESC=Lancer le contrôleur de volume

6 years, 11 months

01/01: [TRANSLATION] Polish translation update (#328)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbcf05062e6da49247743… commit fbcf05062e6da492477438727f9d31c1ac47fa4b Author: Adam Słaboń <32551254+archeYR(a)users.noreply.github.com> AuthorDate: Sat Jan 27 13:21:22 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 13:21:22 2018 +0100 [TRANSLATION] Polish translation update (#328) --- boot/bootdata/hivesys.inf | 4 ++-- dll/cpl/access/lang/pl-PL.rc | 4 ++-- dll/cpl/desk/lang/pl-PL.rc | 4 ++-- dll/cpl/powercfg/lang/pl-PL.rc | 8 ++++---- dll/cpl/usrmgr/lang/pl-PL.rc | 4 ++-- dll/shellext/stobject/lang/pl-PL.rc | 10 +++++----- dll/win32/shell32/lang/pl-PL.rc | 18 +++++++++--------- dll/win32/syssetup/lang/pl-PL.rc | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 692cba2cc6..07e98be494 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2272,7 +2272,7 @@ VIETNAMESE = "Vietnamese" ; Services names and descriptions AUDIO_SERVICE="Usługa Audio" -AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio" +AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio." BITS_SERVICE="Usługa inteligentnego transferu w tle" BITS_SERVICE_DESCRIPTION="Przenosi dane pomiędzy klientami a serwerami w tle." @@ -2308,7 +2308,7 @@ TELNETD_SERVICE="Usługa ReactOS Telnet" TELNETD_SERVICE_DESCRIPTION="Usługa ReactOS Telnet" THEMES_SERVICE="Motywy" -THEMES_SERVICE_DESCRIPTION="Oferuje wsparcie dla motywów" +THEMES_SERVICE_DESCRIPTION="Oferuje wsparcie dla motywów." WINMGMT_SERVICE="Infrastruktura zarządzania ReactOS" WINMGMT_SERVICE_DESCRIPTION="Dostarcza interfejs w celu uzyskiwania dostępu do informacji zarządzania o systemie operacyjnym, urządzeniach, aplikacjach i usługach." diff --git a/dll/cpl/access/lang/pl-PL.rc b/dll/cpl/access/lang/pl-PL.rc index 1d31fe5d1b..ceb5b4f254 100644 --- a/dll/cpl/access/lang/pl-PL.rc +++ b/dll/cpl/access/lang/pl-PL.rc @@ -54,7 +54,7 @@ CAPTION "Ekran" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Wysoki Kontrast", -1, 6, 11, 248, 62 - LTEXT "Użyj tej funkcji, jeśli chcesz, żeby ReactOS używał kolorów i czcionek zaprojektowanych do łatwego czytania", + LTEXT "Użyj tej funkcji, jeśli chcesz, żeby ReactOS używał kolorów i czcionek zaprojektowanych do łatwego czytania.", -1, 12, 20, 238, 29 AUTOCHECKBOX "&Użyj funkcji Wysoki Kontrast", IDC_CONTRAST_BOX, 12, 49, 126, 14 PUSHBUTTON "U&stawienia", IDC_CONTRAST_BUTTON, 154, 49, 90, 14 @@ -248,7 +248,7 @@ BEGIN GROUPBOX "Klawisze powtarzane", -1, 6, 11, 234, 106 LTEXT "Zastąp ustawienia Klawiatury w Panelu Sterowania:", -1, 12, 20, 222, 20 - AUTORADIOBUTTON "&Bez powtarzania klawiszy", IDC_REPEAT_NOREPEAT_RADIO, 12, 32, 78, 11, WS_GROUP + AUTORADIOBUTTON "&Bez powtarzania klawiszy", IDC_REPEAT_NOREPEAT_RADIO, 12, 32, 98, 11, WS_GROUP AUTORADIOBUTTON "&Zmniejsz częstotliwość powtarzania", IDC_REPEAT_REPEAT_RADIO, 12, 45, 131, 11 LTEXT "O&późnienie powtarzania:", -1, 24, 60, 60, 11 COMBOBOX IDC_REPEAT_DELAY_COMBO, 24, 71, 210, 56, diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 3702194b57..dac056c9a6 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -118,7 +118,7 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ukryj podkreślenie liter do nawigacji &klawiaturą, dopóki nie nacisnę klawisza Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Użyj płaskich &menu", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Anuluj", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 @@ -215,7 +215,7 @@ BEGIN IDS_CPLNAME "Ekran" IDS_CPLDESCRIPTION "Dostosowuje wygląd pulpitu oraz wygaszacze." IDS_NONE "(brak)" - IDS_CENTER "Do środka" + IDS_CENTER "Wyśrodkuj" IDS_STRETCH "Rozciągnij" IDS_TILE "Sąsiadująco" IDS_FIT "Dopasuj" diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index fe168395f8..d8659f742e 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -25,16 +25,16 @@ BEGIN ICON IDI_AC, IDC_IAC, 75, 115, 25, 15 LTEXT "Zasilany akumulatorem", IDC_SDC, 197, 120, 45, 15 ICON IDI_DC, IDC_IDC, 165, 115, 25, 15 - LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 145, 80, 10 + LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 142, 80, 10 COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 160, 80, 10 + LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 157, 80, 10 COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 180, 80, 10 + LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10 COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "System &hibernuje:", IDC_HYBERNATE, 15, 195, 80, 10 + LTEXT "System &hibernuje:", IDC_HYBERNATE, 15, 192, 80, 10 COMBOBOX IDC_HYBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HYBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END diff --git a/dll/cpl/usrmgr/lang/pl-PL.rc b/dll/cpl/usrmgr/lang/pl-PL.rc index ed0e828745..eeef360f44 100644 --- a/dll/cpl/usrmgr/lang/pl-PL.rc +++ b/dll/cpl/usrmgr/lang/pl-PL.rc @@ -83,7 +83,7 @@ BEGIN GROUPBOX "Profil użytkownika", -1, 7, 7, 238, 54 LTEXT "Ścieżka profilu:", -1, 16, 22, 55, 8 EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL - LTEXT "Skrypt logowania:", -1, 16, 40, 55, 8 + LTEXT "Skrypt logowania:", -1, 16, 40, 65, 8 EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL GROUPBOX "Katalog domowy", -1, 7, 68, 238, 54 AUTORADIOBUTTON "Ścieżka lokalna:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 @@ -138,7 +138,7 @@ BEGIN RTEXT "Hasło:", -1, 7, 70, 96, 8 EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "Powtórz hasło:", -1, 7, 88, 96, 8 - AUTOCHECKBOX "Użytkownik musi zmienić hasło podczas pierwszego logowania", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 200, 10 + AUTOCHECKBOX "Użytkownik musi zmienić hasło podczas pierwszego logowania", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 220, 10 AUTOCHECKBOX "Użytkownik nie może zmienić hasła", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED AUTOCHECKBOX "Hasło nigdy nie wygasa", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED AUTOCHECKBOX "Konto jest zablokowane", IDC_USER_NEW_DISABLED, 7, 151, 200, 10 diff --git a/dll/shellext/stobject/lang/pl-PL.rc b/dll/shellext/stobject/lang/pl-PL.rc index def3249946..3f1cc8d4da 100644 --- a/dll/shellext/stobject/lang/pl-PL.rc +++ b/dll/shellext/stobject/lang/pl-PL.rc @@ -19,22 +19,22 @@ BEGIN IDS_PWR_METER "&Otwórz miernik baterii" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "Pozostało %.2f%%" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_CHARGING "%.2f%% i ładuje" IDS_PWR_UNKNOWN_REMAINING "Stan naładowania nieznany" - IDS_PWR_AC "Podłączony do zasilacza" + IDS_PWR_AC "Podłączony do zasilania" IDS_PWR_HOURS_REMAINING "Pozostało %1!u!:%2!02u! godzin (%3!u!%%)" IDS_PWR_MINUTES_REMAINING "Pozostało %1!u! minut (%2!u!%%)" //Hotplug related strings - IDS_HOTPLUG_REMOVE_1 "Bezpieczne wysuwanie sprzętu" - IDS_HOTPLUG_REMOVE_2 "&Bezpieczne wysuwanie sprzętu" + IDS_HOTPLUG_REMOVE_1 "Bezpieczne usuwanie sprzętu" + IDS_HOTPLUG_REMOVE_2 "&Bezpieczne usuwanie sprzętu" IDS_HOTPLUG_REMOVE_3 "Wysuń %s" IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" IDS_HOTPLUG_COMMA ", " IDS_HOTPLUG_DRIVE " - Dysk(%s)" IDS_HOTPLUG_DRIVES " - Dyski(%s)" IDS_HOTPLUG_A "A:" - IDS_HOTPLUG_REQUIRES "To urządzenie wymaga ""Bezpiecznego wysuwania""" + IDS_HOTPLUG_REQUIRES "To urządzenie wymaga ""Bezpiecznego usunięcia""" IDS_HOTPLUG_CLICK "Przed usunięciem tego urządzenia, kliknij na tą ikonę i wybierz urządzenie, które chcesz usunąć." //Volume related strings diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 53103de96e..450c5a88a0 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -688,8 +688,8 @@ BEGIN IDS_FORMATDRIVE "Formatuj..." IDS_RENAME "Zmień nazwę" IDS_PASTE "Włóż" - IDS_EJECT "Eject" - IDS_DISCONNECT "Disconnect" + IDS_EJECT "Wysuń" + IDS_DISCONNECT "Odłącz" IDS_CREATEFOLDER_DENIED "Nie mogę utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie mogę utworzyć folderu" @@ -783,11 +783,11 @@ BEGIN IDS_PICK_ICON_FILTER "Pliki ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Wszystkie pliki (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTLOCKVOLUME "Nie można zablokować woluminu (kod błędu: %lu)." + IDS_CANTDISMOUNTVOLUME "Nie można odmontować woluminu (kod błędu: %lu)." + IDS_CANTEJECTMEDIA "Nie można wysunąć nośnika (kod błędu: %lu)." + IDS_CANTSHOWPROPERTIES "Nie można pokazać właściwości (kod błędu: %lu)." + IDS_CANTDISCONNECT "Nie można odłączyć (kod błędu: %lu)." IDS_DIRECTORY "Katalog" IDS_BAT_FILE "Plik wsadowy ReactOS" @@ -805,8 +805,8 @@ BEGIN IDS_ICO_FILE "Ikona" IDS_INI_FILE "Ustawienia konfiguracji" IDS_LNK_FILE "Skrót" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_PIF_FILE "Plik informacyjny o programie NT VDM" + IDS_SCR_FILE "Wygaszacz ekranu" IDS_SYS_FILE "Plik systemowy" IDS_VXD_FILE "Sterownik urządzenia wirtualnego" IDS_ANY_FILE "%s-plik" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 8f3cf50f2f..3c461c668e 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -146,7 +146,7 @@ BEGIN IDS_PROCESSTITLE "Rejestracja składników" IDS_PROCESSSUBTITLE "Proszę czekać..." IDS_THEMESELECTIONTITLE "Wygląd" - IDS_THEMESELECTIONSUBTITLE "Wybierz motyw, który preferujesz" + IDS_THEMESELECTIONSUBTITLE "Wybierz motyw, który preferujesz." END STRINGTABLE

6 years, 11 months

01/01: [TRACERT] Add French translation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79887db12ec1fffdac68a… commit 79887db12ec1fffdac68abe7543d3c8602e7aab7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 13:01:45 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 13:01:45 2018 +0100 [TRACERT] Add French translation --- base/applications/network/tracert/lang/fr-FR.rc | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/base/applications/network/tracert/lang/fr-FR.rc b/base/applications/network/tracert/lang/fr-FR.rc index 69c76b536f..64763c6b87 100644 --- a/base/applications/network/tracert/lang/fr-FR.rc +++ b/base/applications/network/tracert/lang/fr-FR.rc @@ -4,23 +4,23 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ - -d Do not resolve addresses to hostnames.\r\n\ - -h maximum_hops Maximum number of hops to search for target.\r\n\ - -j host-list Loose source route along host-list.\r\n\ - -w timeout Wait timeout milliseconds for each reply.\r\n\ - -4 Force using IPv4.\r\n\ - -6 Force using IPv6.\r\n\ +Usage: tracert [-d] [-h sauts_max] [-j liste_dhôtes] [-w délai] nom_de_la_cible \r\n\r\n\ +Options :\r\n\ + -d Ne pas résoudre les adresses en noms d'hôtes.\r\n\ + -h sauts_max Nombre de sauts maximum pour atteindre la cible.\r\n\ + -j liste_dhôtes Intinéraire source imprécis dans la liste d'hôtes.\r\n\ + -w délai Délai d'expiration en millisecondes pour chaque réponse.\r\n\ + -4 Force l'utilisation d'IPv4.\r\n\ + -6 Force l'utilisation d'IPv6.\r\n\ \r\n" - IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" - IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" - IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" - IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + IDS_INVALID_OPTION "%1 n'est pas une option valide pour la commande.\r\n" + IDS_TRACE_INFO "\r\nTrace de la route vers %1 [%2]\r\nsur un maximum de %3!u! sauts:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complète.\r\n" + IDS_UNABLE_RESOLVE "Impossible de résoudre le nom système de la cible %1.\r\n" - IDS_GEN_FAILURE "General failure.\r\n" - IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" + IDS_GEN_FAILURE "Erreur générale.\r\n" + IDS_TRANSMIT_FAILED "Transmission échouée. (Erreur %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME "%1!4lu! ms %0\r\n" @@ -29,9 +29,9 @@ Options:\r\n\ IDS_HOP_RES_INFO "%1 [%2]" IDS_HOP_IP_INFO "%1" IDS_LINEBREAK "\r\n" - IDS_REQ_TIMED_OUT "Request timed out.\r\n" - IDS_HOP_RESPONSE " reports: " - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" - IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" + IDS_REQ_TIMED_OUT "Délai d'expiration dépassé pour la requête.\r\n" + IDS_HOP_RESPONSE " rapporte : " + IDS_DEST_HOST_UNREACHABLE "Hôte de destination inatteignable.\r\n" + IDS_DEST_NET_UNREACHABLE "Réseau de destination inatteignable.\r\n" END

6 years, 11 months

01/01: [PING] Complete French translation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77105d9c5b43867173ef4… commit 77105d9c5b43867173ef48e612189323bb898d8d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 12:49:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 12:49:14 2018 +0100 [PING] Complete French translation --- base/applications/network/ping/lang/fr-FR.rc | 45 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/base/applications/network/ping/lang/fr-FR.rc b/base/applications/network/ping/lang/fr-FR.rc index a42f08f554..f37d2926ca 100644 --- a/base/applications/network/ping/lang/fr-FR.rc +++ b/base/applications/network/ping/lang/fr-FR.rc @@ -13,47 +13,46 @@ Utilisation : ping [-t] [-a] [-n nombre] [-l taille] [-f] [-i TTL] [-v TOS]\n\ [-w délai] [-4] [-6] hôte-destination\n\ \n\ Options :\n\ - -t Ping the specified host until stopped.\n\ - To see statistics and continue - type Control-Break;\n\ - To stop - type Control-C.\n\ - -a Resolve addresses to hostnames.\n\ + -t Ping l'hôte spécifié tant que non interrompu.\n\ + Pour voir les statistiques et continuer - utilisez Ctrl-Arrêt;\n\ + Pour arrêter - utilisez Ctrl-C.\n\ + -a Résoudre les adresses en nom d'hôte.\n\ -n nombre Nombre de requêtes echo à envoyer.\n\ -l taille Taille du tampon d'envoi.\n\ - -f Set Don't Fragment flag in packet (IPv4-only).\n\ + -f Définir le drapeau Don't Fragment dans les paquets (IPv4 uniquement).\n\ -i TTL Time To Live.\n\ - -v TOS Type Of Service (IPv4-only. This setting has been deprecated\n\ - and has no effect on the type of service field in the IP\n\ - Header).\n\ + -v TOS Type Of Service (IPv4 uniquement. Ce paramètre est obsolète\n\ + et n'a pas d'effet sur le champ type de service dans l'en-tête IP).\n\ -w délai Délai d'attente en millisecondes pour chaque réponse.\n\ - -4 Force using IPv4.\n\ - -6 Force using IPv6.\n\ + -4 Force l'utilisation d'IPv4.\n\ + -6 Force l'utilisation d'IPv6.\n\ \n" - IDS_CTRL_BREAK "Control-Break\n" - IDS_CTRL_C "Control-C\n" + IDS_CTRL_BREAK "Ctrl-Arrêt\n" + IDS_CTRL_C "Ctrl-C\n" IDS_NO_RESOURCES "Ressources libres disponibles insuffisantes.\n" - IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %s.\n" + IDS_MISSING_ADDRESS "L'adresse IP doit être spécifiée.\n" + IDS_MISSING_VALUE "Une valeur doit être spécifie pour l'option %s.\n" IDS_BAD_OPTION "Option incorrecte %s.\n" IDS_BAD_PARAMETER "Paramètre incorrect %s.\n" IDS_BAD_VALUE "Valeur incorrecte pour l'option %s, elle doit être entre %u et %u.\n" - IDS_WRONG_FAMILY "The option %s is only supported for %s.\n" - IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n" + IDS_WRONG_FAMILY "L'option %s n'est supportée que pour %s.\n" + IDS_UNKNOWN_HOST "Ping n'a pas pu trouver l'hôte %s. Vérifiez le nom et ré-essayez.\n" IDS_PINGING_ADDRESS "\nPing de %s " IDS_PINGING_HOSTNAME "\nPing de %s [%s] " - IDS_SOURCE_ADDRESS "from %s %s" + IDS_SOURCE_ADDRESS "depuis %s %s" IDS_PING_SIZE "avec %lu octets de données :\n\n" IDS_REPLY_FROM "Réponse de %s : " IDS_REPLY_BYTES "octets=%d " IDS_REPLY_TIME_MS "durée=%lums " IDS_REPLY_TIME_0MS "durée<1ms " IDS_REPLY_TTL "TTL=%d\n" - IDS_REPLY_STATUS "Echo reply returned %lu.\n" - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_REPLY_STATUS "La réponse Echo a retourné %lu.\n" + IDS_DEST_HOST_UNREACHABLE "Hôte de destination inatteignable.\n" + IDS_DEST_NET_UNREACHABLE "Réseau de destination inatteignable.\n" IDS_REQUEST_TIMED_OUT "Expiration du délai d'attente.\n" - IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" + IDS_TTL_EXPIRED "Le TTL a expiré pendant le trajet.\n" + IDS_TRANSMIT_FAILED "PING: transmission échouée. (Erreur %u)\n" IDS_STATISTICS "\n\ Statistiques du ping de %s :\n\ @@ -62,5 +61,5 @@ Statistiques du ping de %s :\n\ IDS_APPROXIMATE_RTT "Délai approximatif de réponse en millisecondes :\n\ Minimum = %lums, Maximum = %lums, Moyenne = %lums\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n" + IDS_WINSOCK_FAIL "Erreur à l'initialisation de WinSock : %i\n" END

6 years, 11 months

01/01: [NTOSKRNL] When marking a VACB dirty on unmap/unpin, use CcRosMarkDirtyVacb(). This should help reducing race conditions with lazy writer, and thus reduce random BSODs.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3d78067abce395b79065… commit a3d78067abce395b7906598da0d85c20abd49d59 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 10:57:50 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:59:27 2018 +0100 [NTOSKRNL] When marking a VACB dirty on unmap/unpin, use CcRosMarkDirtyVacb(). This should help reducing race conditions with lazy writer, and thus reduce random BSODs. CORE-14263 --- ntoskrnl/cc/view.c | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0340c68407..706623b0a5 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -517,26 +517,25 @@ CcRosReleaseVacb ( BOOLEAN Mapped) { BOOLEAN WasDirty; - KIRQL oldIrql; ASSERT(SharedCacheMap); DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n", SharedCacheMap, Vacb, Valid); - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - Vacb->Valid = Valid; - WasDirty = Vacb->Dirty; - Vacb->Dirty = Vacb->Dirty || Dirty; - - if (!WasDirty && Vacb->Dirty) + WasDirty = FALSE; + if (Dirty) { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + if (!Vacb->Dirty && Dirty) + { + CcRosMarkDirtyVacb(Vacb); + } + else + { + WasDirty = TRUE; + } } if (Mapped) @@ -553,8 +552,6 @@ CcRosReleaseVacb ( CcRosVacbIncRefCount(Vacb); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS; @@ -676,7 +673,6 @@ CcRosUnmapVacb ( { PROS_VACB Vacb; BOOLEAN WasDirty; - KIRQL oldIrql; ASSERT(SharedCacheMap); @@ -689,21 +685,21 @@ CcRosUnmapVacb ( return STATUS_UNSUCCESSFUL; } - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - - WasDirty = Vacb->Dirty; - Vacb->Dirty = Vacb->Dirty || NowDirty; - - Vacb->MappedCount--; - - if (!WasDirty && NowDirty) + WasDirty = FALSE; + if (NowDirty) { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + if (!Vacb->Dirty && NowDirty) + { + CcRosMarkDirtyVacb(Vacb); + } + else + { + WasDirty = TRUE; + } } + Vacb->MappedCount--; + CcRosVacbDecRefCount(Vacb); if (!WasDirty && NowDirty) { @@ -714,8 +710,6 @@ CcRosUnmapVacb ( CcRosVacbDecRefCount(Vacb); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS;

6 years, 11 months

01/01: [KMTEST] TcpIpConnect: Fix harmless typos (#299)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1971137a5fe7ba52ac816… commit 1971137a5fe7ba52ac8166c8282fd71f6ce7069f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jan 27 10:50:10 2018 +0100 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Sat Jan 27 11:50:10 2018 +0200 [KMTEST] TcpIpConnect: Fix harmless typos (#299) - 1 s/ok_bool_true/ok/, overkill though harmless. - 1 s/ntohs/htons/, typo though harmless. ROSTESTS-274 --- modules/rostests/kmtests/tcpip/TcpIp_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/tcpip/TcpIp_user.c b/modules/rostests/kmtests/tcpip/TcpIp_user.c index cf699810a0..7d9fb562a9 100644 --- a/modules/rostests/kmtests/tcpip/TcpIp_user.c +++ b/modules/rostests/kmtests/tcpip/TcpIp_user.c @@ -57,7 +57,7 @@ AcceptProc( ok(Error == 0, ""); ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok_bool_true(ListenSocket != INVALID_SOCKET, "socket failed"); + ok(ListenSocket != INVALID_SOCKET, "socket failed"); ZeroMemory(&ListenAddress, sizeof(ListenAddress)); ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); @@ -77,7 +77,7 @@ AcceptProc( ok(AcceptSocket != INVALID_SOCKET, "\n"); ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress)); ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1")); - ok_eq_hex(AcceptAddress.sin_port, ntohs(TEST_CONNECT_CLIENT_PORT)); + ok_eq_hex(AcceptAddress.sin_port, htons(TEST_CONNECT_CLIENT_PORT)); return 0; }

6 years, 11 months

02/02: [CABMAN] Move CCFDATAStorage class to a separate file

by Dmitry Bagdanov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=991d33c5d1a9bb3b21c86… commit 991d33c5d1a9bb3b21c860d830231886869ce09c Author: Dmitry Bagdanov <dimbo_job(a)mail.ru> AuthorDate: Fri Jan 26 22:46:35 2018 +0700 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:42:05 2018 +0100 [CABMAN] Move CCFDATAStorage class to a separate file --- sdk/tools/cabman/CCFDATAStorage.cxx | 198 ++++++++++++++++++++++++++++++++++++ sdk/tools/cabman/CMakeLists.txt | 3 +- sdk/tools/cabman/cabinet.cxx | 172 ------------------------------- 3 files changed, 200 insertions(+), 173 deletions(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx new file mode 100644 index 0000000000..1d7ef5e64f --- /dev/null +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -0,0 +1,198 @@ +/* + * PROJECT: ReactOS cabinet manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CCFDATAStorage class implementation for Linux/Unix + * COPYRIGHT: Copyright 2017 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017 Colin Finck <mail(a)colinfinck.de> + * Copyright 2018 Dmitry Bagdanov <dimbo_job(a)mail.ru> + */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/types.h> + +#if !defined(_WIN32) +#include <dirent.h> +#endif + +#include "cabinet.h" +#include "raw.h" +#include "mszip.h" + +#if !defined(CAB_READ_ONLY) + + /** + * @name CCFDATAStorage class + * @implemented + * + * Default constructor + */ +CCFDATAStorage::CCFDATAStorage() +{ + FileHandle = NULL; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Default destructor +*/ +CCFDATAStorage::~CCFDATAStorage() +{ + ASSERT(FileHandle == NULL); +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Creates the file +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Create() +{ + if ((FileHandle = tmpfile()) == NULL) + return CAB_STATUS_CANNOT_CREATE; + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Destroys the file +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Destroy() +{ + ASSERT(FileHandle != NULL); + + fclose(FileHandle); + + FileHandle = NULL; + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Truncate the scratch file to zero bytes +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Truncate() +{ + fclose(FileHandle); + FileHandle = tmpfile(); + if (FileHandle == NULL) + { + DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); + return CAB_STATUS_FAILURE; + } + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Returns current position in file +* +* @return +* Current position +*/ +ULONG CCFDATAStorage::Position() +{ + return (ULONG)ftell(FileHandle); +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Seeks to an absolute position +* +* @param Position +* Absolute position to seek to +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Seek(LONG Position) +{ + if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) + return CAB_STATUS_FAILURE; + else + return CAB_STATUS_SUCCESS; +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Reads a CFDATA block from the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer to store data read +* +* @param BytesRead +* Pointer to buffer to write number of bytes read +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) +{ + *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); + if (*BytesRead != Data->CompSize) + return CAB_STATUS_CANNOT_READ; + + return CAB_STATUS_SUCCESS; +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Writes a CFDATA block to the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer with data to write +* +* @param BytesWritten +* Pointer to buffer to write number of bytes written +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) +{ + *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); + if (*BytesWritten != Data->CompSize) + return CAB_STATUS_CANNOT_WRITE; + + return CAB_STATUS_SUCCESS; +} + + +#endif /* CAB_READ_ONLY */ diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index baf1066ae1..f684c73f35 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -4,7 +4,8 @@ list(APPEND SOURCE dfp.cxx main.cxx mszip.cxx - raw.cxx) + raw.cxx + CCFDATAStorage.cxx) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_host_tool(cabman ${SOURCE}) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 6fbf84309a..5202404bd8 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -62,178 +62,6 @@ void DumpBuffer(void* Buffer, ULONG Size) #endif /* DBG */ #endif - /** - * @name CCFDATAStorage class - * @implemented - * - * Default constructor - */ -CCFDATAStorage::CCFDATAStorage() -{ - FileHandle = NULL; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Default destructor -*/ -CCFDATAStorage::~CCFDATAStorage() -{ - ASSERT(FileHandle == NULL); -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Creates the file -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Create() -{ - if ((FileHandle = tmpfile()) == NULL) - return CAB_STATUS_CANNOT_CREATE; - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Destroys the file -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Destroy() -{ - ASSERT(FileHandle != NULL); - - fclose(FileHandle); - - FileHandle = NULL; - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Truncate the scratch file to zero bytes -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Truncate() -{ - fclose(FileHandle); - FileHandle = tmpfile(); - if (FileHandle == NULL) - { - DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); - return CAB_STATUS_FAILURE; - } - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Returns current position in file -* -* @return -* Current position -*/ -ULONG CCFDATAStorage::Position() -{ - return (ULONG)ftell(FileHandle); -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Seeks to an absolute position -* -* @param Position -* Absolute position to seek to -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Seek(LONG Position) -{ - if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) - return CAB_STATUS_FAILURE; - else - return CAB_STATUS_SUCCESS; -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Reads a CFDATA block from the file -* -* @param Data -* Pointer to CFDATA block for the buffer -* -* @param Buffer -* Pointer to buffer to store data read -* -* @param BytesRead -* Pointer to buffer to write number of bytes read -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) -{ - *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); - if (*BytesRead != Data->CompSize) - return CAB_STATUS_CANNOT_READ; - - return CAB_STATUS_SUCCESS; -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Writes a CFDATA block to the file -* -* @param Data -* Pointer to CFDATA block for the buffer -* -* @param Buffer -* Pointer to buffer with data to write -* -* @param BytesWritten -* Pointer to buffer to write number of bytes written -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) -{ - *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); - if (*BytesWritten != Data->CompSize) - return CAB_STATUS_CANNOT_WRITE; - - return CAB_STATUS_SUCCESS; -} - #endif /* CAB_READ_ONLY */

6 years, 11 months

01/02: [CABMAN] Remove _WIN32 ifdef's

by Dmitry Bagdanov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae391dd609c33cb1fcce2… commit ae391dd609c33cb1fcce2b6415a371d8a958cc66 Author: Dmitry Bagdanov <dimbo_job(a)mail.ru> AuthorDate: Fri Jan 26 22:44:14 2018 +0700 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:42:05 2018 +0100 [CABMAN] Remove _WIN32 ifdef's --- sdk/tools/cabman/cabinet.cxx | 783 +++++++++++-------------------------------- sdk/tools/cabman/cabinet.h | 43 +-- sdk/tools/cabman/dfp.cxx | 117 ++----- sdk/tools/cabman/dfp.h | 4 +- sdk/tools/cabman/mszip.cxx | 4 +- 5 files changed, 243 insertions(+), 708 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 5e951d4968..6fbf84309a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -27,39 +27,6 @@ #include "raw.h" #include "mszip.h" -#if defined(_WIN32) -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - ULONG size = GetFileSize(handle, NULL); - if (size == INVALID_FILE_SIZE) - return -1; - - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL) != 0; -} -#else -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - LONG size; - fseek(handle, 0, SEEK_END); - size = ftell(handle); - fseek(handle, 0, SEEK_SET); - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - *bytesread = fread(buffer, 1, size, handle); - return *bytesread == size; -} -#endif - #ifndef CAB_READ_ONLY #if 0 @@ -67,7 +34,7 @@ static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG by void DumpBuffer(void* Buffer, ULONG Size) { - FILEHANDLE FileHandle; + HANDLE FileHandle; ULONG BytesWritten; /* Create file, overwrite if it already exists */ @@ -95,110 +62,76 @@ void DumpBuffer(void* Buffer, ULONG Size) #endif /* DBG */ #endif -/* CCFDATAStorage */ - -CCFDATAStorage::CCFDATAStorage() -/* - * FUNCTION: Default constructor + /** + * @name CCFDATAStorage class + * @implemented + * + * Default constructor */ +CCFDATAStorage::CCFDATAStorage() { - FileCreated = false; + FileHandle = NULL; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Default destructor +*/ CCFDATAStorage::~CCFDATAStorage() -/* - * FUNCTION: Default destructor - */ { - ASSERT(!FileCreated); + ASSERT(FileHandle == NULL); } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Creates the file +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Create() -/* - * FUNCTION: Creates the file - * ARGUMENTS: - * FileName = Pointer to name of file - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - char tmpPath[MAX_PATH]; -#endif - ASSERT(!FileCreated); - -#if defined(_WIN32) - if (GetTempPath(MAX_PATH, tmpPath) == 0) - return CAB_STATUS_CANNOT_CREATE; - if(GetTempFileName(tmpPath, "cab", 0, FullName) == 0) - return CAB_STATUS_CANNOT_CREATE; - - /* Create file, overwrite if it already exists */ - FileHandle = CreateFile(FullName, // Create this file - GENERIC_READ | GENERIC_WRITE, // Open for reading/writing - 0, // No sharing - NULL, // No security - CREATE_ALWAYS, // Create or overwrite - FILE_FLAG_SEQUENTIAL_SCAN | // Optimize for sequential scans - FILE_FLAG_DELETE_ON_CLOSE | // Delete file when closed - FILE_ATTRIBUTE_TEMPORARY, // Temporary file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("ERROR '%u'.\n", (UINT)GetLastError())); - return CAB_STATUS_CANNOT_CREATE; - } -#else /* !_WIN32 */ - /*if (tmpnam(FullName) == NULL)*/ if ((FileHandle = tmpfile()) == NULL) return CAB_STATUS_CANNOT_CREATE; - /* - FileHandle = fopen(FullName, "w+b"); - if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); - return CAB_STATUS_CANNOT_CREATE; - } - */ -#endif - - FileCreated = true; return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Destroys the file +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Destroy() -/* - * FUNCTION: Destroys the file - * RETURNS: - * Status of operation - */ { - ASSERT(FileCreated); + ASSERT(FileHandle != NULL); - CloseFile(FileHandle); + fclose(FileHandle); - FileCreated = false; + FileHandle = NULL; return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Truncate the scratch file to zero bytes +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Truncate() -/* - * FUNCTION: Truncate the scratch file to zero bytes - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if( SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - return CAB_STATUS_FAILURE; - if (!SetEndOfFile(FileHandle)) - return CAB_STATUS_FAILURE; -#else /* !_WIN32 */ fclose(FileHandle); FileHandle = tmpfile(); if (FileHandle == NULL) @@ -206,95 +139,98 @@ ULONG CCFDATAStorage::Truncate() DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); return CAB_STATUS_FAILURE; } -#endif + return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Returns current position in file +* +* @return +* Current position +*/ ULONG CCFDATAStorage::Position() -/* - * FUNCTION: Returns current position in file - * RETURNS: - * Current position - */ { -#if defined(_WIN32) - return SetFilePointer(FileHandle, 0, NULL, FILE_CURRENT); -#else return (ULONG)ftell(FileHandle); -#endif } +/** +* @name CCFDATAStorage class +* @implemented +* +* Seeks to an absolute position +* +* @param Position +* Absolute position to seek to +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Seek(LONG Position) -/* - * FUNCTION: Seeks to an absolute position - * ARGUMENTS: - * Position = Absolute position to seek to - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - Position, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - return CAB_STATUS_FAILURE; - else - return CAB_STATUS_SUCCESS; -#else if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) return CAB_STATUS_FAILURE; else return CAB_STATUS_SUCCESS; -#endif } +/** +* @name CCFDATAStorage class +* @implemented +* +* Reads a CFDATA block from the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer to store data read +* +* @param BytesRead +* Pointer to buffer to write number of bytes read +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) -/* - * FUNCTION: Reads a CFDATA block from the file - * ARGUMENTS: - * Data = Pointer to CFDATA block for the buffer - * Buffer = Pointer to buffer to store data read - * BytesWritten = Pointer to buffer to write number of bytes read - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if (!ReadFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesRead, NULL)) - return CAB_STATUS_CANNOT_READ; -#else - *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); if (*BytesRead != Data->CompSize) return CAB_STATUS_CANNOT_READ; -#endif + return CAB_STATUS_SUCCESS; } +/** +* @name CCFDATAStorage class +* @implemented +* +* Writes a CFDATA block to the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer with data to write +* +* @param BytesWritten +* Pointer to buffer to write number of bytes written +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) -/* - * FUNCTION: Writes a CFDATA block to the file - * ARGUMENTS: - * Data = Pointer to CFDATA block for the buffer - * Buffer = Pointer to buffer with data to write - * BytesWritten = Pointer to buffer to write number of bytes written - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if (!WriteFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesWritten, NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); if (*BytesWritten != Data->CompSize) return CAB_STATUS_CANNOT_WRITE; -#endif + return CAB_STATUS_SUCCESS; } @@ -351,7 +287,7 @@ CCabinet::~CCabinet() { if (CabinetReservedFileBuffer != NULL) { - FreeMemory(CabinetReservedFileBuffer); + free(CabinetReservedFileBuffer); CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; } @@ -530,7 +466,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) PSEARCH_CRITERIA Criteria; // Add the criteria to the list of search criteria - Criteria = (PSEARCH_CRITERIA)AllocateMemory(sizeof(SEARCH_CRITERIA)); + Criteria = (PSEARCH_CRITERIA)malloc(sizeof(SEARCH_CRITERIA)); if(!Criteria) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -548,7 +484,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) CriteriaListTail = Criteria; // Set the actual criteria string - Criteria->Search = (char*)AllocateMemory(strlen(SearchCriteria) + 1); + Criteria->Search = (char*)malloc(strlen(SearchCriteria) + 1); if (!Criteria->Search) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -574,8 +510,8 @@ void CCabinet::DestroySearchCriteria() { NextCriteria = Criteria->Next; - FreeMemory(Criteria->Search); - FreeMemory(Criteria); + free(Criteria->Search); + free(Criteria); Criteria = NextCriteria; } @@ -632,26 +568,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) * FileName = Pointer to string with name of cabinet reserved file */ { - FILEHANDLE FileHandle; + FILE* FileHandle; ULONG BytesRead; char* ConvertedFileName; ConvertedFileName = ConvertPath(FileName, true); -#if defined(_WIN32) - FileHandle = CreateFile(ConvertedFileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - free(ConvertedFileName); - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); - return false; - } -#else /* !_WIN32 */ + FileHandle = fopen(ConvertedFileName, "rb"); free(ConvertedFileName); if (FileHandle == NULL) @@ -659,7 +581,6 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; } -#endif CabinetReservedFileSize = GetSizeOfFile(FileHandle); if (CabinetReservedFileSize == (ULONG)-1) @@ -670,24 +591,25 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) if (CabinetReservedFileSize == 0) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - CabinetReservedFileBuffer = AllocateMemory(CabinetReservedFileSize); + CabinetReservedFileBuffer = malloc(CabinetReservedFileSize); if (!CabinetReservedFileBuffer) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - if (!ReadFileData(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, &BytesRead)) + BytesRead = fread(CabinetReservedFileBuffer, 1, CabinetReservedFileSize, FileHandle); + if( BytesRead != CabinetReservedFileSize ) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - CloseFile(FileHandle); + fclose(FileHandle); strcpy(CabinetReservedFile, FileName); @@ -733,32 +655,16 @@ ULONG CCabinet::Open() ULONG BytesRead; ULONG Size; - OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + OutputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough if (!OutputBuffer) return CAB_STATUS_NOMEMORY; -#if defined(_WIN32) - FileHandle = CreateFile(CabinetName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Cannot open file.\n")); - return CAB_STATUS_CANNOT_OPEN; - } -#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open file.\n")); return CAB_STATUS_CANNOT_OPEN; } -#endif FileOpen = true; @@ -798,19 +704,11 @@ ULONG CCabinet::Open() FolderReserved = (Size >> 16) & 0xFF; DataReserved = (Size >> 24) & 0xFF; -#if defined(_WIN32) - if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_FAILURE; - } -#else - if (fseek(FileHandle, (off_t)CabinetReserved, SEEK_CUR) != 0) + if (fseek(FileHandle, CabinetReserved, SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_FAILURE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASPREV) > 0) @@ -902,7 +800,7 @@ void CCabinet::Close() { if (FileOpen) { - CloseFile(FileHandle); + fclose(FileHandle); FileOpen = false; } } @@ -1029,7 +927,7 @@ ULONG CCabinet::ExtractFile(char* FileName) ULONG CurrentOffset; PUCHAR Buffer; PUCHAR CurrentBuffer; - FILEHANDLE DestFile; + FILE* DestFile; PCFFILE_NODE File; CFDATA CFData; ULONG Status; @@ -1073,40 +971,6 @@ ULONG CCabinet::ExtractFile(char* FileName) strcat(DestName, FileName); /* Create destination file, fail if it already exists */ -#if defined(_WIN32) - DestFile = CreateFile(DestName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_NEW, // New file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (DestFile == INVALID_HANDLE_VALUE) - { - /* If file exists, ask to overwrite file */ - if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && - (OnOverwrite(&File->File, FileName))) - { - /* Create destination file, overwrite if it already exists */ - DestFile = CreateFile(DestName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - TRUNCATE_EXISTING, // Truncate the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (DestFile == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_CREATE; - } - else - { - if (Status == ERROR_FILE_EXISTS) - return CAB_STATUS_FILE_EXISTS; - else - return CAB_STATUS_CANNOT_CREATE; - } - } -#else /* !_WIN32 */ DestFile = fopen(DestName, "rb"); if (DestFile != NULL) { @@ -1127,11 +991,11 @@ ULONG CCabinet::ExtractFile(char* FileName) if (DestFile == NULL) return CAB_STATUS_CANNOT_CREATE; } -#endif + #if defined(_WIN32) if (!DosDateTimeToFileTime(File->File.FileDate, File->File.FileTime, &FileTime)) { - CloseFile(DestFile); + fclose(DestFile); DPRINT(MIN_TRACE, ("DosDateTimeToFileTime() failed (%u).\n", (UINT)GetLastError())); return CAB_STATUS_CANNOT_WRITE; } @@ -1140,12 +1004,13 @@ ULONG CCabinet::ExtractFile(char* FileName) #else //DPRINT(MIN_TRACE, ("FIXME: DosDateTimeToFileTime\n")); #endif + SetAttributesOnFile(DestName, File->File.Attributes); - Buffer = (PUCHAR)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + Buffer = (PUCHAR)malloc(CAB_BLOCKSIZE + 12); // This should be enough if (!Buffer) { - CloseFile(DestFile); + fclose(DestFile); DPRINT(MIN_TRACE, ("Insufficient memory.\n")); return CAB_STATUS_NOMEMORY; } @@ -1154,28 +1019,13 @@ ULONG CCabinet::ExtractFile(char* FileName) OnExtract(&File->File, FileName); /* Search to start of file */ -#if defined(_WIN32) - Offset = SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN); - if (Offset == INVALID_SET_FILE_POINTER) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_FAILURE; + fclose(DestFile); + free(Buffer); + return CAB_STATUS_INVALID_CAB; } - Offset = ftell(FileHandle); -#endif Size = File->File.FileSize; Offset = File->File.FileOffset; @@ -1205,8 +1055,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1226,8 +1076,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1240,7 +1090,7 @@ ULONG CCabinet::ExtractFile(char* FileName) if (Checksum != CFData.Checksum) { CloseFile(DestFile); - FreeMemory(Buffer); + free(Buffer); DPRINT(MIN_TRACE, ("Bad checksum (is 0x%X, should be 0x%X).\n", Checksum, CFData.Checksum)); return CAB_STATUS_INVALID_CAB; @@ -1255,8 +1105,8 @@ ULONG CCabinet::ExtractFile(char* FileName) { if (strlen(DiskNext) == 0) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_NOFILE; } @@ -1274,8 +1124,8 @@ ULONG CCabinet::ExtractFile(char* FileName) Status = Open(); if (Status != CAB_STATUS_SUCCESS) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return Status; } @@ -1285,8 +1135,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (Status == CAB_STATUS_NOFILE) { DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return Status; } @@ -1294,26 +1144,13 @@ ULONG CCabinet::ExtractFile(char* FileName) File->DataBlock = CurrentFolderNode->DataListHead; /* Search to start of file */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } -#endif DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%X) Size (%u bytes) AO (0x%X) UO (0x%X).\n", (UINT)File->File.FileOffset, @@ -1333,8 +1170,8 @@ ULONG CCabinet::ExtractFile(char* FileName) Status = Codec->Uncompress(OutputBuffer, Buffer, TotalBytesRead, &BytesToWrite); if (Status != CS_SUCCESS) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MID_TRACE, ("Cannot uncompress block.\n")); if (Status == CS_NOMEMORY) return CAB_STATUS_NOMEMORY; @@ -1345,8 +1182,8 @@ ULONG CCabinet::ExtractFile(char* FileName) { DPRINT(MID_TRACE, ("BytesToWrite (%u) != CFData.UncompSize (%d)\n", (UINT)BytesToWrite, CFData.UncompSize)); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } @@ -1364,8 +1201,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1374,28 +1211,14 @@ ULONG CCabinet::ExtractFile(char* FileName) CFData.CompSize, CFData.UncompSize)); /* Go to next data block */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + - CurrentDataNode->Data.CompSize, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } -#endif ReuseBlock = false; } @@ -1417,23 +1240,17 @@ ULONG CCabinet::ExtractFile(char* FileName) (UINT)BytesSkipped, (UINT)Skip, (UINT)Size)); -#if defined(_WIN32) - if (!WriteFile(DestFile, (void*)((PUCHAR)OutputBuffer + BytesSkipped), - BytesToWrite, (LPDWORD)&BytesWritten, NULL) || - (BytesToWrite != BytesWritten)) - { - DPRINT(MIN_TRACE, ("Status 0x%X.\n", (UINT)GetLastError())); -#else BytesWritten = BytesToWrite; if (fwrite((void*)((PUCHAR)OutputBuffer + BytesSkipped), - BytesToWrite, 1, DestFile) < 1) + BytesToWrite, 1, DestFile) < 1) { -#endif - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot write to file.\n")); + return CAB_STATUS_CANNOT_WRITE; } + Size -= BytesToWrite; CurrentOffset += BytesToWrite; @@ -1443,9 +1260,9 @@ ULONG CCabinet::ExtractFile(char* FileName) } while (Size > 0); } - CloseFile(DestFile); + fclose(DestFile); - FreeMemory(Buffer); + free(Buffer); return CAB_STATUS_SUCCESS; } @@ -1510,8 +1327,8 @@ ULONG CCabinet::NewCabinet() CurrentDiskNumber = 0; - OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough - InputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + OutputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough + InputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough if ((!OutputBuffer) || (!InputBuffer)) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -1656,28 +1473,12 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (!ContinueFile) { /* Try to open file */ -#if defined(_WIN32) - SourceFile = CreateFile( - FileNode->FileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (SourceFile == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); - return CAB_STATUS_NOFILE; - } -#else /* !_WIN32 */ SourceFile = fopen(FileNode->FileName, "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_NOFILE; } -#endif if (CreateNewFolder) { @@ -1717,7 +1518,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) else BytesToRead = TotalBytesLeft; - if (!ReadFileData(SourceFile, CurrentIBuffer, BytesToRead, &BytesRead) || (BytesToRead != BytesRead)) + if ( (BytesRead = fread(CurrentIBuffer, 1, BytesToRead, SourceFile)) != BytesToRead ) { DPRINT(MIN_TRACE, ("Cannot read from file. BytesToRead (%u) BytesRead (%u) CurrentIBufferSize (%u).\n", (UINT)BytesToRead, (UINT)BytesRead, (UINT)CurrentIBufferSize)); @@ -1739,7 +1540,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (TotalBytesLeft == 0) { - CloseFile(SourceFile); + fclose(SourceFile); FileNode->Delete = true; if (FileNode->File.FileControlID > CAB_FILE_MAX_FOLDER) @@ -1870,42 +1671,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) OnCabinetName(CurrentDiskNumber, CabinetName); /* Create file, fail if it already exists */ -#if defined(_WIN32) - FileHandle = CreateFile(CabinetName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_NEW, // New file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - { - ULONG Status; - /* If file exists, ask to overwrite file */ - if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && - (OnOverwrite(NULL, CabinetName))) - { - - /* Create cabinet file, overwrite if it already exists */ - FileHandle = CreateFile(CabinetName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - TRUNCATE_EXISTING, // Truncate the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_CREATE; - } - else - { - if (Status == ERROR_FILE_EXISTS) - return CAB_STATUS_FILE_EXISTS; - else - return CAB_STATUS_CANNOT_CREATE; - } - } -#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle != NULL) { @@ -1927,7 +1692,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) if (FileHandle == NULL) return CAB_STATUS_CANNOT_CREATE; } -#endif WriteCabinetHeader(MoreDisks != 0); @@ -1953,7 +1717,7 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) FolderNode = FolderNode->Next; } - CloseFile(FileHandle); + fclose(FileHandle); ScratchFile->Truncate(); @@ -1994,13 +1758,13 @@ ULONG CCabinet::CloseCabinet() if (InputBuffer) { - FreeMemory(InputBuffer); + free(InputBuffer); InputBuffer = NULL; } if (OutputBuffer) { - FreeMemory(OutputBuffer); + free(OutputBuffer); OutputBuffer = NULL; } @@ -2026,11 +1790,11 @@ ULONG CCabinet::AddFile(char* FileName) * Status of operation */ { - FILEHANDLE SrcFile; + FILE* SrcFile; PCFFILE_NODE FileNode; char* NewFileName; - NewFileName = (char*)AllocateMemory(strlen(FileName) + 1); + NewFileName = (char*)malloc(strlen(FileName) + 1); if (!NewFileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -2040,37 +1804,20 @@ ULONG CCabinet::AddFile(char* FileName) ConvertPath(NewFileName, false); /* Try to open file */ -#if defined(_WIN32) - SrcFile = CreateFile( - NewFileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (SrcFile == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - FreeMemory(NewFileName); - return CAB_STATUS_CANNOT_OPEN; - } -#else /* !_WIN32 */ SrcFile = fopen(NewFileName, "rb"); if (SrcFile == NULL) { DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - FreeMemory(NewFileName); + free(NewFileName); return CAB_STATUS_CANNOT_OPEN; } -#endif FileNode = NewFileNode(); if (!FileNode) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - FreeMemory(NewFileName); - CloseFile(SrcFile); + free(NewFileName); + fclose(SrcFile); return CAB_STATUS_NOMEMORY; } @@ -2082,25 +1829,25 @@ ULONG CCabinet::AddFile(char* FileName) if (FileNode->File.FileSize == (ULONG)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file times.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file attributes.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_SUCCESS; } @@ -2512,22 +2259,12 @@ ULONG CCabinet::ReadString(char* String, LONG MaxLength) // + 1 to skip the terminating NULL character as well. Size = -(MaxLength - Size) + 1; -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - (LONG)Size, - NULL, - FILE_CURRENT) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)Size, SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif + return CAB_STATUS_SUCCESS; } @@ -2548,22 +2285,11 @@ ULONG CCabinet::ReadFileTable() (UINT)CABHeader.FileTableOffset)); /* Seek to file table */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - CABHeader.FileTableOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)CABHeader.FileTableOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif for (i = 0; i < CABHeader.FileCount; i++) { @@ -2581,7 +2307,7 @@ ULONG CCabinet::ReadFileTable() return CAB_STATUS_INVALID_CAB; } - File->FileName = (char*)AllocateMemory(PATH_MAX); + File->FileName = (char*)malloc(PATH_MAX); if (!File->FileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -2636,22 +2362,11 @@ ULONG CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) } /* Seek to data block */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - AbsoluteOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif if ((Status = ReadBlock(&Node->Data, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) @@ -2689,7 +2404,7 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() { PCFFOLDER_NODE Node; - Node = (PCFFOLDER_NODE)AllocateMemory(sizeof(CFFOLDER_NODE)); + Node = (PCFFOLDER_NODE)malloc(sizeof(CFFOLDER_NODE)); if (!Node) return NULL; @@ -2721,7 +2436,7 @@ PCFFILE_NODE CCabinet::NewFileNode() { PCFFILE_NODE Node; - Node = (PCFFILE_NODE)AllocateMemory(sizeof(CFFILE_NODE)); + Node = (PCFFILE_NODE)malloc(sizeof(CFFILE_NODE)); if (!Node) return NULL; @@ -2751,7 +2466,7 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) { PCFDATA_NODE Node; - Node = (PCFDATA_NODE)AllocateMemory(sizeof(CFDATA_NODE)); + Node = (PCFDATA_NODE)malloc(sizeof(CFDATA_NODE)); if (!Node) return NULL; @@ -2784,7 +2499,7 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) while (NextNode != NULL) { PrevNode = NextNode->Next; - FreeMemory(NextNode); + free(NextNode); NextNode = PrevNode; } FolderNode->DataListHead = NULL; @@ -2805,8 +2520,8 @@ void CCabinet::DestroyFileNodes() { PrevNode = NextNode->Next; if (NextNode->FileName) - FreeMemory(NextNode->FileName); - FreeMemory(NextNode); + free(NextNode->FileName); + free(NextNode); NextNode = PrevNode; } FileListHead = NULL; @@ -2852,8 +2567,8 @@ void CCabinet::DestroyDeletedFileNodes() TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName)) + 1); if (CurNode->FileName) - FreeMemory(CurNode->FileName); - FreeMemory(CurNode); + free(CurNode->FileName); + free(CurNode); } CurNode = NextNode; } @@ -2873,7 +2588,7 @@ void CCabinet::DestroyFolderNodes() { PrevNode = NextNode->Next; DestroyDataNodes(NextNode); - FreeMemory(NextNode); + free(NextNode); NextNode = PrevNode; } FolderListHead = NULL; @@ -2915,7 +2630,7 @@ void CCabinet::DestroyDeletedFolderNodes() } DestroyDataNodes(CurNode); - FreeMemory(CurNode); + free(CurNode); TotalFolderSize -= sizeof(CFFOLDER); } @@ -2997,7 +2712,8 @@ ULONG CCabinet::ReadBlock(void* Buffer, * Status of operation */ { - if (!ReadFileData(FileHandle, Buffer, Size, BytesRead)) + *BytesRead = fread(Buffer, 1, Size, FileHandle); + if ( *BytesRead != Size ) return CAB_STATUS_INVALID_CAB; return CAB_STATUS_SUCCESS; } @@ -3201,20 +2917,11 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) CABHeader.CabinetSize = DiskSize; /* Write header */ -#if defined(_WIN32) - if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFHEADER); if (fwrite(&CABHeader, sizeof(CFHEADER), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif /* Write per-cabinet reserved area if present */ if (CABHeader.Flags & CAB_FLAG_RESERVE) @@ -3224,35 +2931,20 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ -#if defined(_WIN32) - if (!WriteFile(FileHandle, &ReservedSize, sizeof(ULONG), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else + BytesWritten = sizeof(ULONG); if (fwrite(&ReservedSize, sizeof(ULONG), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = CabinetReservedFileSize; if (fwrite(CabinetReservedFileBuffer, CabinetReservedFileSize, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASPREV) > 0) @@ -3261,39 +2953,23 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Write name of previous cabinet */ Size = (ULONG)strlen(CabinetPrev) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetPrev, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(CabinetPrev, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DPRINT(MAX_TRACE, ("DiskPrev '%s'.\n", DiskPrev)); /* Write label of previous disk */ Size = (ULONG)strlen(DiskPrev) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, DiskPrev, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(DiskPrev, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASNEXT) > 0) @@ -3302,39 +2978,23 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Write name of next cabinet */ Size = (ULONG)strlen(CabinetNext) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetNext, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(CabinetNext, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DPRINT(MAX_TRACE, ("DiskNext '%s'.\n", DiskNext)); /* Write label of next disk */ Size = (ULONG)strlen(DiskNext) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, DiskNext, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(DiskNext, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } return CAB_STATUS_SUCCESS; @@ -3349,7 +3009,6 @@ ULONG CCabinet::WriteFolderEntries() */ { PCFFOLDER_NODE FolderNode; - ULONG BytesWritten; DPRINT(MAX_TRACE, ("Writing folder table.\n")); @@ -3361,24 +3020,11 @@ ULONG CCabinet::WriteFolderEntries() DPRINT(MAX_TRACE, ("Writing folder entry. CompressionType (0x%X) DataBlockCount (%d) DataOffset (0x%X).\n", FolderNode->Folder.CompressionType, FolderNode->Folder.DataBlockCount, (UINT)FolderNode->Folder.DataOffset)); -#if defined(_WIN32) - if (!WriteFile(FileHandle, - &FolderNode->Folder, - sizeof(CFFOLDER), - (LPDWORD)&BytesWritten, - NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFFOLDER); if (fwrite(&FolderNode->Folder, sizeof(CFFOLDER), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } FolderNode = FolderNode->Next; } @@ -3395,7 +3041,6 @@ ULONG CCabinet::WriteFileEntries() */ { PCFFILE_NODE File; - ULONG BytesWritten; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); @@ -3423,37 +3068,17 @@ ULONG CCabinet::WriteFileEntries() DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%X) FileSize (%u) FileName (%s).\n", File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName)); -#if defined(_WIN32) - if (!WriteFile(FileHandle, - &File->File, - sizeof(CFFILE), - (LPDWORD)&BytesWritten, - NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else - BytesWritten = sizeof(CFFILE); if (fwrite(&File->File, sizeof(CFFILE), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, - GetFileName(File->FileName), - (DWORD)strlen(GetFileName(File->FileName)) + 1, - (LPDWORD)&BytesWritten, - NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else - BytesWritten = strlen(GetFileName(File->FileName)) + 1; if (fwrite(GetFileName(File->FileName), strlen(GetFileName(File->FileName)) + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif if (SetCont) { @@ -3478,7 +3103,6 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) */ { PCFDATA_NODE DataNode; - ULONG BytesWritten; ULONG BytesRead; ULONG Status; @@ -3503,37 +3127,17 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) return Status; } -#if defined(_WIN32) - if (!WriteFile(FileHandle, &DataNode->Data, - sizeof(CFDATA), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFDATA); if (fwrite(&DataNode->Data, sizeof(CFDATA), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, InputBuffer, - DataNode->Data.CompSize, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = DataNode->Data.CompSize; if (fwrite(InputBuffer, DataNode->Data.CompSize, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DataNode = DataNode->Next; } @@ -3662,7 +3266,7 @@ void CCabinet::ConvertDateAndTime(time_t* Time, #endif // !_WIN32 -ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) +ULONG CCabinet::GetFileTimes(FILE* FileHandle, PCFFILE_NODE File) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3674,8 +3278,9 @@ ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) { #if defined(_WIN32) FILETIME FileTime; + HANDLE FileNo = (HANDLE)_fileno(FileHandle); - if (GetFileTime(FileHandle, NULL, NULL, &FileTime)) + if (GetFileTime(FileNo, NULL, NULL, &FileTime)) FileTimeToDosDateTime(&FileTime, &File->File.FileDate, &File->File.FileTime); diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 1a2df3e1d5..02d23d398e 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -8,16 +8,17 @@ #pragma once #if defined(_WIN32) -#define WIN32_LEAN_AND_MEAN -#include <windows.h> + #define WIN32_LEAN_AND_MEAN + #include <windows.h> #else + #include <typedefs.h> + #include <unistd.h> +#endif + #include <errno.h> #include <fcntl.h> #include <sys/types.h> #include <time.h> -#include <typedefs.h> -#include <unistd.h> -#endif #include <stdlib.h> #include <stdio.h> @@ -34,20 +35,23 @@ #define strcasecmp _stricmp #define strdup _strdup - -#define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) -#define FreeMemory(buffer) HeapFree(GetProcessHeap(), 0, buffer) -#define FILEHANDLE HANDLE -#define CloseFile(handle) CloseHandle(handle) #else #define DIR_SEPARATOR_CHAR '/' #define DIR_SEPARATOR_STRING "/" +#endif // _WIN32 -#define AllocateMemory(size) malloc(size) -#define FreeMemory(buffer) free(buffer) -#define CloseFile(handle) fclose(handle) -#define FILEHANDLE FILE* -#endif +inline LONG GetSizeOfFile(FILE* handle) +{ + LONG size; + LONG currentPos = ftell(handle); + + if (fseek(handle, 0, SEEK_END) != 0) + return (LONG)-1; + + size = ftell(handle); + fseek(handle, 0, SEEK_SET); + return size; +} /* Debugging */ @@ -309,8 +313,7 @@ public: ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); private: char FullName[PATH_MAX]; - bool FileCreated; - FILEHANDLE FileHandle; + FILE* FileHandle; }; #endif /* CAB_READ_ONLY */ @@ -437,7 +440,7 @@ private: ULONG WriteDataBlock(); ULONG GetAttributesOnFile(PCFFILE_NODE File); ULONG SetAttributesOnFile(char* FileName, USHORT FileAttributes); - ULONG GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); + ULONG GetFileTimes(FILE* FileHandle, PCFFILE_NODE File); #if !defined(_WIN32) void ConvertDateAndTime(time_t* Time, PUSHORT DosDate, PUSHORT DosTime); #endif @@ -459,7 +462,7 @@ private: char CabinetReservedFile[PATH_MAX]; void* CabinetReservedFileBuffer; ULONG CabinetReservedFileSize; - FILEHANDLE FileHandle; + FILE* FileHandle; bool FileOpen; CFHEADER CABHeader; ULONG CabinetReserved; @@ -495,7 +498,7 @@ private: bool CreateNewFolder; CCFDATAStorage *ScratchFile; - FILEHANDLE SourceFile; + FILE* SourceFile; bool ContinueFile; ULONG TotalBytesLeft; bool BlockIsSplit; // true if current data block is split diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index ba710b64c5..e78211a06c 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -17,40 +17,6 @@ #include "cabman.h" #include "dfp.h" - -#if defined(_WIN32) -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - ULONG size = GetFileSize(handle, NULL); - if (size == INVALID_FILE_SIZE) - return -1; - - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static BOOL _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); -} -#else -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - LONG size; - fseek(handle, 0, SEEK_END); - size = ftell(handle); - fseek(handle, 0, SEEK_SET); - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - *bytesread = fread(buffer, 1, size, handle); - return *bytesread == size; -} -#endif - /* CDFParser */ CDFParser::CDFParser() @@ -94,31 +60,31 @@ CDFParser::~CDFParser() PDISK_NUMBER DNNext; if (FileBuffer) - FreeMemory(FileBuffer); + free(FileBuffer); CNNext = CabinetName; while (CNNext != NULL) { CNPrev = CNNext->Next; - FreeMemory(CNNext); + free(CNNext); CNNext = CNPrev; } CNNext = DiskLabel; while (CNNext != NULL) { CNPrev = CNNext->Next; - FreeMemory(CNNext); + free(CNNext); CNNext = CNPrev; } DNNext = MaxDiskSize; while (DNNext != NULL) { DNPrev = DNNext->Next; - FreeMemory(DNNext); + free(DNNext); DNNext = DNPrev; } if (InfFileHandle != NULL) - CloseFile(InfFileHandle); + fclose(InfFileHandle); } void CDFParser::WriteInfLine(char* InfLine) @@ -126,9 +92,6 @@ void CDFParser::WriteInfLine(char* InfLine) char buf[PATH_MAX]; char eolbuf[2]; char* destpath; -#if defined(_WIN32) - ULONG BytesWritten; -#endif if (DontGenerateInf) return; @@ -149,53 +112,28 @@ void CDFParser::WriteInfLine(char* InfLine) strcpy(buf, InfFileName); /* Create .inf file, overwrite if it already exists */ -#if defined(_WIN32) - InfFileHandle = CreateFile(buf, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_ALWAYS, // Create or overwrite - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (InfFileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Error creating '%u'.\n", (UINT)GetLastError())); - return; - } -#else /* !_WIN32 */ InfFileHandle = fopen(buf, "wb"); if (InfFileHandle == NULL) { - DPRINT(MID_TRACE, ("Error creating '%i'.\n", errno)); + DPRINT(MID_TRACE, ("Error creating INF file.\n")); return; } -#endif } -#if defined(_WIN32) - if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) + if (fwrite(InfLine, strlen(InfLine), 1, InfFileHandle) < 1) { - DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); + DPRINT(MID_TRACE, ("Error writing INF file.\n")); return; } -#else - if (fwrite(InfLine, strlen(InfLine), 1, InfFileHandle) < 1) - return; -#endif eolbuf[0] = 0x0d; eolbuf[1] = 0x0a; -#if defined(_WIN32) - if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) + if (fwrite(eolbuf, sizeof(eolbuf), 1, InfFileHandle) < 1) { - DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); + DPRINT(MID_TRACE, ("Error writing INF file.\n")); return; } -#else - if (fwrite(eolbuf, 1, sizeof(eolbuf), InfFileHandle) < 1) - return; -#endif } @@ -208,54 +146,43 @@ ULONG CDFParser::Load(char* FileName) * Status of operation */ { - ULONG BytesRead; LONG FileSize; if (FileLoaded) return CAB_STATUS_SUCCESS; - /* Create cabinet file, overwrite if it already exists */ -#if defined(_WIN32) - FileHandle = CreateFile(FileName, // Create this file - GENERIC_READ, // Open for reading - 0, // No sharing - NULL, // No security - OPEN_EXISTING, // Open the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_OPEN; -#else /* !_WIN32 */ + /* Open the directive file */ FileHandle = fopen(FileName, "rb"); if (FileHandle == NULL) + { return CAB_STATUS_CANNOT_OPEN; -#endif + } FileSize = GetSizeOfFile(FileHandle); if (FileSize == -1) { - CloseFile(FileHandle); + fclose(FileHandle); return CAB_STATUS_CANNOT_OPEN; } FileBufferSize = (ULONG)FileSize; - FileBuffer = (char*)AllocateMemory(FileBufferSize); + FileBuffer = (char*)malloc(FileBufferSize); if (!FileBuffer) { - CloseFile(FileHandle); + fclose(FileHandle); return CAB_STATUS_NOMEMORY; } - if (!ReadFileData(FileHandle, FileBuffer, FileBufferSize, &BytesRead)) + if ( fread(FileBuffer, FileBufferSize, 1, FileHandle) < 1 ) { - CloseFile(FileHandle); - FreeMemory(FileBuffer); + fclose(FileHandle); + free(FileBuffer); FileBuffer = NULL; return CAB_STATUS_CANNOT_READ; } - CloseFile(FileHandle); + fclose(FileHandle); FileLoaded = true; @@ -571,7 +498,7 @@ bool CDFParser::SetDiskName(PCABINET_NAME *List, ULONG Number, char* String) CN = CN->Next; } - CN = (PCABINET_NAME)AllocateMemory(sizeof(CABINET_NAME)); + CN = (PCABINET_NAME)malloc(sizeof(CABINET_NAME)); if (!CN) return false; @@ -637,7 +564,7 @@ bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, ULONG Number, ULONG Value) DN = DN->Next; } - DN = (PDISK_NUMBER)AllocateMemory(sizeof(DISK_NUMBER)); + DN = (PDISK_NUMBER)malloc(sizeof(DISK_NUMBER)); if (!DN) return false; diff --git a/sdk/tools/cabman/dfp.h b/sdk/tools/cabman/dfp.h index bfea30f81b..1c509715fb 100644 --- a/sdk/tools/cabman/dfp.h +++ b/sdk/tools/cabman/dfp.h @@ -99,7 +99,7 @@ private: void NextToken(); /* Parsing */ bool FileLoaded; - FILEHANDLE FileHandle; + FILE* FileHandle; char* FileBuffer; ULONG FileBufferSize; ULONG CurrentOffset; @@ -140,7 +140,7 @@ private: ULONG ReservePerDataBlockSize; ULONG ReservePerFolderSize; char SourceDir[256]; - FILEHANDLE InfFileHandle; + FILE* InfFileHandle; bool InfModeEnabled; }; diff --git a/sdk/tools/cabman/mszip.cxx b/sdk/tools/cabman/mszip.cxx index acb9ba02b8..acc6e0ebbc 100644 --- a/sdk/tools/cabman/mszip.cxx +++ b/sdk/tools/cabman/mszip.cxx @@ -21,13 +21,13 @@ voidpf MSZipAlloc(voidpf opaque, uInt items, uInt size) { DPRINT(DEBUG_MEMORY, ("items = (%d) size = (%d)\n", items, size)); - return AllocateMemory(items * size); + return malloc(items * size); } void MSZipFree (voidpf opaque, voidpf address) { DPRINT(DEBUG_MEMORY, ("\n")); - FreeMemory(address); + free(address); }

6 years, 11 months

03/03: [GDIPLUS] Add it to winsxs. [NTDLL_APITEST] Remove a hack for gdiplus

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b8975211db256faf070c… commit 5b8975211db256faf070c69cda499eb03f8539d8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 18 19:01:35 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 02:45:50 2018 +0200 [GDIPLUS] Add it to winsxs. [NTDLL_APITEST] Remove a hack for gdiplus --- boot/bootdata/packages/reactos.dff.in | 1 + dll/win32/gdiplus/CMakeLists.txt | 2 ++ ...ws.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest | 3 +-- media/systemcompatible.manifest | 5 ++++- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 - modules/rostests/apitests/ntdll/ntdlltest.manifest | 5 ----- sdk/cmake/CMakeMacros.cmake | 2 ++ 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index a365760608..652aa91943 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -75,6 +75,7 @@ Signature = "$ReactOS$" 55 = winsxs\manifests 56 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef .InfEnd diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 041f3a66eb..30f07f8226 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -36,3 +36,5 @@ add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus gdiplus_private.h SOURCE) add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest similarity index 72% rename from modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest rename to dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest index ba815f4c7b..c88cdba593 100644 --- a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest +++ b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" processorArchitecture="x86" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="gdiplus.dll"/> </assembly> - \ No newline at end of file diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest index e81ccfeeb2..8326faa3f9 100644 --- a/media/systemcompatible.manifest +++ b/media/systemcompatible.manifest @@ -2,7 +2,10 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <dependency> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 3ac0b604f1..3e9756c7f3 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -79,4 +79,3 @@ add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) -add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.GdiPlus.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest index 845c27a83a..bb9d1d05d9 100644 --- a/modules/rostests/apitests/ntdll/ntdlltest.manifest +++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity type="win32" name="ntdll_apitest" version="1.0.0.0"/> - <dependency> - <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> - </dependentAssembly> - </dependency> <file name="deptest.dll"/> <file name="adllfile.dll"/> </assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index dc9a58e631..597143838b 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -279,6 +279,8 @@ macro(dir_to_num dir var) set(${var} 56) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) set(${var} 57) + elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 58) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

6 years, 11 months

02/03: [NTDLL_APITEST] Remove one of the hacks for the implicit activation context.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22317b0ca40a70e76e207… commit 22317b0ca40a70e76e20799cded688d82aebc307 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 18 16:56:16 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 02:45:50 2018 +0200 [NTDLL_APITEST] Remove one of the hacks for the implicit activation context. --- modules/rostests/apitests/ntdll/ntdlltest.manifest | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/rostests/apitests/ntdll/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest index a91a9b68a2..845c27a83a 100644 --- a/modules/rostests/apitests/ntdll/ntdlltest.manifest +++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest @@ -6,11 +6,6 @@ <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> </dependentAssembly> </dependency> - <dependency> - <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> - </dependentAssembly> - </dependency> <file name="deptest.dll"/> <file name="adllfile.dll"/> </assembly>

6 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
38
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 January 2018