Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[tkreuzer] 39312: Use %p instead of %0xlx as format for pointer sized variable.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 06:31:24 2009 New Revision: 39312 URL: http://svn.reactos.org/svn/reactos?rev=39312&view=rev Log: Use %p instead of %0xlx as format for pointer sized variable. Modified: branches/ros-amd64-bringup/reactos/dll/directx/dinput/dinput_main.c Modified: branches/ros-amd64-bringup/reactos/dll/directx/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/dinput/dinput_main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/dinput/dinput_main.c [iso-8859-1] Tue Feb 3 06:31:24 2009 @@ -141,7 +141,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { IDirectInputImpl* This; - TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); + TRACE("(0x%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; @@ -157,7 +157,7 @@ HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { IDirectInputImpl* This; - TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); + TRACE("(0x%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1;

15 years, 10 months

[tkreuzer] 39311: implement _mktime32, _mkgmtime32, _mktime64, _mkgmtime64 and use a worker function for all versions.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 06:27:01 2009 New Revision: 39311 URL: http://svn.reactos.org/svn/reactos?rev=39311&view=rev Log: implement _mktime32, _mkgmtime32, _mktime64, _mkgmtime64 and use a worker function for all versions. Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] Tue Feb 3 06:27:01 2009 @@ -6,36 +6,17 @@ * PROGRAMERS: Timo Kreuzer */ #include <precomp.h> +#include "bitsfixup.h" -time_t -mktime_worker(struct tm * ptm, int utc) -{ - return 0; -} - -/* int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -*/ +#define MAX_32BIT_TIME 0xFFFFFFFFULL static int g_monthdays[13] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365}; - -/** - * \name _mkgmtime - * - */ -time_t -_mkgmtime(struct tm *ptm) +__time64_t +mktime_worker(struct tm * ptm, int utc) { struct tm *ptm2; - time_t time; + __time64_t time; int mons, years, leapyears; /* Normalize year and month */ @@ -105,20 +86,57 @@ return time; } +/* int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +*/ + +/** + * \name _mkgmtime + * + */ +time_t +_mkgmtime(struct tm *ptm) +{ + time_t time = mktime_worker(ptm, 1); + return (time > MAX_32BIT_TIME) ? -1 : time; +} + time_t mktime(struct tm *ptm) { - time_t time; - - /* Convert the time as if it was UTC */ - time = _mkgmtime(ptm); - - /* Apply offset */ - if (time != -1) - { - time += _timezone; - } - - return time; + time_t time = mktime_worker(ptm, 0); + return (time > MAX_32BIT_TIME) ? -1 : time; } +__time32_t +_mkgmtime32(struct tm *ptm) +{ + time_t time = mktime_worker(ptm, 1); + return (time > MAX_32BIT_TIME) ? -1 : time; +} + +__time32_t +_mktime32(struct tm *ptm) +{ + time_t time = mktime_worker(ptm, 0); + return (time > MAX_32BIT_TIME) ? -1 : time; +} + +__time64_t +_mkgmtime64(struct tm *ptm) +{ + return mktime_worker(ptm, 1); +} + +__time64_t +_mktime64(struct tm *ptm) +{ + return mktime_worker(ptm, 0); +}

15 years, 10 months

