[ros-diffs] [pschweitzer] 72067: [NTFS] Don't attempt to read beyond stream size. Patch by Trevor Thompson. CORE-11707

2016-07-31 Thread pschweitzer
Author: pschweitzer
Date: Mon Aug  1 06:14:45 2016
New Revision: 72067

URL: http://svn.reactos.org/svn/reactos?rev=72067&view=rev
Log:
[NTFS]
Don't attempt to read beyond stream size.
Patch by Trevor Thompson.

CORE-11707

Modified:
trunk/reactos/drivers/filesystems/ntfs/rw.c

Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/rw.c?rev=72067&r1=72066&r2=72067&view=diff
==
--- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Mon Aug  1 
06:14:45 2016
@@ -147,7 +147,10 @@
 RealLength = ROUND_UP(ToRead, DeviceExt->NtfsInfo.BytesPerSector);
 /* do we need to extend RealLength by one sector? */
 if (RealLength + RealReadOffset < ReadOffset + Length)
-RealLength += DeviceExt->NtfsInfo.BytesPerSector;
+{
+if (RealReadOffset + RealLength + 
DeviceExt->NtfsInfo.BytesPerSector <= 
AttributeAllocatedLength(&DataContext->Record))
+RealLength += DeviceExt->NtfsInfo.BytesPerSector;
+}
 
 
 ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength, TAG_NTFS);




[ros-diffs] [dchapyshev] 72066: [USERENV] - Implement GetUserSid() (based on GetUserSidFromToken()) - Remove GetUserSidFromToken() and use new exported function - Move SID functions to sid.c - SetUser

2016-07-31 Thread dchapyshev
Author: dchapyshev
Date: Sun Jul 31 13:46:23 2016
New Revision: 72066

URL: http://svn.reactos.org/svn/reactos?rev=72066&view=rev
Log:
[USERENV]
- Implement GetUserSid() (based on GetUserSidFromToken())
- Remove GetUserSidFromToken() and use new exported function
- Move SID functions to sid.c
- SetUserEnvironmentVariable should not fail, if can't get the short path. 
Instead, a long path
- Setup environment variables from Session Manager

* This fixes all winetests for userenv.dll (+20 passed tests)

Added:
trunk/reactos/dll/win32/userenv/sid.c   (with props)
Modified:
trunk/reactos/dll/win32/userenv/CMakeLists.txt
trunk/reactos/dll/win32/userenv/environment.c
trunk/reactos/dll/win32/userenv/internal.h
trunk/reactos/dll/win32/userenv/misc.c
trunk/reactos/dll/win32/userenv/userenv.spec
trunk/reactos/sdk/include/psdk/userenv.h

Modified: trunk/reactos/dll/win32/userenv/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/CMakeLists.txt?rev=72066&r1=72065&r2=72066&view=diff
==
--- trunk/reactos/dll/win32/userenv/CMakeLists.txt  [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/userenv/CMakeLists.txt  [iso-8859-1] Sun Jul 31 
13:46:23 2016
@@ -10,6 +10,7 @@
 profile.c
 registry.c
 setup.c
+sid.c
 userenv.c
 precomp.h)
 

Modified: trunk/reactos/dll/win32/userenv/environment.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environment.c?rev=72066&r1=72065&r2=72066&view=diff
==
--- trunk/reactos/dll/win32/userenv/environment.c   [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/userenv/environment.c   [iso-8859-1] Sun Jul 31 
13:46:23 2016
@@ -82,17 +82,15 @@
 
 if (!_wcsicmp(lpName, L"temp") || !_wcsicmp(lpName, L"tmp"))
 {
-if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH))
-{
-DPRINT1("GetShortPathNameW() failed for %S (Error %lu)\n", 
DstValue.Buffer, GetLastError());
-if (Buffer)
-LocalFree(Buffer);
-return FALSE;
+if (GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH))
+{
+DPRINT("GetShortPathNameW() failed for %S (Error %lu)\n", 
DstValue.Buffer, GetLastError());
+
+RtlInitUnicodeString(&DstValue,
+ ShortName);
 }
 
 DPRINT("Buffer: %S\n", ShortName);
