Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[aandrejevic] 67454: [NTVDM] Properly initialize the CON device file descriptor when copying the system handle table.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Apr 26 23:24:21 2015 New Revision: 67454 URL: http://svn.reactos.org/svn/reactos?rev=67454&view=rev Log: [NTVDM] Properly initialize the CON device file descriptor when copying the system handle table. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] Sun Apr 26 23:24:21 2015 @@ -102,7 +102,7 @@ { PDOS_DEVICE_NODE Node = DosGetDriverNode(SysVars->ActiveCon); - Descriptor->DeviceInfo = 1 << 7; + Descriptor->DeviceInfo = Node->DeviceAttributes | (1 << 7); Descriptor->DevicePointer = SysVars->ActiveCon; /* Call the open routine */

9 years, 8 months

[spetreolle] 67453: [SCHANNEL] Use the force^W SONAME_LIBGNUTLS constant.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Apr 26 20:51:10 2015 New Revision: 67453 URL: http://svn.reactos.org/svn/reactos?rev=67453&view=rev Log: [SCHANNEL] Use the force^W SONAME_LIBGNUTLS constant. Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] Sun Apr 26 20:51:10 2015 @@ -23,6 +23,7 @@ #include <wine/config.h> #include <wine/port.h> +#include <wine/library.h> #include <strsafe.h> #ifdef SONAME_LIBGNUTLS @@ -510,7 +511,13 @@ wcscat(Path, L"\\"); wcscat(Path, SONAME_LIBGNUTLS); */ - static const WCHAR Path[] = L"C:\\Reactos\\system32\\gnutls\\libgnutls-28.dll"; + WCHAR Path[MAX_PATH]; + DWORD PathSize = sizeof(Path); + PathSize = GetSystemDirectoryW(Path, PathSize); + if(!PathSize) + return FALSE; + wcscat(Path, L"\\"); + wcscat(Path, SONAME_LIBGNUTLS); libgnutls_handle = LoadLibraryExW(Path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!libgnutls_handle) Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Apr 26 20:51:10 2015 @@ -1227,7 +1227,7 @@ /* #undef SONAME_LIBGLU */ /* Define to the soname of the libgnutls library. */ -#define SONAME_LIBGNUTLS L"libgnutls-28.dll" +#define SONAME_LIBGNUTLS L"gnutls\\libgnutls-28.dll" /* Define to the soname of the libgsm library. */ /* #undef SONAME_LIBGSM */

9 years, 8 months

[dreimer] 67452: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment DOCUMENTATION patch applied.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 26 20:47:24 2015 New Revision: 67452 URL: http://svn.reactos.org/svn/reactos?rev=67452&view=rev Log: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment DOCUMENTATION patch applied. Modified: trunk/documentation/rosdocs/readme.dbk Modified: trunk/documentation/rosdocs/readme.dbk URL: http://svn.reactos.org/svn/reactos/trunk/documentation/rosdocs/readme.dbk?r… ============================================================================== --- trunk/documentation/rosdocs/readme.dbk [iso-8859-1] (original) +++ trunk/documentation/rosdocs/readme.dbk [iso-8859-1] Sun Apr 26 20:47:24 2015 @@ -13,7 +13,7 @@ </author> <copyright> <year>2003</year> - <holder>Reactos Development Team</holder> + <holder>ReactOS Development Team</holder> </copyright> <revhistory> <revision>

9 years, 8 months

[dreimer] 67451: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment Corrected the one in startmenu.h too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 26 20:43:26 2015 New Revision: 67451 URL: http://svn.reactos.org/svn/reactos?rev=67451&view=rev Log: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment Corrected the one in startmenu.h too. Modified: trunk/rosapps/applications/explorer-old/taskbar/startmenu.h Modified: trunk/rosapps/applications/explorer-old/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/explorer-old/… ============================================================================== --- trunk/rosapps/applications/explorer-old/taskbar/startmenu.h [iso-8859-1] (original) +++ trunk/rosapps/applications/explorer-old/taskbar/startmenu.h [iso-8859-1] Sun Apr 26 20:43:26 2015 @@ -26,7 +26,7 @@ // -#define CLASSNAME_STARTMENU TEXT("ReactosStartmenuClass") +#define CLASSNAME_STARTMENU TEXT("ReactOSStartmenuClass") #define TITLE_STARTMENU TEXT("Start Menu")

