Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[dchapyshev] 72528: [NTOS:EX] - Try to fix CORE-11906 See issue 11906 for more details.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Aug 31 21:29:40 2016 New Revision: 72528 URL: http://svn.reactos.org/svn/reactos?rev=72528&view=rev Log: [NTOS:EX] - Try to fix CORE-11906 See issue 11906 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Aug 31 21:29:40 2016 @@ -1241,41 +1241,64 @@ /* Enter a critical region */ KeEnterCriticalRegion(); - /* Set the initial value and loop the entries */ - Handle.Value = 0; - while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) - { - /* Validate the entry */ - if ((HandleTableEntry->Object) && - (HandleTableEntry->NextFreeTableEntry != -2)) + _SEH2_TRY + { + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) { - /* Lock the entry */ - if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) + /* Validate the entry */ + if ((HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2)) { - POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); - - /* Filling handle information */ - HandleInformation->Handles[Index].UniqueProcessId = (USHORT)(ULONG_PTR) Process->UniqueProcessId; - HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; - HandleInformation->Handles[Index].ObjectTypeIndex = (UCHAR) ObjectHeader->Type->Index; - HandleInformation->Handles[Index].HandleAttributes = HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; - HandleInformation->Handles[Index].HandleValue = (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; - HandleInformation->Handles[Index].Object = &ObjectHeader->Body; - HandleInformation->Handles[Index].GrantedAccess = HandleTableEntry->GrantedAccess; - - /* Unlock it */ - ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); - - ++Index; + /* Lock the entry */ + if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) + { + _SEH2_TRY + { + POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); + + /* Filling handle information */ + HandleInformation->Handles[Index].UniqueProcessId = + (USHORT)(ULONG_PTR) Process->UniqueProcessId; + + HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; + + HandleInformation->Handles[Index].ObjectTypeIndex = + (UCHAR) ObjectHeader->Type->Index; + + HandleInformation->Handles[Index].HandleAttributes = + HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + + HandleInformation->Handles[Index].HandleValue = + (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; + + HandleInformation->Handles[Index].Object = &ObjectHeader->Body; + + HandleInformation->Handles[Index].GrantedAccess = + HandleTableEntry->GrantedAccess; + + ++Index; + } + _SEH2_FINALLY + { + /* Unlock it */ + ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); + } + _SEH2_END; + } } + + /* Go to the next entry */ + Handle.Value += sizeof(HANDLE); } - - /* Go to the next entry */ - Handle.Value += sizeof(HANDLE); - } - - /* Leave the critical region */ - KeLeaveCriticalRegion(); + } + _SEH2_FINALLY + { + /* Leave the critical region */ + KeLeaveCriticalRegion(); + } + _SEH2_END; Process = PsGetNextProcess(Process); }

8 years, 3 months

[hbelusca] 72527: [README] - Show our URLs using https. - Add a "FAQ" section to point to the corresponding website URL; feel free to improve the section!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 31 21:22:37 2016 New Revision: 72527 URL: http://svn.reactos.org/svn/reactos?rev=72527&view=rev Log: [README] - Show our URLs using https. - Add a "FAQ" section to point to the corresponding website URL; feel free to improve the section! Modified: trunk/reactos/README trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/README?rev=72527&r1=72526&… ============================================================================== --- trunk/reactos/README [iso-8859-1] (original) +++ trunk/reactos/README [iso-8859-1] Wed Aug 31 21:22:37 2016 @@ -14,7 +14,7 @@ compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. -More information is available at: http://www.reactos.org +More information is available at: https://www.reactos.org 2. Building ReactOS ------------------- Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Wed Aug 31 21:22:37 2016 @@ -10,7 +10,7 @@ compatible with applications and drivers written for the Microsoft® Windows NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). -More information is available at: http://www.reactos.org +More information is available at: https://www.reactos.org 2. Relationship with the WINE project @@ -41,7 +41,7 @@ 5. Is ReactOS legal? ---------------------------------------- +-------------------- Yes we are. All the code of ReactOS has been written from scratch by our developers. @@ -56,13 +56,22 @@ 6. Tutorials ------------ -Developer and User Tutorials: http://www.reactos.org/wiki +Developer and User Tutorials: https://www.reactos.org/wiki The tutorials contain more information on the project, compiling and testing ReactOS - amongst other topics. Contributors to the project are always welcome. -7. Author ---------- +7. Frequently Asked Questions +----------------------------- -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +Some of your questions may be answered in: https://www.reactos.org/joining/faqs +In addition, the ReactOS forum: https://www.reactos.org/forum/ may contain +complementary, yet non-official, information. + + +8. Authors +---------- + +This document was originally written by Jason Filby (jasonfilby(a)yahoo.com) +and is now occasionally updated by various contributors.