[cfinck] 39310: Remove the non-working applications based on http://www.reactos.org/wiki/index.php/Tests_for_0.3.8

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 06:05:40 2009 New Revision: 39310 URL: http://svn.reactos.org/svn/reactos?rev=39310&view=rev Log: Remove the non-working applications based on http://www.reactos.org/wiki/index.php/Tests_for_0.3.8 Modified: branches/ros-branch-0_3_8/rosapps/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_8/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/rosapps/applic… ============================================================================== --- branches/ros-branch-0_3_8/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/rosapps/applications/downloader/downloader.xml [iso-8859-1] Tue Feb 3 06:05:40 2009 @@ -14,13 +14,6 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32…</location> </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.63</version> - <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> - <location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location> - </application> <application name="Thunderbird 2.0"> <regname>Mozilla Thunderbird (2.0.0.19)</regname> <licence>MPL/GPL/LGPL</licence> @@ -28,22 +21,11 @@ <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w…</location> </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.14)</regname> - <version>1.1.14</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamo…</location> - </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> <version>1.7.12</version> <description>Essential Component to get ReactOS Explorer's and other applications' Internet Browsing feature running.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> - <application name="Off By One Browser"> - <regname>The Off By One Web Browser</regname> - <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> - <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> </application> <application name="mIRC"> <regname>mIRC</regname> @@ -55,12 +37,6 @@ <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> - </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.7.4</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> </application> <application name="Putty"> <regname>PuTTY version 0.60</regname> @@ -77,25 +53,8 @@ <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 3.0.1</regname> - <version>3.0.1</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.0.1/OOo_3.0.1_Win32Intel_…</location> - </application> </category> <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>4.23</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://irfanview.tuwien.ac.at/iview423_setup.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>4.22</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_422_setup.exe</location> - </application> <application name="TuxPaint"> <regname>Tux Paint 0.9.19</regname> <version>0.9.19</version> @@ -110,76 +69,14 @@ </application> </category> <category name="Libraries" icon="4"> - <application name="Microsoft XML 3"> - <regname>msxml3</regname> - <version>3.0</version> - <description>MSXML3 is needed for some MSI Installers.</description> - <location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1…</location> - </application> - <application name="OLE Viewer and Microsoft Foundation Classes version 4"> - <regname>mfc40</regname> - <version>4.0</version> - <description>MFC 4 is needed by some applications</description> - <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> - </application> - - <application name="Visual Basic 5 Runtime"> - <regname>vb5run</regname> - <version>5.0</version> - <description>Visual Basic 5 Runtime</description> - <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> - </application> - <application name="Visual Basic 6 Runtime"> <regname>vb6run</regname> <version>6.0</version> <description>Visual Basic 6 Runtime</description> <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> </application> - - <application name="Visual Studio 6 Runtime"> - <regname>vc6run</regname> - <version>6.0</version> - <description>Visual Studio 6 Runtime</description> - <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> - </application> - - <application name="Visual Studio 2005 Runtime"> - <regname>vc2005run</regname> - <version>7.0</version> - <description>Visual Studio 2005 Runtime</description> - <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> - </application> - - <application name="Visual Studio 2005 Runtime SP1"> - <regname>vc2005sp1run</regname> - <version>7.1</version> - <description>Visual Studio 2005 Runtime SP1</description> - <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> - </application> - - <application name="Visual Studio 2008 Runtime"> - <regname>vc2008run</regname> - <version>8.0</version> - <description>Visual Studio 2008 Runtime</description> - <location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5…</location> - </application> - </category> - <category name="Multimedia" icon="4"> </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> <version>0.18.4b</version> @@ -238,24 +135,12 @@ <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> </application> </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> - </category> <category name="Tools" icon="7"> <application name="7-Zip"> <regname>7-Zip 4.57</regname> <version>4.57</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z457.exe</location> - </application> - <application name="uTorrent"> - <regname>µTorrent</regname> - <version>1.8</version> - <description>Small and fast BitTorrent Client</description> - <location>http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe</location> </application> <application name="Audio Grabber"> <regname>Audiograbber 1.83 SE</regname>

15 years, 10 months

[cfinck] 39309: Merge 39307 and use the wallpaper (2/2)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 05:30:36 2009 New Revision: 39309 URL: http://svn.reactos.org/svn/reactos?rev=39309&view=rev Log: Merge 39307 and use the wallpaper (2/2) Added: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp (props changed) - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP.bmp branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg (props changed) - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg Modified: branches/ros-branch-0_3_8/wallpaper/ReadMe.txt branches/ros-branch-0_3_8/wallpaper/directory.rbuild Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/ros-branch-0_3_8/wallpaper/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/Read… ============================================================================== --- branches/ros-branch-0_3_8/wallpaper/ReadMe.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/wallpaper/ReadMe.txt [iso-8859-1] Tue Feb 3 05:30:36 2009 @@ -1,10 +1,8 @@ -wallpaper +Wallpapers +=========== -posten in ReactOS Forum May 17, 2006 7:31 pm -cluds.jpg -Copyright by Andreas Bjerkeholt (harteex at gmail dot com) - -lake.jpg -Copyright by Andreas Bjerkeholt (harteex at gmail dot com) - - +File Name | Author | Origin +-------------------------------------------------------------------------------------------------------------------------------------------------- +Angelus.02_ROSWP_4-3_1440x1080.jpg | Forum User "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 +lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 Modified: branches/ros-branch-0_3_8/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/dire… ============================================================================== --- branches/ros-branch-0_3_8/wallpaper/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/wallpaper/directory.rbuild [iso-8859-1] Tue Feb 3 05:30:36 2009 @@ -1,3 +1,3 @@ <group> - <installfile>lake.bmp</installfile> + <installfile>Angelus.02_ROSWP.bmp</installfile> </group>

