Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dchapyshev] 39322: - FIXME -> TRACE for InvalidateDriveType. Unimplemented in WinXP SP3 - Add stub for SHFindComputer, SHLimitInputEdit, SHLimitInputCombo - Add comments
by dchapyshev＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: dchapyshev Date: Tue Feb 3 07:55:04 2009 New Revision: 39322 URL: http://svn.reactos.org/svn/reactos?rev=39322&view=rev Log: - FIXME -> TRACE for InvalidateDriveType. Unimplemented in WinXP SP3 - Add stub for SHFindComputer, SHLimitInputEdit, SHLimitInputCombo - Add comments Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/stubs.c 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 07:55:04 2009 @@ -62,7 +62,7 @@ 62 stdcall PickIconDlg(long long long long) 63 stdcall GetFileNameFromBrowse(long long long long str str str) 64 stdcall DriveType(long) -65 stdcall -noname InvalidateDriveType(long) # Fixme +65 stdcall -noname InvalidateDriveType(long) 66 stdcall IsNetDrive(long) 67 stdcall Shell_MergeMenus(long long long long long long) 68 stdcall SHGetSetSettings(ptr long long) @@ -88,7 +88,7 @@ 88 stdcall SHDoDragDrop(long ptr ptr long ptr) 89 stdcall SHCloneSpecialIDList(long long long) 90 stdcall SHFindFiles(ptr ptr) -91 stub SHFindComputer # Fixme +91 stdcall SHFindComputer(ptr ptr) 92 stdcall PathGetShortPath(ptr) PathGetShortPathAW 93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW @@ -454,8 +454,8 @@ 743 stub SHCreateFileExtractIconW 744 stub -noname Shell_744 745 stub -noname Shell_745 -747 stub SHLimitInputEdit -748 stub -noname Shell_748 # Fixme +747 stdcall SHLimitInputEdit(ptr ptr) +748 stdcall -noname SHLimitInputCombo(ptr ptr) 749 stub SHGetShellStyleHInstance 750 stub SHGetAttributesFromDataObject 751 stub -noname Shell_751 @@ -469,35 +469,37 @@ @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDefaultExtractIcon(ptr ptr) -# Unknown functions. They need to be removed -#@ stdcall FileMenu_DeleteAllItems(long) -#@ stdcall FileMenu_DrawItem(long ptr) -#@ stdcall FileMenu_FindSubMenuByPidl(long ptr) -#@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr) -#@ stdcall FileMenu_HandleMenuChar(long long) -#@ stdcall FileMenu_InitMenuPopup(long) -#@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr) -#@ stdcall FileMenu_Invalidate(long) -#@ stdcall FileMenu_MeasureItem(long ptr) -#@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr) -#@ stdcall FileMenu_Create(long long long long long) -#@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW -#@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long) -#@ stdcall FileMenu_DeleteItemByCmd(long long) -#@ stdcall FileMenu_Destroy(long) -#@ stdcall FileMenu_AbortInitMenu() -#@ stdcall FileMenu_AppendFilesForPidl(long ptr long) -#@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr) -#@ stdcall FileMenu_DeleteItemByIndex(long long) -#@ stdcall FileMenu_DeleteItemByFirstID(long long) -#@ stdcall FileMenu_DeleteSeparator(long) -#@ stdcall FileMenu_EnableItemByCmd(long long long) -#@ stdcall FileMenu_GetItemExtent(long long) -#@ stdcall SHRegCloseKey (long) -#@ stdcall SHRegOpenKeyA (long str long) -#@ stdcall SHRegOpenKeyW (long wstr long) -#@ stdcall SHRegQueryValueA(long str ptr ptr) -#@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) -#@ stdcall SHRegQueryValueW (long long long long) -#@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) -#@ stdcall SHRegDeleteKeyW (long wstr) +# Discontinued in version 6.0. Until retired in WinVista and higher +@ stdcall FileMenu_DeleteAllItems(long) +@ stdcall FileMenu_DrawItem(long ptr) +@ stdcall FileMenu_FindSubMenuByPidl(long ptr) +@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr) +@ stdcall FileMenu_HandleMenuChar(long long) +@ stdcall FileMenu_InitMenuPopup(long) +@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr) +@ stdcall FileMenu_Invalidate(long) +@ stdcall FileMenu_MeasureItem(long ptr) +@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr) +@ stdcall FileMenu_Create(long long long long long) +@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW +@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long) +@ stdcall FileMenu_DeleteItemByCmd(long long) +@ stdcall FileMenu_Destroy(long) +@ stdcall FileMenu_AbortInitMenu() +@ stdcall FileMenu_AppendFilesForPidl(long ptr long) +@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr) +@ stdcall FileMenu_DeleteItemByIndex(long long) +@ stdcall FileMenu_DeleteItemByFirstID(long long) +@ stdcall FileMenu_DeleteSeparator(long) +@ stdcall FileMenu_EnableItemByCmd(long long long) +@ stdcall FileMenu_GetItemExtent(long long) + +# 4.0 (NT) and higher. Until discontinued in 5.0 +@ stdcall SHRegCloseKey(long) +@ stdcall SHRegOpenKeyA(long str long) +@ stdcall SHRegOpenKeyW(long wstr long) +@ stdcall SHRegQueryValueA(long str ptr ptr) +@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) +@ stdcall SHRegQueryValueW (long long long long) +@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) +@ stdcall SHRegDeleteKeyW(long wstr) Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Feb 3 07:55:04 2009 @@ -1421,10 +1421,11 @@ } /************************************************************************* * InvalidateDriveType [SHELL32.65] - * + * Unimplemented in XP SP3 */ int WINAPI InvalidateDriveType(int u) -{ FIXME("0x%08x stub\n",u); +{ + TRACE("0x%08x stub\n",u); return 0; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Tue Feb 3 07:55:04 2009 @@ -69,5 +69,39 @@ WINAPI ShortSizeFormatW(LONGLONG llNumber) { + FIXME("ShortSizeFormatW() stub\n"); return NULL; } + +/* + * Unimplemented + */ +BOOL +WINAPI +SHFindComputer(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + FIXME("SHFindComputer() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHLimitInputEdit(HWND hWnd, LPVOID lpUnknown) +{ + FIXME("SHLimitInputEdit() stub\n"); + return FALSE; +} + +/* + * Unimplemented + */ +BOOL +WINAPI +SHLimitInputCombo(HWND hWnd, LPVOID lpUnknown) +{ + FIXME("SHLimitInputCombo() stub\n"); + return FALSE; +}