8 years, 3 months

[mjansen] 72526: [SHELL32] Disable some controls for a network drive. Patch by Jared Smudde. CORE-11897 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Aug 31 21:15:57 2016 New Revision: 72526 URL: http://svn.reactos.org/svn/reactos?rev=72526&view=rev Log: [SHELL32] Disable some controls for a network drive. Patch by Jared Smudde. CORE-11897 #resolve #comment Thanks! Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Wed Aug 31 21:15:57 2016 @@ -309,16 +309,16 @@ default: IconId = IDI_SHELL_DRIVE; TypeStrId = IDS_DRIVE_FIXED; } - if (DriveType == DRIVE_CDROM) + if (DriveType == DRIVE_CDROM || DriveType == DRIVE_REMOTE) { /* volume label textbox */ - EnableWindow(GetDlgItem(hwndDlg, 14000), false); + SendMessage(GetDlgItem(hwndDlg, 14000), EM_SETREADONLY, TRUE, 0); /* disk compression */ - ShowWindow(GetDlgItem(hwndDlg, 14011), false); + ShowWindow(GetDlgItem(hwndDlg, 14011), FALSE); /* index */ - ShowWindow(GetDlgItem(hwndDlg, 14012), false); + ShowWindow(GetDlgItem(hwndDlg, 14012), FALSE); } HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED);

8 years, 3 months

[jimtabor] 72525: [Win32SS] - Patch by Sebastian Lackner : Do not block sending/posting WM_NOTIFY messages. - Sync/Port : Fix more msg:msg_queue:test_notify_message results.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 21:14:35 2016 New Revision: 72525 URL: http://svn.reactos.org/svn/reactos?rev=72525&view=rev Log: [Win32SS] - Patch by Sebastian Lackner : Do not block sending/posting WM_NOTIFY messages. - Sync/Port : Fix more msg:msg_queue:test_notify_message results. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Aug 31 21:14:35 2016 @@ -43,8 +43,7 @@ SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_COPYGLOBALDATA) | SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_COPYGLOBALDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */ Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Wed Aug 31 21:14:35 2016 @@ -44,8 +44,7 @@ SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_COPYGLOBALDATA) | SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_COPYGLOBALDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */

8 years, 3 months