15 years, 10 months

[cfinck] 39308: Merge 39307 and use the wallpaper (1/2)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 05:30:10 2009 New Revision: 39308 URL: http://svn.reactos.org/svn/reactos?rev=39308&view=rev Log: Merge 39307 and use the wallpaper (1/2) Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Tue Feb 3 05:30:10 2009 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus.02_ROSWP.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Feb 3 05:30:10 2009 @@ -684,7 +684,7 @@ modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +modules\wallpaper\Angelus.02_ROSWP.bmp 4 optional ; Native libraries modules\windows\mfc42.dll 1 optional

15 years, 10 months

[cfinck] 39307: Import the 4:3 version of the ReactOS wallpaper by forum user "Angelus" (jedi.knight@wanadoo.es), including the original 1440x1080 JPG and a 1024x768 BMP. It is now the default wallpaper for releases. I also reorganized the ReadMe file to make tracking the sources of these wallpapers easier.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 05:16:51 2009 New Revision: 39307 URL: http://svn.reactos.org/svn/reactos?rev=39307&view=rev Log: Import the 4:3 version of the ReactOS wallpaper by forum user "Angelus" (jedi.knight(a)wanadoo.es), including the original 1440x1080 JPG and a 1024x768 BMP. It is now the default wallpaper for releases. I also reorganized the ReadMe file to make tracking the sources of these wallpapers easier. Added: trunk/wallpaper/Angelus.02_ROSWP.bmp (with props) trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/wallpaper/ReadMe.txt trunk/wallpaper/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Feb 3 05:16:51 2009 @@ -694,7 +694,7 @@ modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +modules\wallpaper\Angelus.02_ROSWP.bmp 4 optional ; Native libraries modules\windows\mfc42.dll 1 optional Added: trunk/wallpaper/Angelus.02_ROSWP.bmp URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/Angelus.02_ROSWP.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/wallpaper/Angelus.02_ROSWP.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/Angelus.02_ROSWP_4-3_144… ============================================================================== Binary file - no diff available. Propchange: trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/wallpaper/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/ReadMe.txt?rev=39307&r1=… ============================================================================== --- trunk/wallpaper/ReadMe.txt [iso-8859-1] (original) +++ trunk/wallpaper/ReadMe.txt [iso-8859-1] Tue Feb 3 05:16:51 2009 @@ -1,10 +1,8 @@ -wallpaper +Wallpapers +=========== -posten in ReactOS Forum May 17, 2006 7:31 pm -cluds.jpg -Copyright by Andreas Bjerkeholt (harteex at gmail dot com) - -lake.jpg -Copyright by Andreas Bjerkeholt (harteex at gmail dot com) - - +File Name | Author | Origin +-------------------------------------------------------------------------------------------------------------------------------------------------- +Angelus.02_ROSWP_4-3_1440x1080.jpg | Forum User "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 +lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 Modified: trunk/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/directory.rbuild?rev=393… ============================================================================== --- trunk/wallpaper/directory.rbuild [iso-8859-1] (original) +++ trunk/wallpaper/directory.rbuild [iso-8859-1] Tue Feb 3 05:16:51 2009 @@ -1,3 +1,3 @@ <group> - <installfile>lake.bmp</installfile> + <installfile>Angelus.02_ROSWP.bmp</installfile> </group>

15 years, 10 months

[tkreuzer] 39306: remove #if 0 hack

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 3 05:12:22 2009 New Revision: 39306 URL: http://svn.reactos.org/svn/reactos?rev=39306&view=rev Log: remove #if 0 hack Modified: branches/ros-amd64-bringup/reactos/include/crt/tchar.h Modified: branches/ros-amd64-bringup/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/tchar.h [iso-8859-1] Tue Feb 3 05:12:22 2009 @@ -623,9 +623,7 @@ #define _tcscpy_s strcpy_s #define _tcsdup _strdup #define _tcslen strlen -#if 0 #define _tcsnlen strnlen -#endif #define _tcsxfrm strxfrm #define _tcsxfrm_l _strxfrm_l #define _tcserror strerror