9 years, 8 months

[dreimer] 67450: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment ROSAPPS patch applied.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 26 20:38:46 2015 New Revision: 67450 URL: http://svn.reactos.org/svn/reactos?rev=67450&view=rev Log: [ROSAPPS] Capitalize "os" in the "ReactOS" part 3 by Adam Stachowicz CORE-9558 #comment ROSAPPS patch applied. Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c trunk/rosapps/applications/sysutils/utils/pice/loader/main.c trunk/rosapps/applications/sysutils/utils/pice/module/parse.c trunk/rosapps/applications/sysutils/utils/pice/module/patch.c trunk/rosapps/applications/sysutils/utils/pice/module/symbols.c trunk/rosapps/applications/sysutils/utils/pice/module/utils.c trunk/rosapps/applications/sysutils/utils/pice/module/vga.c trunk/rosapps/applications/sysutils/utils/pice/module/vga_utils.asm trunk/rosapps/applications/sysutils/utils/pice/readme.txt trunk/rosapps/demos/maze/maze.c Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -2,7 +2,7 @@ * [ maze ] ... * * modified: [ 03-08-15 ] Ge van Geldorp <ge(a)gse.nl> - * ported to Reactos + * ported to ReactOS * modified: [ 94-10-8 ] Ge van Geldorp <Ge.vanGeldorp(a)lr.tudelft.nl> * ported to MS Windows * modified: [ 3-7-93 ] Jamie Zawinski <jwz(a)lucid.com> Modified: trunk/rosapps/applications/sysutils/utils/pice/loader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/loader/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/loader/main.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -17,7 +17,7 @@ Author: Klaus P. Gerlicher - Reactos Port by Eugene Ingerman + ReactOS Port by Eugene Ingerman Revision History: Modified: trunk/rosapps/applications/sysutils/utils/pice/module/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/parse.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/parse.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -175,7 +175,7 @@ CMDTABLE CmdTable[]={ {"gdt",ShowGdt,"display current global descriptor table" ,0,{0,0,0,0,0},"",COMMAND_GROUP_STRUCT}, {"idt",ShowIdt,"display current interrupt descriptor table" ,0,{0,0,0,0,0},"",COMMAND_GROUP_STRUCT}, - {"x",LeaveIce,"return to Reactos" ,0,{0,0,0,0,0},"",COMMAND_GROUP_FLOW}, + {"x",LeaveIce,"return to ReactOS" ,0,{0,0,0,0,0},"",COMMAND_GROUP_FLOW}, {"t",SingleStep,"single step one instruction" ,0,{0,0,0,0,0},"",COMMAND_GROUP_FLOW}, {"vma",ShowVirtualMemory,"displays VMAs" ,0,{0,0,0,0,0},"",COMMAND_GROUP_OS}, {"h",ShowHelp,"list help on commands" ,0,{0,0,0,0,0},"",COMMAND_GROUP_HELP}, @@ -2003,7 +2003,7 @@ COMMAND_PROTOTYPE(Ver) { //ei add kernel version info??!! - PICE_sprintf(tempCmd,"pICE: version %u.%u (build %u) for Reactos\n", + PICE_sprintf(tempCmd,"pICE: version %u.%u (build %u) for ReactOS\n", PICE_MAJOR_VERSION, PICE_MINOR_VERSION, PICE_BUILD); @@ -2016,7 +2016,7 @@ */ Print(OUTPUT_WINDOW,tempCmd); Print(OUTPUT_WINDOW,"pICE: written by Klaus P. Gerlicher and Goran Devic.\n"); - Print(OUTPUT_WINDOW,"pICE: ported to Reactos by Eugene Ingerman.\n"); + Print(OUTPUT_WINDOW,"pICE: ported to ReactOS by Eugene Ingerman.\n"); return TRUE; } Modified: trunk/rosapps/applications/sysutils/utils/pice/module/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/patch.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/patch.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -17,7 +17,7 @@ Author: Klaus P. Gerlicher - Reactos Port: Eugene Ingerman + ReactOS Port: Eugene Ingerman Revision History: Modified: trunk/rosapps/applications/sysutils/utils/pice/module/symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/symbols.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/symbols.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -15,7 +15,7 @@ Author: Klaus P. Gerlicher - Reactos Port by Eugene Ingerman + ReactOS Port by Eugene Ingerman Revision History: Modified: trunk/rosapps/applications/sysutils/utils/pice/module/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/utils.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/utils.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -847,7 +847,7 @@ SetForegroundColor(COLOR_TEXT); SetBackgroundColor(COLOR_CAPTION); ClrLine(wWindow[OUTPUT_WINDOW].y+wWindow[OUTPUT_WINDOW].cy); - PutChar(" Reactos is running... (Press CTRL-D to stop) ",1,wWindow[OUTPUT_WINDOW].y+wWindow[OUTPUT_WINDOW].cy); + PutChar(" ReactOS is running... (Press CTRL-D to stop) ",1,wWindow[OUTPUT_WINDOW].y+wWindow[OUTPUT_WINDOW].cy); ResetColor(); LEAVE_FUNC(); Modified: trunk/rosapps/applications/sysutils/utils/pice/module/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/vga.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/vga.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -17,7 +17,7 @@ Author: Klaus P. Gerlicher - Reactos Port by Eugene Ingerman + ReactOS Port by Eugene Ingerman Revision History: Modified: trunk/rosapps/applications/sysutils/utils/pice/module/vga_utils.asm URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/module/vga_utils.asm [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/module/vga_utils.asm [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -18,7 +18,7 @@ ;Author: ; ; Klaus P. Gerlicher -; Reactos Port by Eugene Ingerman +; ReactOS Port by Eugene Ingerman ; ;Revision History: ; Modified: trunk/rosapps/applications/sysutils/utils/pice/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/pice/readme.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/pice/readme.txt [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -3,12 +3,12 @@ BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA - PICE for Reactos is in early beta stage of development. It still has many bugs. + PICE for ReactOS is in early beta stage of development. It still has many bugs. BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA-BETA -PICE is a kernel debugger that was ported for Reactos (the original Linux +PICE is a kernel debugger that was ported for ReactOS (the original Linux project by Klaus P. Gerlicher and Goran Devic may be found here: http://pice.sourceforge.net). @@ -22,7 +22,7 @@ in ntoskrnl/ldr/loader.c after the line loading keyboard driver. 2. You should copy pice.cfg and ntoskrnl.sym to \SystemRoot\symbols directory -of Reactos. +of ReactOS. 3. If you want to add symbolic information you should use loader.exe to create .dbg file from the unstrippped version of exe or driver: @@ -44,7 +44,7 @@ gdt display current global descriptor table idt display current interrupt descriptor table -x return to Reactos +x return to ReactOS t single step one instruction vma displays VMAs h list help on commands Modified: trunk/rosapps/demos/maze/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/maze.c?rev=6745… ============================================================================== --- trunk/rosapps/demos/maze/maze.c [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/maze.c [iso-8859-1] Sun Apr 26 20:38:46 2015 @@ -2,7 +2,7 @@ * [ maze ] ... * * modified: [ 03-08-15 ] Ge van Geldorp <ge(a)gse.nl> - * ported to Reactos + * ported to ReactOS * modified: [ 94-10-8 ] Ge van Geldorp <Ge.vanGeldorp(a)lr.tudelft.nl> * ported to MS Windows * modified: [ 3-7-93 ] Jamie Zawinski <jwz(a)lucid.com>