1 0

[cfinck] 39321: Change it here as well..
by cfinck＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: cfinck Date: Tue Feb 3 07:34:57 2009 New Revision: 39321 URL: http://svn.reactos.org/svn/reactos?rev=39321&view=rev Log: Change it here as well.. Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/hivedef_i386.inf 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 07:34:57 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%\Angelus.02_ROSWP.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"

1 0

[cfinck] 39320: Merge 39318 (2/2)
by cfinck＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: cfinck Date: Tue Feb 3 07:33:45 2009 New Revision: 39320 URL: http://svn.reactos.org/svn/reactos?rev=39320&view=rev Log: Merge 39318 (2/2) Added: branches/ros-branch-0_3_8/wallpaper/Angelus_02_ROSWP.bmp - copied unchanged from r39309, branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp branches/ros-branch-0_3_8/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg - copied unchanged from r39309, branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg Removed: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp branches/ros-branch-0_3_8/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 Removed: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/Ange… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_8/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/wallpaper/Ange… ============================================================================== Binary file - no diff available. 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 07:33:45 2009 @@ -3,6 +3,6 @@ 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 +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 07:33:45 2009 @@ -1,3 +1,3 @@ <group> - <installfile>Angelus.02_ROSWP.bmp</installfile> + <installfile>Angelus_02_ROSWP.bmp</installfile> </group>