15 years, 10 months

[cfinck] 39305: Merge 39294, 39295, 39304 Now ScummVM and probably some more apps work under ReactOS 0.3.8 :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 04:03:24 2009 New Revision: 39305 URL: http://svn.reactos.org/svn/reactos?rev=39305&view=rev Log: Merge 39294, 39295, 39304 Now ScummVM and probably some more apps work under ReactOS 0.3.8 :-) Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.h branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.rbuild branches/ros-branch-0_3_8/reactos/dll/win32/shell32/precomp.h branches/ros-branch-0_3_8/reactos/dll/win32/shell32/shellpath.c Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/base/system/winlogon/sas.c [iso-8859-1] Tue Feb 3 04:03:24 2009 @@ -175,6 +175,9 @@ SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; + UNICODE_STRING VariableName; + UNICODE_STRING VariableValue; + WCHAR AppDataPath[MAX_PATH]; /* Loading personal settings */ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); @@ -218,6 +221,18 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } + + /* Use SHGetFolderPathW for getting the AppData path */ + if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL) + { + WARN("WL: SHGetFolderPathW() failed\n"); + goto cleanup; + } + + /* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */ + RtlInitUnicodeString(&VariableName, L"APPDATA"); + RtlInitUnicodeString(&VariableValue, AppDataPath); + RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue); if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) { @@ -263,6 +278,8 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); + + /* FIXME: Set the "Volatile Environment" key for the new user */ /* Set default language */ if (!SetDefaultLanguage(TRUE)) Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Tue Feb 3 04:03:24 2009 @@ -39,6 +39,7 @@ #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> +#include <shlobj.h> #include <reactos/winlogon.h> Modified: branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/base/system/winlogon/winlogon.rbuild [iso-8859-1] Tue Feb 3 04:03:24 2009 @@ -9,6 +9,7 @@ <library>advapi32</library> <library>userenv</library> <library>secur32</library> + <library>shell32</library> <file>sas.c</file> <file>screensaver.c</file> <file>setup.c</file> Modified: branches/ros-branch-0_3_8/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue Feb 3 04:03:24 2009 @@ -45,7 +45,7 @@ #include <ndk/ntndk.h> #include <fmifs/fmifs.h> #include <largeint.h> - +#include <sddl.h> #include "base/shell/explorer-new/todo.h" #include "dlgs.h" Modified: branches/ros-branch-0_3_8/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Tue Feb 3 04:03:24 2009 @@ -1355,47 +1355,75 @@ if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; + if (CSIDL_Data[folder].type != CSIDL_Type_User) return E_INVALIDARG; + if (!pszPath) return E_INVALIDARG; - /* Only the current user and the default user are supported right now - * I'm afraid. - * FIXME: should be able to call GetTokenInformation on the token, - * then call ConvertSidToStringSidW on it to get the user prefix. - * But Wine's registry doesn't store user info by sid, it stores it - * by user name (and I don't know how to convert from a token to a - * user name). - */ - if (hToken != NULL && hToken != (HANDLE)-1) - { - FIXME("unsupported for user other than current or default\n"); - return E_FAIL; - } - if (dwFlags & SHGFP_TYPE_DEFAULT) + { hr = _SHGetDefaultValue(folder, pszPath); + } else { - LPCWSTR userPrefix = NULL; + LPWSTR userPrefix; HKEY hRootKey; if (hToken == (HANDLE)-1) { + /* Get the folder of the default user */ hRootKey = HKEY_USERS; - userPrefix = DefaultW; - } - else /* hToken == NULL, other values disallowed above */ + userPrefix = (LPWSTR)DefaultW; + } + else if(!hToken) + { + /* Get the folder of the current user */ hRootKey = HKEY_CURRENT_USER; - hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, - CSIDL_Data[folder].szValueName, pszPath); + userPrefix = NULL; + } + else + { + /* Get the folder of the specified user */ + DWORD InfoLength; + PTOKEN_USER UserInfo; + + hRootKey = HKEY_USERS; + + GetTokenInformation(hToken, TokenUser, NULL, 0, &InfoLength); + UserInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, InfoLength); + + if(!GetTokenInformation(hToken, TokenUser, UserInfo, InfoLength, &InfoLength)) + { + WARN("GetTokenInformation failed for %x!\n", hToken); + HeapFree(GetProcessHeap(), 0, UserInfo); + return E_FAIL; + } + + if(!ConvertSidToStringSidW(UserInfo->User.Sid, &userPrefix)) + { + WARN("ConvertSidToStringSidW failed for %x!\n", hToken); + HeapFree(GetProcessHeap(), 0, UserInfo); + return E_FAIL; + } + + HeapFree(GetProcessHeap(), 0, UserInfo); + } + + hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, CSIDL_Data[folder].szValueName, pszPath); + + /* Free the memory allocated by ConvertSidToStringSidW */ + if(hToken && hToken != (HANDLE)-1) + LocalFree(userPrefix); + if (FAILED(hr) && hRootKey != HKEY_LOCAL_MACHINE) - hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, - CSIDL_Data[folder].szValueName, pszPath); + hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, CSIDL_Data[folder].szValueName, pszPath); + if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); } + TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; }