[akhaldi] 72524: [BROWSEUI] Present "Is ReactOS legal" in ReactOS readme file. By Joachim Henze. CORE-11800

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 31 20:54:51 2016 New Revision: 72524 URL: http://svn.reactos.org/svn/reactos?rev=72524&view=rev Log: [BROWSEUI] Present "Is ReactOS legal" in ReactOS readme file. By Joachim Henze. CORE-11800 Modified: trunk/reactos/boot/bootdata/readme.txt trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/de-DE.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/fr-FR.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/browseui/lang/it-IT.rc trunk/reactos/dll/win32/browseui/lang/ja-JP.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/pt-BR.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/browseui/lang/sq-AL.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/browseui/lang/zh-CN.rc trunk/reactos/dll/win32/browseui/lang/zh-TW.rc trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -1,6 +1,6 @@ ======================== ReactOS Version 0.4.x -Updated January 5, 2016 +Updated August 31, 2016 ======================== 1. What is ReactOS? @@ -40,7 +40,20 @@ others in the future. -5. Tutorials +5. Is ReactOS legal? +--------------------------------------- + +Yes we are. +All the code of ReactOS has been written from scratch by our developers. +We go to great lengths to ensure that the code our developers create is clean, +same applies to the variety of methods we use to understand Windows internals, +including clean room reverse engineering, using existing documentation freely +available both in books and on the web, using extensive tests (tens of millions) +which apply black box engineering methods against both public and private APIs +exposed by the operating system. + + +6. Tutorials ------------ Developer and User Tutorials: http://www.reactos.org/wiki @@ -49,7 +62,7 @@ ReactOS - amongst other topics. Contributors to the project are always welcome. -6. Author +7. Author --------- This document was written by Jason Filby (jasonfilby(a)yahoo.com). Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -72,7 +72,6 @@ END POPUP "ÐÐ¾Ð¼Ð¾&Ñ", FCIDM_MENU_HELP BEGIN - MENUITEM "ÐÐ°ÐºÐ¾Ð½ÐµÐ½ Ð»Ð¸ Ðµ ÑÐ¾Ð·Ð¸ Ð±ÑÐ¾Ð¹ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&ÐÐ° Ð ÐµÐ°ÐºÑÐÐ¡", IDM_HELP_ABOUT END END @@ -273,10 +272,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/de… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/de-DE.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -90,7 +90,6 @@ END POPUP "&?", FCIDM_MENU_HELP BEGIN - MENUITEM "Ist dies eine &legale ReactOS-Kopie?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "Inf&o", IDM_HELP_ABOUT END END @@ -292,10 +291,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|ZurÃ¼ck|VorwÃ¤rts|Ãbergeordneter Ordner|Suchen|Ordner|Verschieben nach|Kopieren nach|LÃ¶schen|RÃ¼ckgÃ¤ngig|Ansicht|Stop|Aktualisieren|Startseite|Netzlaufwerk verbinden|Netzlaufwerk trennen|Favoriten|Verlauf|Vollbild|Eigenschaften|Ausschneiden|Kopieren|EinfÃ¼gen|Ordneroptionen||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -90,7 +90,6 @@ END POPUP "&Help", FCIDM_MENU_HELP BEGIN - MENUITEM "Is this copy of ReactOS &legal?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&About ReactOS", IDM_HELP_ABOUT END END @@ -291,10 +290,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "&Ayuda", FCIDM_MENU_HELP BEGIN - MENUITEM "Â¿Es &legal esta copia de ReactOS?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Acerca de ReactOS", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|AtrÃ¡s|Adelante|Subir|BÃºsqueda|Carpetas|Mover a|Copiar a|Borrar|Deshacer|Vistas|Detener|Recargar|Inicio|Montar disco|Desconectar|Favoritos|Historial|Pantalla completa|Propiedades|Cortar|Copiar|Pegar|Opciones de carpeta||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/fr-FR.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -90,7 +90,6 @@ END POPUP "&Aide", FCIDM_MENU_HELP BEGIN - MENUITEM "Est-ce que cette copie de ReactOS est &lÃ©gale ?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "Ã &propos de ReactOS", IDM_HELP_ABOUT END END @@ -291,10 +290,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Retour|Avancer|Dossier parent|Recherche|Dossiers|Aller vers|Copier dans|Supprimer|Annuler|Affichage|Stop|RafraÃ®chir|Home|Map Drive|DÃ©connecter|Favoris|Historique|Plein Ã©cran|PropriÃ©tÃ©s|Couper|Copier|Coller|Options des dossiers||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "DÃ©solÃ©" - IDS_SORRY_MESSAGE, "ReactOS ne peut pas atteindre '%s' (erreur 0x%lx).\nVeuillez vÃ©rifier qu'un navigateur web est installÃ©." -END Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/he-IL.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "×¢××¨×", FCIDM_MENU_HELP BEGIN - MENUITEM "××× ×¢××ª×§ ×× ×©× ReactOS ×××§×?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "×××××ª ReactOS", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/it… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/it-IT.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -72,7 +72,6 @@ END POPUP "&Aiuto", FCIDM_MENU_HELP BEGIN - MENUITEM "E' legale questa copia di &ReactOS?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Informazioni su ReactOS", IDM_HELP_ABOUT END END @@ -273,10 +272,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Indietro|Avanti|Livello superiore|Cerca|Cartelle|Sposta in|Copia in|Elimina|Annulla|Visualizza|Ferma|Aggiorna|Pagina iniziale|Mappa disco|Disconnette|Preferiti|Cronologia|Schermo intero|ProprietÃ |Taglia|Copia|Incolla|Opzioni cartella||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ja-JP.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -90,7 +90,6 @@ END POPUP "ãã«ã(&H)", FCIDM_MENU_HELP BEGIN - MENUITEM "ãã®ã³ãã¼ã¯ãé©æ³ãªReactOSã(&L)ï¼", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "ReactOSã«ã¤ãã¦(&A)", IDM_HELP_ABOUT END END @@ -291,10 +290,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|æ»ã|é²ã|ä¸ã¸|æ¤ç´¢|ãã©ã«ãã¼|ç§»å|ã³ãã¼|åé¤|åã«æ»ã|è¡¨ç¤º|åæ¢|åæç»|ãã¼ã |ãã©ã¤ãæ¥ç¶|æ¥ç¶åæ|ãæ°ã«å¥ã|å±¥æ´|ãã«ã¹ã¯ãªã¼ã³|ããããã£|åãåã|ã³ãã¼|è²¼ãä»ã|ãã©ã«ãã¼ ãªãã·ã§ã³||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "ç³ãè¨³ããã¾ãã" - IDS_SORRY_MESSAGE, "ReactOSã¯ã'%s'ãåç§ã§ãã¾ããã§ãã (ã¨ã©ã¼ 0x%lx)ã\nã¤ã³ã¹ãã¼ã«æ¸ã¿ã®ã¦ã§ã ãã©ã¦ã¶ã¼ããããã¨ãç¢ºèªãã¦ä¸ããã" -END Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -80,7 +80,6 @@ END POPUP "Pomo&c", FCIDM_MENU_HELP BEGIN - MENUITEM "Czy ta &kopia ReactOS jest legalna?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&O ReactOS", IDM_HELP_ABOUT END END @@ -281,10 +280,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Wstecz|Dalej|W gÃ³rÄ|Wyszukaj|Foldery|PrzemieÅÄ do|Kopiuj do|UsuÅ|Cofnij|Widoki|Stop|OdÅwieÅ¼|Strona gÅÃ³wna|Mapa dyskÃ³w|RozÅÄcz|Ulubione|Historia|PeÅny ekran|WÅaÅciwoÅci|Wytnij|Kopiuj|Wklej|Opcje folderÃ³w||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pt… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pt-BR.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "Aj&uda", FCIDM_MENU_HELP BEGIN - MENUITEM "Esta cÃ³pia do ReactOS Ã© &legal?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "So&bre o ReactOS", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Voltar|AvanÃ§ar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibiÃ§Ã£o|Parar|Atualizar|PÃ¡gina inicial|Mapear unidade|Desconectar|Favoritos|HistÃ³rico|Tela inteira|Propriedades|Recortar|Copiar|Colar|OpÃ§Ãµes de pasta||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "Aj&utor", FCIDM_MENU_HELP BEGIN - MENUITEM "&Este aceastÄ copie a ReactOS legalÄ?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Despreâ¦", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Ãnapoi|Ãnainte|Sus|CÄutare|Dosare|Mutare Ã®n|Copiere Ã®n|Ètergere|Desfacere|AfiÈÄri|Oprire|ÃmprospÄtare|AcasÄ|Conectare unitate de stocare|Deconectare|Favorite|Istoric|Pe tot ecranul|ProprietÄÈi|Decupare|Copiere|Lipire|OpÈiuni de dosar||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", FCIDM_MENU_HELP BEGIN - MENUITEM "&ÐÐ¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ðµ", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Ð ReactOS", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|ÐÐ°Ð·Ð°Ð´|ÐÐ¿ÐµÑÐµÐ´|ÐÐ²ÐµÑÑ|ÐÐ¾Ð¸ÑÐº|ÐÐ°Ð¿ÐºÐ¸|ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð²|Ð£Ð´Ð°Ð»Ð¸ÑÑ|ÐÑÐ¼ÐµÐ½Ð¸ÑÑ|ÐÐ¸Ð´|ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ¾Ð¼Ð¾Ð¹|ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¸ÑÐº|ÐÑÐºÐ»ÑÑÐ¸ÑÑ|ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ|ÐÑÑÐ½Ð°Ð»|ÐÐ¾ Ð²ÐµÑÑ ÑÐºÑÐ°Ð½|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°|ÐÑÑÐµÐ·Ð°ÑÑ|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ" - IDS_SORRY_MESSAGE, "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑÐºÑÑÑÑ '%s' (error 0x%lx).\nÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ Ð² ÑÐ¾Ð¼, ÑÑÐ¾ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½." -END Modified: trunk/reactos/dll/win32/browseui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/sq-AL.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -91,7 +91,6 @@ END POPUP "&NdihmÃ«", FCIDM_MENU_HELP BEGIN - MENUITEM "A eshte kjo kopje e ReactOS e &ligjshme?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Rreth ReactOS", IDM_HELP_ABOUT END END @@ -292,10 +291,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/tr-TR.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -72,7 +72,6 @@ END POPUP "&YardÄ±m", FCIDM_MENU_HELP BEGIN - MENUITEM "Bu ReactOS yasal mÄ±?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&ReactOS hakkÄ±nda", IDM_HELP_ABOUT END END @@ -273,10 +272,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -74,7 +74,6 @@ END POPUP "&ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°", FCIDM_MENU_HELP BEGIN - MENUITEM "Ð¦Ñ ÐºÐ¾Ð¿ÑÑ ReactOS &Ð·Ð°ÐºÐ¾Ð½Ð½Ð°?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&ÐÑÐ¾ ReactOS", IDM_HELP_ABOUT END END @@ -275,10 +274,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-CN.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -92,7 +92,6 @@ END POPUP "å¸®å©(&H)", FCIDM_MENU_HELP BEGIN - MENUITEM "æ¤å¯æ¬ç ReactOS æ¯åæ³çåï¼(&L)", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "å³äº ReactOS(&A)", IDM_HELP_ABOUT END END @@ -293,10 +292,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|è¿å|åè¿|åä¸|æç´¢|æä»¶å¤¹|ç§»å¨å°|å¤å¶å°|å é¤|æ¤æ¶|è§å¾|åæ¢|å·æ°|é¦é¡µ|æ å°ç£ç|æå¼è¿æ¥|æ¶èå¤¹|åå²|å¨å±å¹|å±æ§|åªä¸|å¤å¶|è´´ä¸|æä»¶å¤¹éé¡¹||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/zh-TW.rc [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -92,7 +92,6 @@ END POPUP "å¹«å©(&H)", FCIDM_MENU_HELP BEGIN - MENUITEM "æ¤å¯æ¬ç ReactOS æ¯åæ³çåï¼(&L)", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "éæ¼ ReactOS(&A)", IDM_HELP_ABOUT END END @@ -293,10 +292,3 @@ BEGIN IDS_STANDARD_TOOLBAR, "|è¿å|åé²|åä¸|æç´¢|è³æå¤¾|ç§»åå°|è¤è£½å°|åªé¤|æ¤æ¶|æª¢è¦|åæ¢|éæ°æ´ç|é¦é |å°æ ç£ç¢|æ·éé£ç·|æ¶èå¤¾|æ·å²|å¨è¢å¹|å±¬æ§|åªä¸|è¤è£½|è²¼ä¸|è³æå¤¾é¸é ||" END - -STRINGTABLE -BEGIN - IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" - IDS_SORRY_CAPTION, "Sorry" - IDS_SORRY_MESSAGE, "ReactOS could not browse to '%s' (error 0x%lx).\nPlease make sure there is a web browser installed." -END Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -54,7 +54,6 @@ #define IDM_TOOLS_DISCONNECTNETWORKDRIVE 0xA082 #define IDM_TOOLS_SYNCHRONIZE 0xA176 #define IDM_TOOLS_FOLDEROPTIONS 0xA123 -#define IDM_HELP_ISTHISCOPYLEGAL 0xA104 #define IDM_HELP_ABOUT 0xA102 #define IDM_TASKBAR_TOOLBARS 268 #define IDM_TASKBAR_TOOLBARS_DESKTOP 3 @@ -93,7 +92,6 @@ #define IDR_AUTOCOMPLETE 141 #define IDR_ACLISTISF 142 -#define IDS_LEGAL_URL 12299 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 #define IDS_SHOWTEXTLABELS 12303 @@ -106,8 +104,6 @@ #define IDS_ADDRESSBANDLABEL 12902 #define IDS_FOLDERSLABEL 12919 #define IDS_HISTORYTEXT 13169 -#define IDS_SORRY_CAPTION 14001 -#define IDS_SORRY_MESSAGE 14002 #define IDS_UP 58434 #define IDS_BACK 58689 #define IDS_FORWARD 58690 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Aug 31 20:54:51 2016 @@ -597,7 +597,6 @@ LRESULT OnGoUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnBackspace(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnGoHome(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); - LRESULT OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToggleToolbarLock(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -642,7 +641,6 @@ COMMAND_ID_HANDLER(IDM_GOTO_UPONELEVEL, OnGoUpLevel) COMMAND_ID_HANDLER(IDM_GOTO_HOMEPAGE, OnGoHome) COMMAND_ID_HANDLER(IDM_FAVORITES_ORGANIZEFAVORITES, OnOrganizeFavorites) - COMMAND_ID_HANDLER(IDM_HELP_ISTHISCOPYLEGAL, OnIsThisLegal) COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible) COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock) COMMAND_ID_HANDLER(IDM_TOOLBARS_STANDARDBUTTONS, OnToggleToolbarBandVisible) @@ -3594,41 +3592,6 @@ return 0; } -LRESULT CShellBrowser::OnIsThisLegal(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) -{ - WCHAR wszSite[256]; - HINSTANCE hResourceInstance = _AtlBaseModule.GetResourceInstance(); - - if (!LoadStringW(hResourceInstance, IDS_LEGAL_URL, wszSite, _countof(wszSite))) - StringCchCopyW(wszSite, _countof(wszSite), L"https://www.reactos.org/joining/faqs"); - - SHELLEXECUTEINFOW execInfo = { sizeof(execInfo), 0 }; - execInfo.lpVerb = L"open"; - execInfo.lpFile = wszSite; - execInfo.hwnd = m_hWnd; - execInfo.nShow = SW_SHOWNORMAL; - - if (!ShellExecuteExW(&execInfo)) - { - WCHAR wszCaption[256]; - WCHAR wszMessage[512]; - - DWORD error = GetLastError(); - - if (!LoadStringW(hResourceInstance, IDS_SORRY_MESSAGE, wszCaption, _countof(wszCaption))) - StringCchCopyW(wszCaption, _countof(wszCaption), L"ReactOS could not browse to '%s' (error 0x%lx). Please make sure there is a web browser installed."); - - StringCchPrintfW(wszMessage, _countof(wszMessage), wszCaption, wszSite, error); - - if (!LoadStringW(hResourceInstance, IDS_SORRY_CAPTION, wszCaption, _countof(wszCaption))) - StringCchCopyW(wszCaption, _countof(wszCaption), L"Sorry"); - - MessageBoxW(wszMessage, wszCaption, MB_OK); - } - - return 0; -} - LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { fStatusBarVisible = !fStatusBarVisible;