1 0

[cfinck] 39319: Merge 39318 (1/2)
by cfinck＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: cfinck Date: Tue Feb 3 07:33:24 2009 New Revision: 39319 URL: http://svn.reactos.org/svn/reactos?rev=39319&view=rev Log: Merge 39318 (1/2) Modified: branches/ros-branch-0_3_8/reactos/boot/bootdata/packages/reactos.dff 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 07:33:24 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\Angelus.02_ROSWP.bmp 4 optional +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional ; Native libraries modules\windows\mfc42.dll 1 optional

1 0

[cfinck] 39318: Rename the wallpaper to conform with ISO 9660:1988 and make cdmake happy...
by cfinck＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: cfinck Date: Tue Feb 3 07:26:30 2009 New Revision: 39318 URL: http://svn.reactos.org/svn/reactos?rev=39318&view=rev Log: Rename the wallpaper to conform with ISO 9660:1988 and make cdmake happy... Added: trunk/wallpaper/Angelus_02_ROSWP.bmp (props changed) - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP.bmp trunk/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg (props changed) - copied unchanged from r39307, trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg Removed: trunk/wallpaper/Angelus.02_ROSWP.bmp trunk/wallpaper/Angelus.02_ROSWP_4-3_1440x1080.jpg 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 07:26:30 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\Angelus.02_ROSWP.bmp 4 optional +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional ; Native libraries modules\windows\mfc42.dll 1 optional Removed: 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. Removed: 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.bmp ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/wallpaper/Angelus_02_ROSWP.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: trunk/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ svn:mergeinfo = 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=39318&r1=… ============================================================================== --- trunk/wallpaper/ReadMe.txt [iso-8859-1] (original) +++ trunk/wallpaper/ReadMe.txt [iso-8859-1] Tue Feb 3 07:26:30 2009 @@ -3,6 +3,6 @@ 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 +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 07:26:30 2009 @@ -1,3 +1,3 @@ <group> - <installfile>Angelus.02_ROSWP.bmp</installfile> + <installfile>Angelus_02_ROSWP.bmp</installfile> </group>

1 0

[tkreuzer] 39317: add localtime_s prototype here, as it's not part of official headers
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Tue Feb 3 07:00:31 2009 New Revision: 39317 URL: http://svn.reactos.org/svn/reactos?rev=39317&view=rev Log: add localtime_s prototype here, as it's not part of official headers Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.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/ctime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/ctime.c [iso-8859-1] Tue Feb 3 07:00:31 2009 @@ -8,10 +8,14 @@ #define MINGW_HAS_SECURE_API 1 #include <tchar.h> +#define __STDC_WANT_SECURE_LIB__ #include <time.h> #include "bitsfixup.h" #define EINVAL -1 + +/* Doesn't really exist, but we need it here */ +_CRTIMP errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time); /****************************************************************************** * \name _tctime_s

1 0