15 years, 10 months

[cfinck] 39304: Fix freeing the allocated string SID

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 3 03:39:57 2009 New Revision: 39304 URL: http://svn.reactos.org/svn/reactos?rev=39304&view=rev Log: Fix freeing the allocated string SID Modified: trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Tue Feb 3 03:39:57 2009 @@ -1197,7 +1197,7 @@ hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, CSIDL_Data[folder].szValueName, pszPath); /* Free the memory allocated by ConvertSidToStringSidW */ - if(!hToken && hToken != (HANDLE)-1) + if(hToken && hToken != (HANDLE)-1) LocalFree(userPrefix); if (FAILED(hr) && hRootKey != HKEY_LOCAL_MACHINE)

15 years, 10 months

[dchapyshev] 39303: - Add stub for SHGetIconOverlayIndexA/W - Remove "-noname" attribute from ILAppendID function

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Feb 3 03:29:48 2009 New Revision: 39303 URL: http://svn.reactos.org/svn/reactos?rev=39303&view=rev Log: - Add stub for SHGetIconOverlayIndexA/W - Remove "-noname" attribute from ILAppendID function Modified: trunk/reactos/dll/win32/shell32/iconcache.c trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Tue Feb 3 03:29:48 2009 @@ -843,3 +843,27 @@ HeapFree(GetProcessHeap(), 0, lpwstrFile); return ret; } + +/**************************************************************************** + * SHGetIconOverlayIndexA [SHELL32.@] + * + * Returns the index of the overlay icon in the system image list. + */ +INT WINAPI SHGetIconOverlayIndexA(LPCSTR pszIconPath, INT iIconIndex) +{ + FIXME("%s, %d\n", debugstr_a(pszIconPath), iIconIndex); + + return -1; +} + +/**************************************************************************** + * SHGetIconOverlayIndexW [SHELL32.@] + * + * Returns the index of the overlay icon in the system image list. + */ +INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) +{ + FIXME("%s, %d\n", debugstr_w(pszIconPath), iIconIndex); + + return -1; +} Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Tue Feb 3 03:29:48 2009 @@ -151,7 +151,7 @@ 151 stdcall SHLoadOLE(long) 152 stdcall ILGetSize(ptr) 153 stdcall ILGetNext(ptr) -154 stdcall -noname ILAppendID(long long long) ILAppend +154 stdcall ILAppendID(long long long) ILAppend 155 stdcall ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) 157 stdcall ILCreateFromPath(ptr) ILCreateFromPathAW @@ -304,8 +304,8 @@ 304 stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) 305 stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) 306 stdcall SHGetFolderPathW(long long long long ptr) -307 stub SHGetIconOverlayIndexA # Needed for sync with Wine -308 stub SHGetIconOverlayIndexW # Needed for sync with Wine +307 stdcall SHGetIconOverlayIndexA(str long) +308 stdcall SHGetIconOverlayIndexW(wstr long) 309 stdcall SHGetInstanceExplorer(long) 310 stdcall SHGetMalloc(ptr) 311 stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA

15 years, 10 months

← Newer
1
...
48
49
50
51
52
53
54
55
56
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 February 2009