8 years, 3 months

[jimtabor] 72523: [NtUser] - Fixed one of the msg:msg_paint:test_paint_messages while looking for another issue. See CORE-7166.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 20:38:09 2016 New Revision: 72523 URL: http://svn.reactos.org/svn/reactos?rev=72523&view=rev Log: [NtUser] - Fixed one of the msg:msg_paint:test_paint_messages while looking for another issue. See CORE-7166. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Aug 31 20:38:09 2016 @@ -8,9 +8,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserPainting); - -#define RDW_CLIPCHILDREN 4096 -#define RDW_NOUPDATEDIRTY 32768 /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Wed Aug 31 20:38:09 2016 @@ -11,6 +11,9 @@ #define PRGN_NULL ((PREGION)0) /* NULL empty region */ #define PRGN_WINDOW ((PREGION)1) /* region from window rcWindow */ #define PRGN_MONITOR ((PREGION)2) /* region from monitor region. */ + +#define RDW_CLIPCHILDREN 4096 +#define RDW_NOUPDATEDIRTY 32768 #define GreCreateRectRgnIndirect(prc) \ NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) @@ -36,4 +39,4 @@ BOOL FASTCALL IntIsWindowDrawable(PWND); BOOL UserDrawCaption(PWND,HDC,RECTL*,HFONT,HICON,const PUNICODE_STRING,UINT); VOID FASTCALL UpdateThreadWindows(PWND,PTHREADINFO,HRGN); - +VOID FASTCALL UserSyncAndPaintWindows(PWND pWnd, ULONG Flags); Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Wed Aug 31 20:38:09 2016 @@ -2241,6 +2241,19 @@ #endif } + if ( !PosChanged && + (WinPos.flags & SWP_FRAMECHANGED) && + !(WinPos.flags & SWP_DEFERERASE) && // Prevent sending WM_SYNCPAINT message. + VisAfter ) + { + PWND Parent = Window->spwndParent; + if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) + { + TRACE("SWP_FRAMECHANGED Parent WS_CLIPCHILDREN\n"); + UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN); + } + } + // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED. if ( VisBefore == NULL && VisBeforeJustClient == NULL && @@ -3396,7 +3409,7 @@ } else { - Window->hrgnNewFrame = (HRGN) 1; + Window->hrgnNewFrame = HRGN_WINDOW; } //// HACK 2 Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) );