9 years, 8 months

[dreimer] 67449: [CARDS] Alignment issue with the new cards dll by oldman ROSAPPS-296 #comment Tried to minimize the issue. Better IMO

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 26 20:22:01 2015 New Revision: 67449 URL: http://svn.reactos.org/svn/reactos?rev=67449&view=rev Log: [CARDS] Alignment issue with the new cards dll by oldman ROSAPPS-296 #comment Tried to minimize the issue. Better IMO Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available.

9 years, 8 months

[tkreuzer] 67448: [XDK] Add arm/mm.h (not used yet)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 26 20:20:08 2015 New Revision: 67448 URL: http://svn.reactos.org/svn/reactos?rev=67448&view=rev Log: [XDK] Add arm/mm.h (not used yet) Added: trunk/reactos/include/xdk/arm/mm.h (with props) Added: trunk/reactos/include/xdk/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/arm/mm.h?rev=6… ============================================================================== --- trunk/reactos/include/xdk/arm/mm.h (added) +++ trunk/reactos/include/xdk/arm/mm.h [iso-8859-1] Sun Apr 26 20:20:08 2015 @@ -0,0 +1,27 @@ +$if (_NTDDK_) + +#define PTI_SHIFT 12 +#define PDI_SHIFT 22 + +#define PDE_BASE 0xC0300000 +#define PTE_BASE 0xC0000000 +#define PDE_TOP 0xC0300FFF +#define PTE_TOP 0xC03FFFFF + +extern NTKERNELAPI PVOID MmHighestUserAddress; +extern NTKERNELAPI PVOID MmSystemRangeStart; +extern NTKERNELAPI ULONG MmUserProbeAddress; + +#define MM_HIGHEST_USER_ADDRESS MmHighestUserAddress +#define MM_SYSTEM_RANGE_START MmSystemRangeStart +#if defined(_LOCAL_COPY_USER_PROBE_ADDRESS_) +#define MM_USER_PROBE_ADDRESS _LOCAL_COPY_USER_PROBE_ADDRESS_ +extern ULONG _LOCAL_COPY_USER_PROBE_ADDRESS_; +#else +#define MM_USER_PROBE_ADDRESS MmUserProbeAddress +#endif +#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 +#define MM_KSEG0_BASE MM_SYSTEM_RANGE_START +#define MM_SYSTEM_SPACE_END 0xFFFFFFFF + +$endif /* _NTDDK_ */ Propchange: trunk/reactos/include/xdk/arm/mm.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[dreimer] 67447: [MAZE] (RIP GvG...) Improvements to Maze by Jared Smudde ROSAPPS-299 #resolve #comment Applied, thx for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 26 20:02:30 2015 New Revision: 67447 URL: http://svn.reactos.org/svn/reactos?rev=67447&view=rev Log: [MAZE] (RIP GvG...) Improvements to Maze by Jared Smudde ROSAPPS-299 #resolve #comment Applied, thx for help. Modified: trunk/rosapps/demos/maze/maze.rc trunk/rosapps/demos/maze/resource.h Modified: trunk/rosapps/demos/maze/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/maze.rc?rev=674… ============================================================================== --- trunk/rosapps/demos/maze/maze.rc [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/maze.rc [iso-8859-1] Sun Apr 26 20:02:30 2015 @@ -1,60 +1,12 @@ -//Microsoft App Studio generated resource script. -// #include "resource.h" +#include <scrnsave.h> -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <scrnsave.h> -///////////////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - - -////////////////////////////////////////////////////////////////////////////// -// -// String Table -// +#define REACTOS_STR_FILE_DESCRIPTION "Maze Demo and Screen Saver" +#define REACTOS_STR_INTERNAL_NAME "maze" +#define REACTOS_STR_ORIGINAL_FILENAME "maze.exe" +#include <reactos/version.rc> STRINGTABLE DISCARDABLE BEGIN idsAppName "Screen Saver.Maze" END - -#ifdef APSTUDIO_INVOKED -////////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include <scrnsave.h>\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -///////////////////////////////////////////////////////////////////////////////////// -#endif // APSTUDIO_INVOKED - - -#ifndef APSTUDIO_INVOKED -//////////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/rosapps/demos/maze/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/resource.h?rev=… ============================================================================== --- trunk/rosapps/demos/maze/resource.h [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/resource.h [iso-8859-1] Sun Apr 26 20:02:30 2015 @@ -1,16 +1,4 @@ -//{{NO_DEPENDENCIES}} -// App Studio generated include file. -// Used by MAZE.RC -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS - #define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_COMMAND_VALUE 101 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif

9 years, 8 months

[akhaldi] 67446: [USERENV] Check for invalid parameters in Get{Profiles, UserProfile}Directory{A, W}. Fixes userenv:userenv test crash.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 26 19:17:51 2015 New Revision: 67446 URL: http://svn.reactos.org/svn/reactos?rev=67446&view=rev Log: [USERENV] Check for invalid parameters in Get{Profiles,UserProfile}Directory{A,W}. Fixes userenv:userenv test crash. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sun Apr 26 19:17:51 2015 @@ -672,6 +672,12 @@ LPWSTR lpBuffer; BOOL bResult; + if (!lpProfileDir || !lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + lpBuffer = GlobalAlloc(GMEM_FIXED, *lpcchSize * sizeof(WCHAR)); if (lpBuffer == NULL) @@ -708,6 +714,12 @@ HKEY hKey; LONG Error; + if (!lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, @@ -774,6 +786,12 @@ { LPWSTR lpBuffer; BOOL bResult; + + if (!lpProfileDir || !lpcchSize) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } lpBuffer = GlobalAlloc(GMEM_FIXED, *lpcchSize * sizeof(WCHAR)); @@ -814,6 +832,12 @@ DWORD dwLength; HKEY hKey; LONG Error; + + if (!lpcchSize) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } if (!GetUserSidStringFromToken(hToken, &SidString))