[dchapyshev] 39316: - Remove shell.spec and version16.rc
by dchapyshev＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: dchapyshev Date: Tue Feb 3 06:54:51 2009 New Revision: 39316 URL: http://svn.reactos.org/svn/reactos?rev=39316&view=rev Log: - Remove shell.spec and version16.rc Removed: trunk/reactos/dll/win32/shell32/shell.spec trunk/reactos/dll/win32/shell32/version16.rc Removed: trunk/reactos/dll/win32/shell32/shell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell.sp… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell.spec (removed) @@ -1,45 +1,0 @@ - 1 pascal RegOpenKey(long str ptr) RegOpenKey16 - 2 pascal RegCreateKey(long str ptr) RegCreateKey16 - 3 pascal RegCloseKey(long) RegCloseKey16 - 4 pascal RegDeleteKey(long str) RegDeleteKey16 - 5 pascal RegSetValue(long str long str long) RegSetValue16 - 6 pascal RegQueryValue(long str ptr ptr) RegQueryValue16 - 7 pascal RegEnumKey(long long ptr long) RegEnumKey16 -# 8 stub WEP - 9 pascal -ret16 DragAcceptFiles(word word) DragAcceptFiles16 - 11 pascal -ret16 DragQueryFile(word s_word ptr s_word) DragQueryFile16 - 12 pascal -ret16 DragFinish(word) DragFinish16 - 13 pascal -ret16 DragQueryPoint(word ptr) DragQueryPoint16 - 20 pascal -ret16 ShellExecute(word str str str str s_word) ShellExecute16 - 21 pascal -ret16 FindExecutable(str str ptr) FindExecutable16 - 22 pascal -ret16 ShellAbout(word ptr ptr word) ShellAbout16 - 33 pascal -ret16 AboutDlgProc(word word word long) AboutDlgProc16 - 34 pascal -ret16 ExtractIcon(word str s_word) ExtractIcon16 - 36 pascal -ret16 ExtractAssociatedIcon(word ptr ptr) ExtractAssociatedIcon16 - 37 pascal DoEnvironmentSubst(ptr word) DoEnvironmentSubst16 - 38 pascal FindEnvironmentString(ptr) FindEnvironmentString16 - 39 pascal -ret16 InternalExtractIcon(word ptr s_word word) InternalExtractIcon16 - 40 pascal -ret16 ExtractIconEx(str word ptr ptr word) ExtractIconEx16 -# 98 stub SHL3216_THUNKDATA16 -# 99 stub SHL1632_THUNKDATA16 - -#100 4 0550 HERETHARBETYGARS exported, shared data -#101 8 010e FINDEXEDLGPROC exported, shared data -101 pascal DllEntryPoint(long word word word long word) SHELL_DllEntryPoint - -102 pascal -ret16 RegisterShellHook(word word) RegisterShellHook16 -103 pascal ShellHookProc(word word long) ShellHookProc16 - -157 stub RESTARTDIALOG -# 166 PICKICONDLG - -262 pascal -ret16 DriveType(long) DriveType16 - -# 263 SH16TO32DRIVEIOCTL -# 264 SH16TO32INT2526 -# 300 SHGETFILEINFO -# 400 SHFORMATDRIVE -401 stub SHCHECKDRIVE -# 402 _RUNDLLCHECKDRIVE - -#32 WCI Removed: trunk/reactos/dll/win32/shell32/version16.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/version1… ============================================================================== --- trunk/reactos/dll/win32/shell32/version16.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/version16.rc (removed) @@ -1,24 +1,0 @@ -/* - * Copyright 2001 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILEDESCRIPTION_STR "Wine core dll" -#define WINE_FILENAME_STR "shell.dll" -#define WINE_FILEVERSION 4,0,0,0 -#define WINE_FILEVERSION_STR "4.0" - -#include "wine/wine_common_ver.rc"

1 0