8 years, 3 months

[jimtabor] 72522: [NtUser] - Fix test results for msg:msg_queue:test_broadcast.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 17:59:41 2016 New Revision: 72522 URL: http://svn.reactos.org/svn/reactos?rev=72522&view=rev Log: [NtUser] - Fix test results for msg:msg_queue:test_broadcast. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Aug 31 17:59:41 2016 @@ -554,6 +554,11 @@ } } +static BOOL is_message_broadcastable(UINT msg) +{ + return msg < WM_USER || msg >= 0xc000; +} + UINT FASTCALL GetWakeMask(UINT first, UINT last ) { @@ -1200,11 +1205,13 @@ return FALSE; } - if (Wnd == HWND_BROADCAST) + if (Wnd == HWND_BROADCAST || Wnd == HWND_TOPMOST) { HWND *List; PWND DesktopWindow; ULONG i; + + if (!is_message_broadcastable(Msg)) return TRUE; DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); @@ -1495,6 +1502,8 @@ return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); } + if (!is_message_broadcastable(Msg)) return TRUE; + DesktopWindow = UserGetDesktopWindow(); if (NULL == DesktopWindow) { @@ -1516,26 +1525,14 @@ for (Child = Children; NULL != *Child; Child++) { - if (hWnd == HWND_TOPMOST) - { - DesktopWindow = UserGetWindowObject(*Child); - if (DesktopWindow && DesktopWindow->ExStyle & WS_EX_TOPMOST) - { - ERR("HWND_TOPMOST Found\n"); - co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); - } - } - else - { - PWND pwnd = UserGetWindowObject(*Child); - if (!pwnd) continue; - - if ( pwnd->fnid == FNID_MENU || - pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) - continue; - - co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); - } + PWND pwnd = UserGetWindowObject(*Child); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); } ExFreePoolWithTag(Children, USERTAG_WINDOWLIST);