9 years, 8 months

[akhaldi] 67445: [USERENV_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 26 18:38:10 2015 New Revision: 67445 URL: http://svn.reactos.org/svn/reactos?rev=67445&view=rev Log: [USERENV_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/userenv/userenv.c Modified: trunk/rostests/winetests/userenv/userenv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/userenv… ============================================================================== --- trunk/rostests/winetests/userenv/userenv.c [iso-8859-1] (original) +++ trunk/rostests/winetests/userenv/userenv.c [iso-8859-1] Sun Apr 26 18:38:10 2015 @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winreg.h" #include "userenv.h" @@ -32,11 +33,13 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) +#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %d\n", (EXPECTED), GetLastError()) + +static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); struct profile_item { const char * name; - const int todo[4]; }; /* Helper function for retrieving environment variables */ @@ -72,38 +75,46 @@ static void test_create_env(void) { - BOOL r; + BOOL r, is_wow64 = FALSE; HANDLE htok; WCHAR * env[4]; - char * st; + char * st, systemroot[100]; int i, j; static const struct profile_item common_vars[] = { - { "ComSpec", { 1, 1, 0, 0 } }, - { "COMPUTERNAME", { 1, 1, 1, 1 } }, - { "NUMBER_OF_PROCESSORS", { 1, 1, 0, 0 } }, - { "OS", { 1, 1, 0, 0 } }, - { "PROCESSOR_ARCHITECTURE", { 1, 1, 0, 0 } }, - { "PROCESSOR_IDENTIFIER", { 1, 1, 0, 0 } }, - { "PROCESSOR_LEVEL", { 1, 1, 0, 0 } }, - { "PROCESSOR_REVISION", { 1, 1, 0, 0 } }, - { "SystemDrive", { 1, 1, 0, 0 } }, - { "SystemRoot", { 1, 1, 0, 0 } }, - { "windir", { 1, 1, 0, 0 } } + { "ComSpec" }, + { "COMPUTERNAME" }, + { "NUMBER_OF_PROCESSORS" }, + { "OS" }, + { "PROCESSOR_ARCHITECTURE" }, + { "PROCESSOR_IDENTIFIER" }, + { "PROCESSOR_LEVEL" }, + { "PROCESSOR_REVISION" }, + { "SystemDrive" }, + { "SystemRoot" }, + { "windir" } }; static const struct profile_item common_post_nt4_vars[] = { - { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, - { "TEMP", { 1, 1, 0, 0 } }, - { "TMP", { 1, 1, 0, 0 } }, - { "CommonProgramFiles", { 1, 1, 0, 0 } }, - { "ProgramFiles", { 1, 1, 0, 0 } } + { "ALLUSERSPROFILE" }, + { "TEMP" }, + { "TMP" }, + { "CommonProgramFiles" }, + { "ProgramFiles" }, + { "PATH" }, + { "USERPROFILE" } }; - static const struct profile_item htok_vars[] = { - { "PATH", { 1, 1, 0, 0 } }, - { "USERPROFILE", { 1, 1, 0, 0 } } + static const struct profile_item common_win64_vars[] = { + { "ProgramW6432" }, + { "CommonProgramW6432" } }; r = SetEnvironmentVariableA("WINE_XYZZY", "ZZYZX"); + expect(TRUE, r); + + r = GetEnvironmentVariableA("SystemRoot", systemroot, sizeof(systemroot)); + ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + + r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); if (0) @@ -135,16 +146,24 @@ r = CreateEnvironmentBlock((LPVOID) &env[3], htok, TRUE); expect(TRUE, r); + r = SetEnvironmentVariableA("SystemRoot", systemroot); + expect(TRUE, r); + + for(i=0; i<4; i++) + { + r = get_env(env[i], "SystemRoot", &st); + ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); + expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); + } + /* Test for common environment variables (NT4 and higher) */ for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) { for (j = 0; j < 4; j++) { r = get_env(env[j], common_vars[i].name, &st); - if (common_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_vars[i].name); - else - expect_env(TRUE, r, common_vars[i].name); + expect_env(TRUE, r, common_vars[i].name); if (r) HeapFree(GetProcessHeap(), 0, st); } } @@ -161,26 +180,24 @@ for (j = 0; j < 4; j++) { r = get_env(env[j], common_post_nt4_vars[i].name, &st); - if (common_post_nt4_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_post_nt4_vars[i].name); - else - expect_env(TRUE, r, common_post_nt4_vars[i].name); + expect_env(TRUE, r, common_post_nt4_vars[i].name); if (r) HeapFree(GetProcessHeap(), 0, st); } } } - /* Test for environment variables with values that depends on htok */ - for (i = 0; i < sizeof(htok_vars)/sizeof(htok_vars[0]); i++) - { - for (j = 0; j < 4; j++) + if(pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + if (sizeof(void*)==8 || is_wow64) + { + for (i = 0; i < sizeof(common_win64_vars)/sizeof(common_win64_vars[0]); i++) { - r = get_env(env[j], htok_vars[i].name, &st); - if (htok_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, htok_vars[i].name); - else - expect_env(TRUE, r, htok_vars[i].name); - if (r) HeapFree(GetProcessHeap(), 0, st); + for (j=0; j<4; j++) + { + r = get_env(env[j], common_win64_vars[i].name, &st); + ok(r || broken(!r)/* Vista,2k3,XP */, "Expected 1, got 0 for %s\n", common_win64_vars[i].name); + if (r) HeapFree(GetProcessHeap(), 0, st); + } } } @@ -205,7 +222,190 @@ } } +static void test_get_profiles_dir(void) +{ + static const char ProfileListA[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"; + static const char ProfilesDirectory[] = "ProfilesDirectory"; + BOOL r; + DWORD cch, profiles_len; + LONG l; + HKEY key; + char *profiles_dir, *buf, small_buf[1]; + + l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); + ok(!l, "RegOpenKeyExA failed: %d\n", GetLastError()); + + l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); + if (l) + { + win_skip("No ProfilesDirectory value (NT4), skipping tests\n"); + return; + } + buf = HeapAlloc(GetProcessHeap(), 0, cch); + RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, (BYTE *)buf, &cch); + RegCloseKey(key); + profiles_len = ExpandEnvironmentStringsA(buf, NULL, 0); + profiles_dir = HeapAlloc(GetProcessHeap(), 0, profiles_len); + ExpandEnvironmentStringsA(buf, profiles_dir, profiles_len); + HeapFree(GetProcessHeap(), 0, buf); + + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryA(NULL, NULL); + expect(FALSE, r); + expect_gle(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryA(NULL, &cch); + expect(FALSE, r); + expect_gle(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + cch = 1; + r = GetProfilesDirectoryA(small_buf, &cch); + expect(FALSE, r); + expect_gle(ERROR_INSUFFICIENT_BUFFER); + /* MSDN claims the returned character count includes the NULL terminator + * when the buffer is too small, but that's not in fact what gets returned. + */ + ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); + /* Allocate one more character than the return value to prevent a buffer + * overrun. + */ + buf = HeapAlloc(GetProcessHeap(), 0, cch + 1); + r = GetProfilesDirectoryA(buf, &cch); + /* Rather than a BOOL, the return value is also the number of characters + * stored in the buffer. + */ + expect(profiles_len - 1, r); + ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); + + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, profiles_dir); + + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryW(NULL, NULL); + expect(FALSE, r); + expect_gle(ERROR_INVALID_PARAMETER); + + cch = 0; + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryW(NULL, &cch); + expect(FALSE, r); + expect_gle(ERROR_INSUFFICIENT_BUFFER); + ok(cch, "expected cch > 0\n"); + + SetLastError(0xdeadbeef); + r = GetProfilesDirectoryW(NULL, &cch); + expect(FALSE, r); + expect_gle(ERROR_INSUFFICIENT_BUFFER); +} + +static void test_get_user_profile_dir(void) +{ + BOOL ret; + DWORD error, len; + HANDLE token; + char *dirA; + WCHAR *dirW; + + if (!GetEnvironmentVariableA( "ALLUSERSPROFILE", NULL, 0 )) + { + win_skip("Skipping tests on NT4\n"); + return; + } + + ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); + ok(ret, "expected success %u\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( NULL, NULL, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, NULL, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + dirA = HeapAlloc( GetProcessHeap(), 0, 32 ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + HeapFree( GetProcessHeap(), 0, dirA ); + + len = 0; + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, NULL, &len ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(!len, "expected 0, got %u\n", len); + + len = 0; + dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, &len ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(len, "expected len > 0\n"); + HeapFree( GetProcessHeap(), 0, dirA ); + + dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, &len ); + ok(ret, "expected success %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + trace("%s\n", dirA); + HeapFree( GetProcessHeap(), 0, dirA ); + + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, NULL, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + dirW = HeapAlloc( GetProcessHeap(), 0, 32 ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, dirW, NULL ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + HeapFree( GetProcessHeap(), 0, dirW ); + + len = 0; + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, NULL, &len ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(len, "expected len > 0\n"); + + dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR) ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, dirW, &len ); + ok(ret, "expected success %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); + HeapFree( GetProcessHeap(), 0, dirW ); + + CloseHandle( token ); +} + START_TEST(userenv) { + pIsWow64Process = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + test_create_env(); + test_get_profiles_dir(); + test_get_user_profile_dir(); }

9 years, 8 months

← Newer
1
2
3
4
5
6
7
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015