[dchapyshev] 39315: - Add file for stubs - Add stub implementation for SHLocalAlloc, SHLocalFree, SHLocalReAlloc, AddCommasW, ShortSizeFormatW - Partially remove unneeded stuff from .spec
by dchapyshev＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: dchapyshev Date: Tue Feb 3 06:50:50 2009 New Revision: 39315 URL: http://svn.reactos.org/svn/reactos?rev=39315&view=rev Log: - Add file for stubs - Add stub implementation for SHLocalAlloc, SHLocalFree, SHLocalReAlloc, AddCommasW, ShortSizeFormatW - Partially remove unneeded stuff from .spec Added: trunk/reactos/dll/win32/shell32/stubs.c (with props) Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Feb 3 06:50:50 2009 @@ -69,6 +69,7 @@ <file>shpolicy.c</file> <file>shv_def_cmenu.c</file> <file>startmenu.c</file> + <file>stubs.c</file> <file>ros-systray.c</file> <file>fprop.c</file> <file>drive.c</file> 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 06:50:50 2009 @@ -197,11 +197,11 @@ 197 stub -noname SHGlobalDefect 198 stdcall -noname SHAbortInvokeCommand() 199 stdcall ExtractAssociatedIconA(long str ptr) -200 stub -noname SHLocalAlloc # Fixme -201 stub -noname SHLocalFree # Fixme -202 stub -noname SHLocalReAlloc # Fixme -203 stub -noname AddCommasW # Fixme -204 stub -noname ShortSizeFormatW # Fixme +200 stdcall -noname SHLocalAlloc(long long) +201 stdcall -noname SHLocalFree(ptr) +202 stdcall -noname SHLocalReAlloc(ptr long long) +203 stdcall -noname AddCommasW(long wstr) +204 stdcall -noname ShortSizeFormatW(double) 205 stdcall Printer_LoadIconsW(wstr ptr ptr) 206 stdcall ExtractAssociatedIconExA(long str long long) 207 stdcall ExtractAssociatedIconExW(long wstr long long) @@ -501,13 +501,3 @@ #@ stdcall SHRegQueryValueW (long long long long) #@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) #@ stdcall SHRegDeleteKeyW (long wstr) -#@ stub Desktop_UpdateBriefcaseOnEvent -#@ stub SHGetFileIcon -#@ stub Link_AddExtraDataSection -#@ stub Link_ReadExtraDataSection -#@ stub Link_RemoveExtraDataSection -#@ stub ReceiveAddToRecentDocs -#@ stub FOOBAR1217 # no joke! This is the real name!! -#@ stub FixupOptionalComponents -#@ stub OCInstall -#@ stub SHGetFreeDiskSpace Added: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c (added) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Tue Feb 3 06:50:50 2009 @@ -1,0 +1,73 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: shell32.dll + * FILE: dll/win32/shell32/stubs.c + * PURPOSE: shell32.dll stubs + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * NOTES: If you implement a function, remove it from this file + * UPDATE HISTORY: + * 03/02/2009 Created + */ + + +#include <precomp.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/* + * Unimplemented + */ +HLOCAL +WINAPI +SHLocalAlloc(UINT uFlags, SIZE_T uBytes) +{ + FIXME("SHLocalAlloc() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +HLOCAL +WINAPI +SHLocalFree(HLOCAL hMem) +{ + FIXME("SHLocalFree() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +HLOCAL +WINAPI +SHLocalReAlloc(HLOCAL hMem, + SIZE_T uBytes, + UINT uFlags) +{ + FIXME("SHLocalReAlloc() stub\n"); + return NULL; +} + +/* + * Unimplemented + */ +LPWSTR +WINAPI +AddCommasW(DWORD dwUnknown, LPWSTR lpNumber) +{ + LPWSTR lpRetBuf = L"0"; + + FIXME("AddCommasW() stub\n"); + return lpRetBuf; +} + +/* + * Unimplemented + */ +LPWSTR +WINAPI +ShortSizeFormatW(LONGLONG llNumber) +{ + return NULL; +} Propchange: trunk/reactos/dll/win32/shell32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 39314: -check for filesize in MmCanFileBeTruncated -make use of MmCanFileBeTruncated in VfatSetAllocationSizeInformation -make use of MmCanFileBeTruncated in VfatSetInformation (patch by arty with some fixes from me) thanks to Alex for the hint that we miss the MmCanFileBeTruncated check fixes "Anyone has referenced a cache segment behind the new size." See issue #712 for more details.
by cwittich＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: cwittich Date: Tue Feb 3 06:39:55 2009 New Revision: 39314 URL: http://svn.reactos.org/svn/reactos?rev=39314&view=rev Log: -check for filesize in MmCanFileBeTruncated -make use of MmCanFileBeTruncated in VfatSetAllocationSizeInformation -make use of MmCanFileBeTruncated in VfatSetInformation (patch by arty with some fixes from me) thanks to Alex for the hint that we miss the MmCanFileBeTruncated check fixes "Anyone has referenced a cache segment behind the new size." See issue #712 for more details. Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Feb 3 06:39:55 2009 @@ -548,10 +548,7 @@ Fcb->RFCB.FileSize.QuadPart = Size; Fcb->RFCB.ValidDataLength.QuadPart = Size; - if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) - { - CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); - } + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); } NTSTATUS @@ -692,6 +689,17 @@ } else if (NewSize + ClusterSize <= Fcb->RFCB.AllocationSize.u.LowPart) { + + DPRINT("Check for the ability to set file size\n"); + if (!MmCanFileBeTruncated + (FileObject->SectionObjectPointer, + (PLARGE_INTEGER)AllocationSize)) + { + DPRINT("Couldn't set file size!\n"); + return STATUS_USER_MAPPED_FILE; + } + DPRINT("Can set file size\n"); + AllocSizeChanged = TRUE; /* FIXME: Use the cached cluster/offset better way. */ Fcb->LastCluster = Fcb->LastOffset = 0; @@ -891,6 +899,26 @@ DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); + /* Special: We should call MmCanFileBeTruncated here to determine if changing + the file size would be allowed. If not, we bail with the right error. + We must do this before acquiring the lock. */ + if (FileInformationClass == FileEndOfFileInformation) + { + DPRINT("Check for the ability to set file size\n"); + if (!MmCanFileBeTruncated + (IrpContext->FileObject->SectionObjectPointer, + (PLARGE_INTEGER)SystemBuffer)) + { + DPRINT("Couldn't set file size!\n"); + IrpContext->Irp->IoStatus.Status = STATUS_USER_MAPPED_FILE; + IrpContext->Irp->IoStatus.Information = 0; + IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); + VfatFreeIrpContext(IrpContext); + return STATUS_USER_MAPPED_FILE; + } + DPRINT("Can set file size\n"); + } + if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { if (!ExAcquireResourceExclusiveLite(&FCB->MainResource, Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Feb 3 06:39:55 2009 @@ -4714,10 +4714,10 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, IN PLARGE_INTEGER NewFileSize) { - /* Check whether an ImageSectionObject exists */ if (SectionObjectPointer->ImageSectionObject != NULL) { + DPRINT1("ERROR: File can't be truncated because it has an image section\n"); return FALSE; } @@ -4730,15 +4730,29 @@ if (Segment->ReferenceCount != 0) { - /* FIXME: check if NewFileSize <= current file size */ + /* Check size of file */ + if (SectionObjectPointer->SharedCacheMap) + { + PBCB Bcb = SectionObjectPointer->SharedCacheMap; + if (NewFileSize->QuadPart <= Bcb->FileSize.QuadPart) + { + return FALSE; + } + } + } + else + { + /* Something must gone wrong + * how can we have a Section but no + * reference? */ + DPRINT1("ERROR: DataSectionObject without reference!\n"); return FALSE; } } - /* FIXME: check for outstanding write probes */ - UNIMPLEMENTED; - - return FALSE; + DPRINT1("FIXME: didn't check for outstanding write probes\n"); + + return TRUE; }

1 0

[tkreuzer] 39313: revert last commit, this is wine code, we need allowwarnings="true"
by tkreuzer＠svn.reactos.org 03 Feb '09

03 Feb '09

Author: tkreuzer Date: Tue Feb 3 06:35:49 2009 New Revision: 39313 URL: http://svn.reactos.org/svn/reactos?rev=39313&view=rev Log: revert last commit, this is wine code, we need allowwarnings="true" 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:35:49 2009 @@ -141,7 +141,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { IDirectInputImpl* This; - TRACE("(0x%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); + TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)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%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); + TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
56
Older →

Jump to page:

2025

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