8 years, 3 months

[jimtabor] 72521: [NtGDI] - Patch by Sebastian Gasiorek : Fix incorrect placement of the text in the Tab buttons. Implement TA_UPDATECP. See CORE-1578 and CORE-11415.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 16:20:57 2016 New Revision: 72521 URL: http://svn.reactos.org/svn/reactos?rev=72521&view=rev Log: [NtGDI] - Patch by Sebastian Gasiorek : Fix incorrect placement of the text in the Tab buttons. Implement TA_UPDATECP. See CORE-1578 and CORE-11415. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Aug 31 16:20:57 2016 @@ -3408,9 +3408,15 @@ IntLPtoDP(dc, (POINT *)lprc, 2); } - Start.x = XStart; - Start.y = YStart; - IntLPtoDP(dc, &Start, 1); + if(pdcattr->lTextAlign & TA_UPDATECP) + { + Start.x = pdcattr->ptlCurrent.x; + Start.y = pdcattr->ptlCurrent.y; + } else { + Start.x = XStart; + Start.y = YStart; + IntLPtoDP(dc, &Start, 1); + } RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; YStart = Start.y + dc->ptlDCOrig.y; @@ -3842,6 +3848,11 @@ String++; } + + if (pdcattr->lTextAlign & TA_UPDATECP) { + pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; + } + IntUnLockFreeType; DC_vFinishBlit(dc, NULL) ;