-RtlInitUnicodeString(&DstValue,
- ShortName);
 }
 
 RtlInitUnicodeString(&Name,
@@ -214,10 +212,10 @@
 SID_NAME_USE SidNameUse;
 BOOL bRet = TRUE;
 
-if (!GetUserSidFromToken(hToken,
- &Sid))
-{
-DPRINT1("GetUserSidFromToken() failed\n");
+Sid = GetUserSid(hToken);
+if (Sid == NULL)
+{
+DPRINT1("GetUserSid() failed\n");
 return FALSE;
 }
 
@@ -363,29 +361,40 @@
 {
 dwValueNameLength = dwMaxValueNameLength;
 dwValueDataLength = dwMaxValueDataLength;
-RegEnumValueW(hEnvKey,
-  i,
-  lpValueName,
-  &dwValueNameLength,
-  NULL,
-  &dwType,
-  (LPBYTE)lpValueData,
-  &dwValueDataLength);
-
-if (!_wcsicmp (lpValueName, L"path"))
-{
-/* Append 'Path' environment variable */
-AppendUserEnvironmentVariable(lpEnvironment,
-  lpValueName,
-  lpValueData);
+
+Error = RegEnumValueW(hEnvKey,
+  i,
+  lpValueName,
+  &dwValueNameLength,
+  NULL,
+  &dwType,
+  (LPBYTE)lpValueData,
+  &dwValueDataLength);
+if (Error == ERROR_SUCCESS)
+{
+if (!_wcsicmp (lpValueName, L"path"))
+{
+/* Append 'Path' environment variable */
+AppendUserEnvironmentVariable(lpEnvironment,
+  lpValueName,
+  lpValueData);
+}
+else
+{
+/* Set environment variable */
+SetUserEnvironmentVariable(lpEnvironment,
+   lpValueName,
+   lpValueData,
+   (dwType == REG_EXPAND_SZ));
+}
 }
 else
 {
-/* Set environment variable */
-SetUserEnvironmentVariable(lpEnvironment,
-   lpValueName,
-

[ros-diffs] [jimtabor] 72065: [NtUser] - Remove unused data.

2016-07-31 Thread jimtabor
Author: jimtabor
Date: Sun Jul 31 13:00:27 2016
New Revision: 72065

URL: http://svn.reactos.org/svn/reactos?rev=72065&view=rev
Log:
[NtUser]
- Remove unused data.

Modified:
trunk/reactos/win32ss/user/ntuser/main.c
trunk/reactos/win32ss/user/ntuser/win32.h

Modified: trunk/reactos/win32ss/user/ntuser/main.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c?rev=72065&r1=72064&r2=72065&view=diff
==
--- trunk/reactos/win32ss/user/ntuser/main.c[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/main.c[iso-8859-1] Sun Jul 31 
13:00:27 2016
@@ -134,7 +134,6 @@
 InitializeListHead(&ppiCurrent->DriverObjListHead);
 ExInitializeFastMutex(&ppiCurrent->DriverObjListLock);
 
-ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout();
 {
 PKEVENT Event;
 

Modified: trunk/reactos/win32ss/user/ntuser/win32.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.h?rev=72065&r1=72064&r2=72065&view=diff
==
--- trunk/reactos/win32ss/user/ntuser/win32.h   [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/win32.h   [iso-8859-1] Sun Jul 31 
13:00:27 2016
@@ -275,7 +275,6 @@
 LIST_ENTRY PrivateFontListHead;
 FAST_MUTEX DriverObjListLock;
 LIST_ENTRY DriverObjListHead;
-struct tagKL* KeyboardLayout; // THREADINFO only
 W32HEAP_USER_MAPPING HeapMappings;
 struct _GDI_POOL* pPoolDcAttr;
 struct _GDI_POOL* pPoolBrushAttr;




[ros-diffs] [akhaldi] 72064: [0.4.2] * Merge the browseui work by Mark in r72063. CORE-11721

2016-07-31 Thread akhaldi
Author: akhaldi
Date: Sun Jul 31 12:46:15 2016
New Revision: 72064

URL: http://svn.reactos.org/svn/reactos?rev=72064&view=rev
Log:
[0.4.2] * Merge the browseui work by Mark in r72063. CORE-11721

Modified:
branches/ros-branch-0_4_2/reactos/   (props changed)
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/es-ES.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/fr-FR.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/he-IL.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/it-IT.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pl-PL.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/pt-BR.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ro-RO.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/ru-RU.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/sq-AL.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/tr-TR.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/uk-UA.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-CN.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/zh-TW.rc
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/resource.h
branches/ros-branch-0_4_2/reactos/dll/win32/browseui/shellbrowser.cpp

Propchange: branches/ros-branch-0_4_2/reactos/
--
--- svn:mergeinfo   (original)
+++ svn:mergeinfo   Sun Jul 31 12:46:15 2016
@@ -20,4 +20,4 @@
 
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-4,6-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036
+/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036,72063

Modified: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc
URL: 
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc?rev=72064&r1=72063&r2=72064&view=diff
==
--- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc  
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/bg-BG.rc  
[iso-8859-1] Sun Jul 31 12:46:15 2016
@@ -273,3 +273,10 @@
 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: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc
URL: 
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc?rev=72064&r1=72063&r2=72064&view=diff
==
--- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc  
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/de-DE.rc  
[iso-8859-1] Sun Jul 31 12:46:15 2016
@@ -292,3 +292,10 @@
 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: branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc
URL: 
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc?rev=72064&r1=72063&r2=72064&view=diff
==
--- branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc  
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_2/reactos/dll/win32/browseui/lang/en-US.rc  
[iso-8859-1] Sun Jul 31 12:46:15 2016
@@ -291,3 +291,10 @@
 BEGIN
 IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Fold

[ros-diffs] [mjansen] 72063: [BROWSEUI] Correct the 'Is this legal' url as suggested by Ken Rochard. Also rewrite the function to remove todo's, and make it localizable. CORE-11721 #resolve #comment T

2016-07-31 Thread mjansen
Author: mjansen
Date: Sun Jul 31 11:59:15 2016
New Revision: 72063

URL: http://svn.reactos.org/svn/reactos?rev=72063&view=rev
Log:
[BROWSEUI] Correct the 'Is this legal' url as suggested by Ken Rochard. Also 
rewrite the function to remove todo's, and make it localizable. CORE-11721 
#resolve #comment Thanks!

Modified:
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/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/dll/win32/browseui/lang/bg-BG.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg-BG.rc?rev=72063&r1=72062&r2=72063&view=diff
==
--- 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] Sun Jul 31 
11:59:15 2016
@@ -273,3 +273,10 @@
 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-DE.rc?rev=72063&r1=72062&r2=72063&view=diff
==
--- 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] Sun Jul 31 
11:59:15 2016
@@ -292,3 +292,10 @@
 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-US.rc?rev=72063&r1=72062&r2=72063&view=diff
==
--- 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] Sun Jul 31 
11:59:15 2016
@@ -291,3 +291,10 @@
 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-ES.rc?rev=72063&r1=72062&r2=72063&view=diff
==
--- 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] Sun Jul 31 
11:59:15 2016
@@ -275,3 +275,10 @@
 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 

[ros-diffs] [pschweitzer] 72062: [REISERFS] Reduce verbosity

2016-07-31 Thread pschweitzer
Author: pschweitzer
Date: Sun Jul 31 10:13:39 2016
New Revision: 72062

URL: http://svn.reactos.org/svn/reactos?rev=72062&view=rev
Log:
[REISERFS]
Reduce verbosity

Modified:
trunk/reactos/drivers/filesystems/reiserfs/src/debug.c

Modified: trunk/reactos/drivers/filesystems/reiserfs/src/debug.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiserfs/src/debug.c?rev=72062&r1=72061&r2=72062&view=diff
==
--- trunk/reactos/drivers/filesystems/reiserfs/src/debug.c  [iso-8859-1] 
(original)
+++ trunk/reactos/drivers/filesystems/reiserfs/src/debug.c  [iso-8859-1] 
Sun Jul 31 10:13:39 2016
@@ -22,7 +22,7 @@
 
 extern PRFSD_GLOBAL RfsdGlobal;
 
-LONG   DebugLevel = DBG_FUNC;
+LONG   DebugLevel = DBG_USER;
 
 ULONG  ProcessNameOffset = 0;