Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [CMAKE] Call "git describe" with the --long parameter to always output the format we are used to.
by Colin Finck 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef8b17ed0d54e92589d0e… commit ef8b17ed0d54e92589d0eae7e0954a3379e0776a Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Feb 17 18:09:07 2018 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sat Feb 17 18:09:07 2018 +0100 [CMAKE] Call "git describe" with the --long parameter to always output the format we are used to. --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index ca0ceb4c9a..a585154556 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -39,7 +39,7 @@ if(EXISTS "${REACTOS_SOURCE_DIR}/.git") endif() execute_process( - COMMAND "${GIT_EXECUTABLE}" describe --abbrev=7 + COMMAND "${GIT_EXECUTABLE}" describe --abbrev=7 --long WORKING_DIRECTORY ${REACTOS_SOURCE_DIR} OUTPUT_VARIABLE GIT_DESCRIBE_REVISION RESULT_VARIABLE GIT_CALL_RESULT

1 0

01/01: [SHELL32_APITEST] Run the CUserNotification worker test function in a thread to copy with possible test timeouts. CORE-13177
by Hermès Bélusca-Maïto 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b77840d3a22f370fce5f9… commit b77840d3a22f370fce5f9b77c6af42f91ff65235 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 17 16:02:22 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 17 16:02:22 2018 +0100 [SHELL32_APITEST] Run the CUserNotification worker test function in a thread to copy with possible test timeouts. CORE-13177 --- .../apitests/shell32/CUserNotification.cpp | 32 +++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp index b10185cee9..acfd6023a8 100644 --- a/modules/rostests/apitests/shell32/CUserNotification.cpp +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -171,9 +171,39 @@ TestNotification(void) ok_hr(hr, S_FALSE); } -START_TEST(CUserNotification) +DWORD +CALLBACK +TestThread(LPVOID lpParam) { + /* Initialize COM */ CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + /* Start the test */ TestNotification(); + + /* Cleanup and return */ CoUninitialize(); + return 0; +} + +START_TEST(CUserNotification) +{ + HANDLE hThread; + DWORD dwWait; + + /* We create a test thread, because the notification tests can hang */ + hThread = CreateThread(NULL, 0, TestThread, NULL, 0, NULL); + ok(hThread != NULL, "CreateThread failed with error 0x%lu\n", GetLastError()); + if (!hThread) + { + skip("Could not create the CUserNotification test thread!"); + return; + } + + /* Wait a maximum of 1:30 for the thread to finish (the timeout tests take some time) */ + dwWait = WaitForSingleObject(hThread, 90 * 1000); + ok(dwWait == WAIT_OBJECT_0, "WaitForSingleObject returned %lu, expected WAIT_OBJECT_0\n", dwWait); + + /* Cleanup and return */ + CloseHandle(hThread); }

1 0

01/01: [NTOSKRNL] Don't call OOM dumper in case we were trying to allocate more than 100 pages. In such case, we'll consider the caller is bogus and we'll fail in silence. Dedicated to Mark (again!)
by Pierre Schweitzer 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdae0cce6640f59b127a4… commit bdae0cce6640f59b127a4fc20309d7e87a8603dd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 17 15:09:38 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 17 15:09:38 2018 +0100 [NTOSKRNL] Don't call OOM dumper in case we were trying to allocate more than 100 pages. In such case, we'll consider the caller is bogus and we'll fail in silence. Dedicated to Mark (again!) --- ntoskrnl/mm/ARM3/expool.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 54c6990be5..de75cfbd25 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1810,8 +1810,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, #if DBG // // Out of memory, display current consumption + // Let's consider that if the caller wanted more + // than a hundred pages, that's a bogus caller + // and we are not out of memory // - MiDumpPoolConsumers(FALSE, 0, 0, 0); + if (NumberOfBytes < 100 * PAGE_SIZE) + { + MiDumpPoolConsumers(FALSE, 0, 0, 0); + } #endif // @@ -2143,8 +2149,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, #if DBG // // Out of memory, display current consumption + // Let's consider that if the caller wanted more + // than a hundred pages, that's a bogus caller + // and we are not out of memory // - MiDumpPoolConsumers(FALSE, 0, 0, 0); + if (NumberOfBytes < 100 * PAGE_SIZE) + { + MiDumpPoolConsumers(FALSE, 0, 0, 0); + } #endif //