8 years, 3 months

[jimtabor] 72520: [User32] - MDI Sync/Port from wine head, not sure about Staging.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 31 16:05:34 2016 New Revision: 72520 URL: http://svn.reactos.org/svn/reactos?rev=72520&view=rev Log: [User32] - MDI Sync/Port from wine head, not sure about Staging. Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Wed Aug 31 16:05:34 2016 @@ -87,11 +87,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MAXTITLELENGTH 0xa1 -#ifdef __REACTOS__ -#define WM_MDICALCCHILDSCROLL 0x003F // ReactOS: Uses correct value. -#else // Really? ---v win:test_mdi looks for the above value. -#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */ -#endif + +#define WM_MDICALCCHILDSCROLL 0x003F /* this is exactly what Windows uses */ + /* "More Windows..." definitions */ #define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..." option will appear under the Windows menu */ @@ -405,17 +403,6 @@ return (LRESULT)oldFrameMenu; } } - else - { - /* SetMenu() may already have been called, meaning that this window - * already has its menu. But they may have done a SetMenu() on - * an MDI window, and called MDISetMenu() after the fact, meaning - * that the "if" to this "else" wouldn't catch the need to - * augment the frame menu. - */ - if( ci->hwndChildMaximized ) - MDI_AugmentFrameMenu( hwndFrame, ci->hwndChildMaximized ); - } return 0; } @@ -435,7 +422,7 @@ if (!IsMenu(ci->hWindowMenu)) { - WARN("Window menu handle %p is no more valid\n", ci->hWindowMenu); + WARN("Window menu handle %p is no longer valid\n", ci->hWindowMenu); return 0; } @@ -536,8 +523,7 @@ lpMinMax->ptMaxPosition.x = rect.left; lpMinMax->ptMaxPosition.y = rect.top; - TRACE("max rect (%ld,%ld - %ld, %ld)\n", - rect.left,rect.top,rect.right,rect.bottom); + TRACE("max rect %s\n", wine_dbgstr_rect(&rect)); } /********************************************************************** @@ -1130,9 +1116,7 @@ ci->hBmpClose = 0; NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT #else - WND *wndPtr = WIN_GetPtr( hwnd ); - wndPtr->flags |= WIN_ISMDICLIENT; - WIN_ReleasePtr( wndPtr ); + if (message == WM_NCCREATE) win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); #endif } return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : @@ -1342,10 +1326,7 @@ { RECT rect; - rect.left = 0; - rect.top = 0; - rect.right = LOWORD(lParam); - rect.bottom = HIWORD(lParam); + SetRect(&rect, 0, 0, LOWORD(lParam), HIWORD(lParam)); AdjustWindowRectEx(&rect, GetWindowLongPtrA(ci->hwndActiveChild, GWL_STYLE), 0, GetWindowLongPtrA(ci->hwndActiveChild, GWL_EXSTYLE) ); MoveWindow(ci->hwndActiveChild, rect.left, rect.top,

8 years, 3 months

[aandrejevic] 72519: [NTVDM:BIOS] The 640x480x256 video mode has 640 bytes per scanline.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 31 15:37:53 2016 New Revision: 72519 URL: http://svn.reactos.org/svn/reactos?rev=72519&view=rev Log: [NTVDM:BIOS] The 640x480x256 video mode has 640 bytes per scanline. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Wed Aug 31 15:37:53 2016 @@ -43,7 +43,7 @@ 0xA000, /* Window A segment, or zero if not supported */ 0x0000, /* Window B segment, or zero if not supported */ 0x00000000, /* Window position function pointer */ - 800, /* Bytes per scanline */ + 640, /* Bytes per scanline */ 640, /* Width */ 480, /* Height */ 8, /* Character cell width */

8 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016