1 0

01/01: [NTOSKRNL] Allow more chars in ExpTagAllowPrint(). Dedicated to Mark
by Pierre Schweitzer 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01fcb02880039bb94cdbc… commit 01fcb02880039bb94cdbc6d3e4501b4185e29e09 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 17 15:06:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 17 15:06:29 2018 +0100 [NTOSKRNL] Allow more chars in ExpTagAllowPrint(). Dedicated to Mark --- ntoskrnl/mm/ARM3/expool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index d13142a4a7..54c6990be5 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -468,7 +468,8 @@ ExpTagAllowPrint(CHAR Tag) if ((Tag >= 'a' && Tag <= 'z') || (Tag >= 'A' && Tag <= 'Z') || (Tag >= '0' && Tag <= '9') || - Tag == ' ') + Tag == ' ' || Tag == '=' || + Tag == '?' || Tag == '@') { return TRUE; }

1 0

01/01: [FASTFAT] Drop read ahead locking routines in favor of lazy writer routines. This avoids code duplication while being consistent with MS FastFAT.
by Pierre Schweitzer 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69f51d153394c8b2223ff… commit 69f51d153394c8b2223ffa3b92805dffe45f0673 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 17 13:48:32 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 17 13:49:15 2018 +0100 [FASTFAT] Drop read ahead locking routines in favor of lazy writer routines. This avoids code duplication while being consistent with MS FastFAT. --- drivers/filesystems/fastfat/fastio.c | 30 ------------------------------ drivers/filesystems/fastfat/iface.c | 4 ++-- drivers/filesystems/fastfat/vfat.h | 11 ----------- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/drivers/filesystems/fastfat/fastio.c b/drivers/filesystems/fastfat/fastio.c index 58d3f0d587..248f39f5bf 100644 --- a/drivers/filesystems/fastfat/fastio.c +++ b/drivers/filesystems/fastfat/fastio.c @@ -753,36 +753,6 @@ VfatReleaseFromLazyWrite( ExReleaseResourceLite(&(Fcb->MainResource)); } -BOOLEAN -NTAPI -VfatAcquireForReadAhead( - IN PVOID Context, - IN BOOLEAN Wait) -{ - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatAcquireForReadAhead(): Fcb %p\n", Fcb); - - if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) - { - DPRINT("VfatAcquireForReadAhead(): ExReleaseResourceLite failed.\n"); - return FALSE; - } - return TRUE; -} - -VOID -NTAPI -VfatReleaseFromReadAhead( - IN PVOID Context) -{ - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatReleaseFromReadAhead(): Fcb %p\n", Fcb); - - ExReleaseResourceLite(&(Fcb->MainResource)); -} - INIT_SECTION VOID VfatInitFastIoRoutines( diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index c334a95aed..02e570ea45 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -119,8 +119,8 @@ DriverEntry( /* Cache manager */ VfatGlobalData->CacheMgrCallbacks.AcquireForLazyWrite = VfatAcquireForLazyWrite; VfatGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite = VfatReleaseFromLazyWrite; - VfatGlobalData->CacheMgrCallbacks.AcquireForReadAhead = VfatAcquireForReadAhead; - VfatGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = VfatReleaseFromReadAhead; + VfatGlobalData->CacheMgrCallbacks.AcquireForReadAhead = VfatAcquireForLazyWrite; + VfatGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = VfatReleaseFromLazyWrite; /* Fast I/O */ VfatInitFastIoRoutines(&VfatGlobalData->FastIoDispatch); diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index f6e2aa6452..487b5f9ab2 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -775,17 +775,6 @@ NTAPI VfatReleaseFromLazyWrite( IN PVOID Context); -BOOLEAN -NTAPI -VfatAcquireForReadAhead( - IN PVOID Context, - IN BOOLEAN Wait); - -VOID -NTAPI -VfatReleaseFromReadAhead( - IN PVOID Context); - /* fat.c */ NTSTATUS

1 0

01/01: [SHELL32] Fix COM registration of IShellFolder, IShellLinkA/W, IQueryContinue and IUserNotification classes.
by Hermès Bélusca-Maïto 16 Feb '18

16 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=175e78e50f47e5203dde6… commit 175e78e50f47e5203dde6c625644e6593a86db3b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 16 23:30:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 16 23:31:39 2018 +0100 [SHELL32] Fix COM registration of IShellFolder, IShellLinkA/W, IQueryContinue and IUserNotification classes. --- dll/win32/shell32/res/rgs/shellfsfolder.rgs | 16 +++++++------- dll/win32/shell32/res/rgs/shelllink.rgs | 30 +++++++++++++------------- dll/win32/shell32/res/rgs/usernotification.rgs | 30 +++++++++++++------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dll/win32/shell32/res/rgs/shellfsfolder.rgs b/dll/win32/shell32/res/rgs/shellfsfolder.rgs index ca0ecbcb6c..27a304abc3 100644 --- a/dll/win32/shell32/res/rgs/shellfsfolder.rgs +++ b/dll/win32/shell32/res/rgs/shellfsfolder.rgs @@ -9,16 +9,16 @@ HKCR val ThreadingModel = s 'Apartment' } } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder' { - ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder' + NumMethods = s '13' + { + } + ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}' { - NumMethods = s '13' - { - } - ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}' - { - } } } } diff --git a/dll/win32/shell32/res/rgs/shelllink.rgs b/dll/win32/shell32/res/rgs/shelllink.rgs index fe4b9db854..9828c97596 100644 --- a/dll/win32/shell32/res/rgs/shelllink.rgs +++ b/dll/win32/shell32/res/rgs/shelllink.rgs @@ -19,25 +19,25 @@ HKCR MayChangeDefaultMenu = s '' } } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA' + { + NumMethods = s '21' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW' { - ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA' + NumMethods = s '21' { - NumMethods = s '21' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } - ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW' + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' { - NumMethods = s '21' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } } } diff --git a/dll/win32/shell32/res/rgs/usernotification.rgs b/dll/win32/shell32/res/rgs/usernotification.rgs index 61c585f432..54df10e04a 100644 --- a/dll/win32/shell32/res/rgs/usernotification.rgs +++ b/dll/win32/shell32/res/rgs/usernotification.rgs @@ -18,25 +18,25 @@ HKCR } val AppID = s '{0010890E-8789-413C-ADBC-48F5B511B3AF}' } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {7307055C-B24A-486B-9F25-163E597A28A9} = s 'IQueryContinue' + { + NumMethods = s '4' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + ForceRemove {BA9711BA-5893-4787-A7E1-41277151550B} = s 'IUserNotification' { - ForceRemove {7307055C-B24A-486B-9F25-163E597A28A9} = s 'IQueryContinue' + NumMethods = s '8' { - NumMethods = s '4' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } - ForceRemove {BA9711BA-5893-4787-A7E1-41277151550B} = s 'IUserNotification' + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' { - NumMethods = s '8' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } } }

1 0

01/01: [EXPLORER] Update French translation
by Pierre Schweitzer 16 Feb '18

16 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6061c78e91474e47ef49f… commit 6061c78e91474e47ef49f83726f6f6ae6bcd9329 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 16 19:36:25 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 16 19:36:25 2018 +0100 [EXPLORER] Update French translation --- base/shell/explorer/lang/fr-FR.rc | 86 +++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 15669f2e02..47a2b5e940 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -100,88 +100,88 @@ END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" +CAPTION "Personnaliser les notifications" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 + LTEXT "ReactOS affiche les icônes pour les notifications actives ou urgentes, et cache les inactives. Vous pouvez changer ce comportement pour les éléments dans la liste ci-dessous.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "Sélectionnez un élément, puis choisissez le comportement de ses notifications :", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + PUSHBUTTON "&Restaurer les paramètres par défaut", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" +CAPTION "Personnalisez le Menu Démarrer Classique" FONT 8, "MS Shell Dlg" { - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 + GROUPBOX "Menu démarrer", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "Vous pouvez personnaliser votre menu Démarrer en ajoutant ou en retirant des éléments.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "&Ajouter...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Supprimer...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "A&vancé", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Trier", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 - CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + LTEXT "Pour vider la liste des documents, programmes et sites web récemment accédés, cliquez sur Nettoyer.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&Nettoyer", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "&Options avancées du Menu démarrer :", IDC_STATIC, 8, 129, 150, 8 + CONTROL "&Paramètres du Menu Démarrer", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" +CAPTION "Attention au nom de fichier" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 + DEFPUSHBUTTON "&Ignorer", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&Renommer", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "&Ne pas réaliser cette vérification au démarrage", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Il y a un fichier ou un répertoire sur votre ordinateur appelé %s ce qui pourrait conduire certaines applications à dysfonctionner. Le renommer en %s résoudrait le problème. Voulez-vous le renommer maintenant ?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" +CAPTION "Avancé" FONT 8, "MS Shell Dlg" { - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 - CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + GROUPBOX "Paramètres du menu démarrer", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&Ouvrir les sous-menus quand je m'arrête dessus avec la souris", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&Mettre en surbrillance les éléments nouvellement installés", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "&Eléments du menu démarrer :", IDC_STATIC, 7, 53, 238, 8 + CONTROL "&Paramètres du Menu Démarrer", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "Documents récents ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "&Sélectionnez cette option pour fournir un accès rapide aux documents que vous avez ouvert le plus récemment. Vider cette liste ne supprime pas les documents.", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "&Lister les documents que j'ai ouvert le plus récemment", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "&Nettoyer la liste", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "General" +CAPTION "Général" FONT 8, "MS Shell Dlg" { - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 + GROUPBOX "Sélectionnez une taille d'icône pour les programmes ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "&Grandes icônes", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "&Petites icônes", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Programmes ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "Le menu Démarrer contient des raccourcis vers les programmes que vous utilisez le plus souvent. Nettoyer cette liste ne supprime pas les programmes.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "&Nombre de programmes dans le menu Démarrer :", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 - AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 + PUSHBUTTON "&Vider la liste", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "Montrer dans le menu Démarrer ", IDC_STATIC, 7, 126, 238, 63 + AUTOCHECKBOX "&Internet :", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "&E-mail :", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL }

1 0

01/01: improve SHGetFileInfo (#118)
by Katayama Hirofumi MZ 16 Feb '18

16 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=338799bf8bf98698f3e4c… commit 338799bf8bf98698f3e4c1c2b885d724a9a929da Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 16 20:00:08 2018 +0900 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Feb 16 11:00:08 2018 +0000 improve SHGetFileInfo (#118) This patch reduces failures of SHGetFileInfo function. CORE-7159 * improve WideByteToWideChar calls * fix bugs related to file attributes and SHGFI_EXETYPE * SHGFI_USEFILEATTRIBUTES and SHGFI_ICON fix * s/sizeof(temppsfi)/0/ --- dll/win32/shell32/wine/shell32_main.c | 81 +++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index b5638f0582..e64ef7f6fb 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -3,6 +3,7 @@ * * Copyright 1998 Marcus Meissner * Copyright 1998 Juergen Schmied (jsch) * <juergen.schmied(a)metronet.de> + * Copyright 2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -433,7 +434,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, { psfi->szDisplayName[0] = '\0'; psfi->szTypeName[0] = '\0'; - psfi->iIcon = 0; + psfi->hIcon = NULL; } if (!(flags & SHGFI_PIDL)) @@ -449,12 +450,24 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, lstrcpynW(szFullPath, path, MAX_PATH); } } + else + { + SHGetPathFromIDListW((LPITEMIDLIST)path, szFullPath); + } if (flags & SHGFI_EXETYPE) { - if (flags != SHGFI_EXETYPE) - return 0; - return shgfi_get_exe_type(szFullPath); + if (!(flags & SHGFI_SYSICONINDEX)) + { + if (flags & SHGFI_USEFILEATTRIBUTES) + { + return TRUE; + } + else if (GetFileAttributesW(szFullPath) != INVALID_FILE_ATTRIBUTES) + { + return shgfi_get_exe_type(szFullPath); + } + } } /* @@ -488,6 +501,8 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, (LPCITEMIDLIST*)&pidlLast ); if (SUCCEEDED(hr)) pidlLast = ILClone(pidlLast); + else + hr = S_OK; ILFree(pidl); } else @@ -505,8 +520,18 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, psfi->dwAttributes = 0xffffffff; } if (psfParent) - IShellFolder_GetAttributesOf( psfParent, 1, (LPCITEMIDLIST*)&pidlLast, - &(psfi->dwAttributes) ); + { + IShellFolder_GetAttributesOf(psfParent, 1, (LPCITEMIDLIST*)&pidlLast, + &(psfi->dwAttributes)); + } + } + + if (flags & SHGFI_USEFILEATTRIBUTES) + { + if (flags & SHGFI_ICON) + { + psfi->dwAttributes = 0; + } } /* get the displayname */ @@ -516,7 +541,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, { lstrcpyW (psfi->szDisplayName, PathFindFileNameW(szFullPath)); } - else + else if (psfParent) { STRRET str; hr = IShellFolder_GetDisplayNameOf( psfParent, pidlLast, @@ -618,7 +643,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, ret = FALSE; } } - else + else if (psfParent) { hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, @@ -694,7 +719,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } } } - else + else if (psfParent) { if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON), uGilFlags, &(psfi->iIcon)))) @@ -769,33 +794,25 @@ DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, pathW = temppath; } - if (psfi && (flags & SHGFI_ATTR_SPECIFIED)) - temppsfi.dwAttributes=psfi->dwAttributes; + if (psfi) + { + temppsfi.hIcon = psfi->hIcon; + temppsfi.iIcon = psfi->iIcon; + temppsfi.dwAttributes = psfi->dwAttributes; - if (psfi == NULL) - ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, 0, flags); - else ret = SHGetFileInfoW(pathW, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags); + psfi->hIcon = temppsfi.hIcon; + psfi->iIcon = temppsfi.iIcon; + psfi->dwAttributes = temppsfi.dwAttributes; - if (psfi) - { - if(flags & SHGFI_ICON) - psfi->hIcon=temppsfi.hIcon; - if(flags & (SHGFI_SYSICONINDEX|SHGFI_ICON|SHGFI_ICONLOCATION)) - psfi->iIcon=temppsfi.iIcon; - if(flags & SHGFI_ATTRIBUTES) - psfi->dwAttributes=temppsfi.dwAttributes; - if(flags & (SHGFI_DISPLAYNAME|SHGFI_ICONLOCATION)) - { - WideCharToMultiByte(CP_ACP, 0, temppsfi.szDisplayName, -1, - psfi->szDisplayName, sizeof(psfi->szDisplayName), NULL, NULL); - } - if(flags & SHGFI_TYPENAME) - { - WideCharToMultiByte(CP_ACP, 0, temppsfi.szTypeName, -1, - psfi->szTypeName, sizeof(psfi->szTypeName), NULL, NULL); - } + WideCharToMultiByte(CP_ACP, 0, temppsfi.szDisplayName, -1, + psfi->szDisplayName, sizeof(psfi->szDisplayName), NULL, NULL); + + WideCharToMultiByte(CP_ACP, 0, temppsfi.szTypeName, -1, + psfi->szTypeName, sizeof(psfi->szTypeName), NULL, NULL); } + else + ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, 0, flags); HeapFree(GetProcessHeap(), 0, temppath);

1 0

01/01: [D3D9][ARPING] Add missing va_start() and va_end() (#371)
by Serge Gautherie 16 Feb '18

16 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd4db318d0a205be9b76d… commit cd4db318d0a205be9b76d40431b82a588cd72428 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Feb 16 10:28:25 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 16 10:28:25 2018 +0100 [D3D9][ARPING] Add missing va_start() and va_end() (#371) --- dll/directx/d3d9/d3d9_helpers.c | 1 + modules/rosapps/applications/cmdutils/arping/arping.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/directx/d3d9/d3d9_helpers.c b/dll/directx/d3d9/d3d9_helpers.c index 6231f4031c..2747eab96d 100644 --- a/dll/directx/d3d9/d3d9_helpers.c +++ b/dll/directx/d3d9/d3d9_helpers.c @@ -48,6 +48,7 @@ HRESULT SafeFormatString(OUT LPSTR Buffer, IN DWORD BufferSize, IN LPCSTR Format va_start(vargs, FormatString); BytesWritten = _vsnprintf(Buffer, BufferSize-1, FormatString, vargs); + va_end(vargs); if (BytesWritten < BufferSize) return DDERR_GENERIC; diff --git a/modules/rosapps/applications/cmdutils/arping/arping.c b/modules/rosapps/applications/cmdutils/arping/arping.c index 461abbf5c3..8836f52352 100644 --- a/modules/rosapps/applications/cmdutils/arping/arping.c +++ b/modules/rosapps/applications/cmdutils/arping/arping.c @@ -59,26 +59,26 @@ void FormatOutput(UINT uID, ...) } va_start(valist, uID); - DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING, Format, 0, 0, Buf,\ - sizeof(Buf) / sizeof(WCHAR), &valist); + sizeof(Buf) / sizeof(WCHAR), &valist); + va_end(valist); if(!DataLength) { if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - va_end(valist); return; } + va_start(valist, uID); DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING |\ FORMAT_MESSAGE_ALLOCATE_BUFFER,\ - Format, 0, 0, (LPWSTR)&pBuf, 0, &valist); + Format, 0, 0, (LPWSTR)&pBuf, 0, &valist); + va_end(valist); } if(!DataLength) { - va_end(valist); return; }

1 0

01/01: [COM_APITEST] Reenable two known interfaces (#367). Caught by Thomas.
by Hermès Bélusca-Maïto 15 Feb '18

15 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1265b932c85bb5971b33… commit d1265b932c85bb5971b331f4d0ca65831ce42166 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 16 00:15:41 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 16 00:15:41 2018 +0100 [COM_APITEST] Reenable two known interfaces (#367). Caught by Thomas. --- modules/rostests/apitests/com/com_apitest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index f9aac66049..bd1ec684c6 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -413,8 +413,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IQueryContinue) }, { ID_NAME(IID_IUserNotification) }, -// { ID_NAME(IID_IUserNotificationCallback) }, // On Vista+ -// { ID_NAME(IID_IUserNotification2) }, // On Vista+ + { ID_NAME(IID_IUserNotificationCallback) }, // On Vista+ + { ID_NAME(IID_IUserNotification2) }, // On Vista+ { ID_NAME(IID_IAggregateFilterCondition), TRUE }, { ID_NAME(IID_IAliasRegistrationCallback), TRUE },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs