Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57041: [WINDOWSCODECS] - Type safety for MSVC compat layer
by tfaber＠svn.reactos.org 04 Aug '12

04 Aug '12

Author: tfaber Date: Sat Aug 4 12:44:04 2012 New Revision: 57041 URL: http://svn.reactos.org/svn/reactos?rev=57041&view=rev Log: [WINDOWSCODECS] - Type safety for MSVC compat layer Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/typeof.h Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Aug 4 12:44:04 2012 @@ -10,7 +10,6 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) -set_rc_compiler() if(MSVC) add_compile_flags("/FItypeof.h") @@ -42,12 +41,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) add_library(windowscodecs SHARED ${SOURCE}) - set_module_type(windowscodecs win32dll) - target_link_libraries(windowscodecs wine uuid) - add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Sat Aug 4 12:44:04 2012 @@ -26,49 +26,56 @@ typedef unsigned char (__cdecl typeof(jpeg_resync_to_restart))(struct jpeg_decompress_struct *, int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); -typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void*, png_error_ptr_1, png_error_ptr_1); +typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, unsigned int); +typedef void (*png_flush_ptr_1)(struct png_struct_def *); typedef struct png_info_def* (__cdecl typeof(png_create_info_struct))(struct png_struct_def *); +typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); +typedef struct png_struct_def *(__cdecl typeof(png_create_write_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); +typedef void (__cdecl typeof(png_destroy_info_struct))(struct png_struct_def *, struct png_info_def **); +typedef void (__cdecl typeof(png_destroy_read_struct))(struct png_struct_def **, struct png_info_def **, struct png_info_def **); +typedef void (__cdecl typeof(png_destroy_write_struct))(struct png_struct_def **, struct png_info_def **); +typedef void (__cdecl typeof(png_error))(struct png_struct_def *, const char *); +typedef unsigned char (__cdecl typeof(png_get_bit_depth))(const struct png_struct_def *, const struct png_info_def *); +typedef unsigned char (__cdecl typeof(png_get_color_type))(const struct png_struct_def *, const struct png_info_def *); +typedef void *(__cdecl typeof(png_get_error_ptr))(const struct png_struct_def *); +typedef unsigned int (__cdecl typeof(png_get_image_height))(const struct png_struct_def *, const struct png_info_def *); +typedef unsigned int (__cdecl typeof(png_get_image_width))(const struct png_struct_def *, const struct png_info_def *); +typedef void *(__cdecl typeof(png_get_io_ptr))(struct png_struct_def *); +typedef unsigned int (__cdecl typeof(png_get_pHYs))(const struct png_struct_def *, const struct png_info_def *, unsigned int *, unsigned int *, int *); +typedef unsigned int (__cdecl typeof(png_get_PLTE))(const struct png_struct_def *, const struct png_info_def *, struct png_color_struct **, int *); +typedef unsigned int (__cdecl typeof(png_get_tRNS))(const struct png_struct_def *, struct png_info_def *, unsigned char **, int *, struct png_color_16_struct **); +typedef void (__cdecl typeof(png_set_bgr))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_error_fn))(struct png_struct_def *, void *, png_error_ptr_1, png_error_ptr_1); +typedef void (__cdecl typeof(png_set_expand_gray_1_2_4_to_8))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_filler))(struct png_struct_def *, unsigned int, int); +typedef void (__cdecl typeof(png_set_gray_to_rgb))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_IHDR))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int, int, int, int, int); +typedef void (__cdecl typeof(png_set_pHYs))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int); +typedef void (__cdecl typeof(png_set_read_fn))(struct png_struct_def *, void *, png_rw_ptr_1); +typedef void (__cdecl typeof(png_set_strip_16))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_tRNS_to_alpha))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_write_fn))(struct png_struct_def *, void *, png_rw_ptr_1, png_flush_ptr_1); +typedef void (__cdecl typeof(png_read_end))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_read_image))(struct png_struct_def *, unsigned char **); +typedef void (__cdecl typeof(png_read_info))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_end))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_info))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_rows))(struct png_struct_def *, unsigned char **row, unsigned int); -// FIXME the following types are not correct, but they help to compile -typedef void* (__cdecl typeof(png_create_write_struct))(void*); -typedef void* (__cdecl typeof(png_destroy_read_struct))(void*, void*, void*); -typedef void* (__cdecl typeof(png_destroy_write_struct))(void*); -typedef void* (__cdecl typeof(png_destroy_write_struct))(void*); -typedef void* (__cdecl typeof(png_error))(void*); -typedef void* (__cdecl typeof(png_get_bit_depth))(void *); -typedef void* (__cdecl typeof(png_get_color_type))(void *); -typedef void* (__cdecl typeof(png_get_error_ptr))(void *); -typedef void* (__cdecl typeof(png_get_image_height))(void *); -typedef void* (__cdecl typeof(png_get_image_width))(void *); -typedef void* (__cdecl typeof(png_get_io_ptr))(void *); -typedef void* (__cdecl typeof(png_get_pHYs))(void *); -typedef void* (__cdecl typeof(png_get_PLTE))(void *); -typedef void* (__cdecl typeof(png_get_tRNS))(void *); -typedef void* (__cdecl typeof(png_set_bgr))(void *); -typedef void* (__cdecl typeof(png_set_error_fn))(void *); -typedef void* (__cdecl typeof(png_set_expand_gray_1_2_4_to_8))(void *); -typedef void* (__cdecl typeof(png_set_filler))(void *); -typedef void* (__cdecl typeof(png_set_gray_to_rgb))(void *); -typedef void* (__cdecl typeof(png_set_IHDR))(void *); -typedef void* (__cdecl typeof(png_set_pHYs))(void *); -typedef void* (__cdecl typeof(png_set_read_fn))(void *); -typedef void* (__cdecl typeof(png_set_strip_16))(void *); -typedef void* (__cdecl typeof(png_set_tRNS_to_alpha))(void *); -typedef void* (__cdecl typeof(png_set_write_fn))(void *); -typedef void* (__cdecl typeof(png_read_end))(void *); -typedef void* (__cdecl typeof(png_read_image))(void *); -typedef void* (__cdecl typeof(png_read_info))(void *); -typedef void* (__cdecl typeof(png_write_end))(void *); -typedef void* (__cdecl typeof(png_write_info))(void *); -typedef void* (__cdecl typeof(png_write_rows))(void *); - -typedef void* (__cdecl typeof(TIFFClientOpen))(void *); -typedef void* (__cdecl typeof(TIFFClose))(void *); -typedef char* (__cdecl typeof(TIFFCurrentDirectory))(void *); -typedef void* (__cdecl typeof(TIFFGetField))(void *); -typedef void* (__cdecl typeof(TIFFReadDirectory))(void *); -typedef void* (__cdecl typeof(TIFFReadEncodedStrip))(void *); -typedef void* (__cdecl typeof(TIFFSetDirectory))(void *); +typedef void *thandle_t_1; +typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, int); +typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); +typedef int (*TIFFCloseProc_1)(thandle_t_1); +typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1); +typedef int (*TIFFMapFileProc_1)(thandle_t_1, void **, unsigned int *); +typedef void (*TIFFUnmapFileProc_1)(thandle_t_1, void *, unsigned int); +typedef struct tiff *(__cdecl typeof(TIFFClientOpen))(const char *, const char *, thandle_t_1, TIFFReadWriteProc_1, TIFFReadWriteProc_1, TIFFSeekProc_1, TIFFCloseProc_1, TIFFSizeProc_1, TIFFMapFileProc_1, TIFFUnmapFileProc_1); +typedef void (__cdecl typeof(TIFFClose))(struct tiff *); +typedef unsigned short (__cdecl typeof(TIFFCurrentDirectory))(struct tiff *); +typedef int (__cdecl typeof(TIFFGetField))(struct tiff *, unsigned int, ...); +typedef int (__cdecl typeof(TIFFReadDirectory))(struct tiff *); +typedef int (__cdecl typeof(TIFFReadEncodedStrip))(struct tiff *, unsigned int, void *, int); +typedef int (__cdecl typeof(TIFFSetDirectory))(struct tiff *, unsigned short); #undef __typeof_intptr #undef __typeof_longptr

1 0

[jimtabor] 57040: [WineTest|User32|Msg] - Sync wine 1.5.10.
by jimtabor＠svn.reactos.org 04 Aug '12

04 Aug '12

Author: jimtabor Date: Sat Aug 4 02:05:59 2012 New Revision: 57040 URL: http://svn.reactos.org/svn/reactos?rev=57040&view=rev Log: [WineTest|User32|Msg] - Sync wine 1.5.10. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sat Aug 4 02:05:59 2012 @@ -5720,6 +5720,21 @@ { 0 } }; +static const struct message WmSetPosComboSeq[] = +{ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_CHILDACTIVATE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|defwinproc|wparam, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + static WNDPROC old_combobox_proc; static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -5806,6 +5821,10 @@ SendMessage(combo, WM_KEYUP, VK_DOWN, 0); log_all_parent_messages--; ok_sequence(WmKeyDownComboSeq, "WM_KEYDOWN/VK_DOWN on a ComboBox", FALSE); + + flush_sequence(); + SetWindowPos(combo, 0, 10, 10, 120, 130, SWP_NOZORDER); + ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", FALSE); DestroyWindow(combo); DestroyWindow(parent);

1 0

[jimtabor] 57039: [User32] - Combo port sync wine 1.5.10.
by jimtabor＠svn.reactos.org 04 Aug '12

04 Aug '12

Author: jimtabor Date: Sat Aug 4 02:05:01 2012 New Revision: 57039 URL: http://svn.reactos.org/svn/reactos?rev=57039&view=rev Log: [User32] - Combo port sync wine 1.5.10. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/combo.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Aug 4 02:05:01 2012 @@ -258,7 +258,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_39 + reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1.5.10 reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39 Modified: trunk/reactos/win32ss/user/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] Sat Aug 4 02:05:01 2012 @@ -448,50 +448,6 @@ lpRect->right = lpRect->left + lphc->droppedRect.right - lphc->droppedRect.left; lpRect->bottom = lpRect->top + lphc->droppedRect.bottom - lphc->droppedRect.top; -} - -/*********************************************************************** - * COMBO_WindowPosChanging - */ -static LRESULT COMBO_WindowPosChanging( - HWND hwnd, - LPHEADCOMBO lphc, - WINDOWPOS* posChanging) -{ - /* - * We need to override the WM_WINDOWPOSCHANGING method to handle all - * the non-simple comboboxes. The problem is that those controls are - * always the same height. We have to make sure they are not resized - * to another value. - */ - if ( ( CB_GETTYPE(lphc) != CBS_SIMPLE ) && - ((posChanging->flags & SWP_NOSIZE) == 0) ) - { - int newComboHeight; - - newComboHeight = CBGetTextAreaHeight(hwnd,lphc) + - 2*COMBO_YBORDERSIZE(); - - /* - * Resizing a combobox has another side effect, it resizes the dropped - * rectangle as well. However, it does it only if the new height for the - * combobox is more than the height it should have. In other words, - * if the application resizing the combobox only had the intention to resize - * the actual control, for example, to do the layout of a dialog that is - * resized, the height of the dropdown is not changed. - */ - if (posChanging->cy > newComboHeight) - { - TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", - posChanging->cy, newComboHeight, lphc->droppedRect.bottom, - lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; - - } - posChanging->cy = newComboHeight; - } - - return 0; } /*********************************************************************** @@ -1550,15 +1506,48 @@ /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, BOOL bRedraw ) +static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +{ + /* + * Those controls are always the same height. So we have to make sure + * they are not resized to another value. + */ + if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { + int newComboHeight; + + newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); + + /* + * Resizing a combobox has another side effect, it resizes the dropped + * rectangle as well. However, it does it only if the new height for the + * combobox is more than the height it should have. In other words, + * if the application resizing the combobox only had the intention to resize + * the actual control, for example, to do the layout of a dialog that is + * resized, the height of the dropdown is not changed. + */ + if( HIWORD(lParam) > newComboHeight ) + { + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + lphc->droppedRect.top); + lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + } + /* + * Restore original height + */ + if( HIWORD(lParam) != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); + } + CBCalcPlacement(lphc->self, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, bRedraw ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1894,21 +1883,9 @@ } return result; } - case WM_WINDOWPOSCHANGING: - return COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam); - case WM_WINDOWPOSCHANGED: - /* SetWindowPos can be called on a Combobox to resize its Listbox. - * In that case, the Combobox itself will not be resized, so we won't - * get a WM_SIZE. Since we still want to update the Listbox, we have to - * do it here. - */ - /* we should not force repainting on WM_WINDOWPOSCHANGED, it breaks - * Z-order based painting. - */ - /* fall through */ case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

1 0

[akhaldi] 57038: [UNIATA] * Fix the debug build.
by akhaldi＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: akhaldi Date: Fri Aug 3 23:08:55 2012 New Revision: 57038 URL: http://svn.reactos.org/svn/reactos?rev=57038&view=rev Log: [UNIATA] * Fix the debug build. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Fri Aug 3 23:08:55 2012 @@ -9170,7 +9170,7 @@ return status; } #endif // USE_REACTOS_DDK - KdPrint(("UniATA Init: OS ver %x.%x (%d), %d CPU(s)\n", MajorVersion, MinorVersion, BuildNumber, *KeNumberProcessors)); + KdPrint(("UniATA Init: OS ver %x.%x (%d), %d CPU(s)\n", MajorVersion, MinorVersion, BuildNumber, KeNumberProcessors)); KeQuerySystemTime(&t0); do {

1 0

[ion] 57037: [HIVEFILES]: Add the .NET Install Dir key, which fixes tons of MSI problems where it failed to load/initalize/find assemblies.
by ion＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: ion Date: Fri Aug 3 19:38:25 2012 New Revision: 57037 URL: http://svn.reactos.org/svn/reactos?rev=57037&view=rev Log: [HIVEFILES]: Add the .NET Install Dir key, which fixes tons of MSI problems where it failed to load/initalize/find assemblies. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Fri Aug 3 19:38:25 2012 @@ -28,6 +28,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","18",2,"secur32.dll" HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","68",2,"netlogon.dll" HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" + +; .NET +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Fri Aug 3 19:38:25 2012 @@ -17,6 +17,9 @@ HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" + +; .NET +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" ; HTML Help HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

1 0

[iut2011] 57036: MMc dll file
by iut2011＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: iut2011 Date: Fri Aug 3 16:17:20 2012 New Revision: 57036 URL: http://svn.reactos.org/svn/reactos?rev=57036&view=rev Log: MMc dll file Added: branches/iut-mmc/dll/win32/Mmcndmgr/ (with props) Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 3 16:17:20 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[iut2011] 57035: MMC application files
by iut2011＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: iut2011 Date: Fri Aug 3 16:04:21 2012 New Revision: 57035 URL: http://svn.reactos.org/svn/reactos?rev=57035&view=rev Log: MMC application files Modified: branches/iut-mmc/base/applications/mmc/CMakeLists.txt branches/iut-mmc/base/applications/mmc/mmc.rbuild Modified: branches/iut-mmc/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/base/applications/mmc/C… ============================================================================== --- branches/iut-mmc/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/iut-mmc/base/applications/mmc/CMakeLists.txt [iso-8859-1] Fri Aug 3 16:04:21 2012 @@ -1,14 +1,20 @@ set_rc_compiler() +set_cpp() -list(APPEND SOURCE - console.c - misc.c - mmc.c - mmc.rc) +add_executable(mmcclient + main.cpp + register_functions.cpp + snapin.cpp + fonction.cpp + MainWindow.cpp + MMC_Parser.cpp + ressource.rc) -add_executable(mmcclient ${SOURCE}) +target_link_libraries(mmcclient uuid libxml2 mmclib) +allow_warnings(mmcclient) set_module_type(mmcclient win32gui UNICODE) -add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 Mmcndmgr shell32 ws2_32 comctl32 msvcrt kernel32 ole32) add_pch(mmcclient precomp.h) +add_cd_file(TARGET mmcclient DESTINATION reactos/system32 FOR all) Modified: branches/iut-mmc/base/applications/mmc/mmc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/base/applications/mmc/m… ============================================================================== --- branches/iut-mmc/base/applications/mmc/mmc.rbuild [iso-8859-1] (original) +++ branches/iut-mmc/base/applications/mmc/mmc.rbuild [iso-8859-1] Fri Aug 3 16:04:21 2012 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes"> +<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes" allowwarnings="true"> <include base="mmcclient">.</include> <library>user32</library> <library>gdi32</library> @@ -8,9 +8,15 @@ <library>advapi32</library> <library>shell32</library> <library>comctl32</library> - <file>console.c</file> - <file>misc.c</file> - <file>mmc.c</file> - <file>mmc.rc</file> - <pch>precomp.h</pch> + <library>ole32</library> + <library>mmclib</library> + <library>kernel32</library> + <library>ws2_32</library> + <library>uuid</library> + <file>main.cpp</file> + <file>register_functions.cpp</file> + <file>snapin.cpp</file> + <file>fonction.cpp</file> + <file>MainWindow.cpp</file> + <file>ressource.rc</file> </module>

1 0

[ion] 57034: [NTOSKRNL]: Fix typo.
by ion＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: ion Date: Fri Aug 3 11:36:43 2012 New Revision: 57034 URL: http://svn.reactos.org/svn/reactos?rev=57034&view=rev Log: [NTOSKRNL]: Fix typo. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Aug 3 11:36:43 2012 @@ -1742,7 +1742,7 @@ { /* Get the protection code and check if this is a proto PTE */ ProtectionCode = TempPte.u.Soft.Protection; - DPRINT1("Code: %lx\n", ProtecitonCode); + DPRINT1("Code: %lx\n", ProtectionCode); if (TempPte.u.Soft.Prototype) { /* Do we need to go find the real PTE? */

1 0

[ion] 57033: [NTOSKRNL]: Support a few more "unsupported" paths that were hitting ASSERTs before. [NTOSKRNL]: Massively cleanup triplicated code that is just a series of macros/inlines. [NTOSKRNL]:...
by ion＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: ion Date: Fri Aug 3 11:34:35 2012 New Revision: 57033 URL: http://svn.reactos.org/svn/reactos?rev=57033&view=rev Log: [NTOSKRNL]: Support a few more "unsupported" paths that were hitting ASSERTs before. [NTOSKRNL]: Massively cleanup triplicated code that is just a series of macros/inlines. [NTOSKRNL]: Handle more complex prototype PTE faults that are not just demand-zero. In my private branch, I can now run ReactOS with *all* pagefile-backed sections running under ARM3 mode. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -602,7 +602,6 @@ PFN_NUMBER PageFrameIndex; BOOLEAN UsePfnLock; KIRQL OldIrql; - USHORT OldRefCount, RefCount; PMMPFN Pfn1; DPRINT("Probing MDL: %p\n", Mdl); @@ -998,45 +997,7 @@ if (CurrentProcess) ASSERT(CurrentProcess->PhysicalVadRoot == NULL); /* This address should already exist and be fully valid */ - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); - if (MI_IS_ROS_PFN(Pfn1)) - { - /* ReactOS Mm doesn't track share count */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - } - else - { - /* On ARM3 pages, we should see a valid share count */ - ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); - - /* We don't support mapping a prototype page yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - } - - /* More locked pages! */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, 1); - - /* Loop trying to update the reference count */ - do - { - /* Get the current reference count, make sure it's valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - ASSERT(OldRefCount < 2500); - - /* Bump it up by one */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount + 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - - /* Was this the first lock attempt? */ - if (OldRefCount != 1) - { - /* Someone else came through */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } + MiReferenceProbedPageAndBumpLockCount(Pfn1); } else { @@ -1131,7 +1092,6 @@ PVOID Base; ULONG Flags, PageCount; KIRQL OldIrql; - USHORT RefCount, OldRefCount; PMMPFN Pfn1; DPRINT("Unlocking MDL: %p\n", Mdl); @@ -1198,66 +1158,7 @@ // Check if this page is in the PFN database // Pfn1 = MiGetPfnEntry(*MdlPages); - if (Pfn1) - { - /* Get the current entry and reference count */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Is this already the last dereference */ - if (OldRefCount == 1) - { - /* It should be on a free list waiting for us */ - ASSERT(Pfn1->u3.e2.ReferenceCount == 1); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Not supported yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - - /* One less page */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - - /* Do the last dereference, we're done here */ - MiDecrementReferenceCount(Pfn1, *MdlPages); - } - else - { - /* Loop decrementing one reference */ - do - { - /* Make sure it's still valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Take off one reference */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount - 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - ASSERT(RefCount > 1); - - /* Are there only lock references left? */ - if (RefCount == 2) - { - /* And does the page still have users? */ - if (Pfn1->u2.ShareCount >= 1) - { - /* Then it should still be valid */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - - /* Not supported yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - - /* But there is one less "locked" page though */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } - } - } - } + if (Pfn1) MiDereferencePfnAndDropLockCount(Pfn1); } while (++MdlPages < LastPage); // @@ -1347,62 +1248,7 @@ { /* Get the current entry and reference count */ Pfn1 = (PMMPFN)*MdlPages; - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Is this already the last dereference */ - if (OldRefCount == 1) - { - /* It should be on a free list waiting for us */ - ASSERT(Pfn1->u3.e2.ReferenceCount == 1); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Not supported yet */ - ASSERT(((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0))); - - /* One less page */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - - /* Do the last dereference, we're done here */ - MiDecrementReferenceCount(Pfn1, MiGetPfnEntryIndex(Pfn1)); - } - else - { - /* Loop decrementing one reference */ - do - { - /* Make sure it's still valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Take off one reference */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount - 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - ASSERT(RefCount > 1); - - /* Are there only lock references left? */ - if (RefCount == 2) - { - /* And does the page still have users? */ - if (Pfn1->u2.ShareCount >= 1) - { - /* Then it should still be valid */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - - /* Not supported yet */ - ASSERT(((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0))); - - /* But there is one less "locked" page though */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } - } - } + MiDereferencePfnAndDropLockCount(Pfn1); } while (++MdlPages < LastPage); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -693,6 +693,7 @@ extern MM_AVL_TABLE MmSectionBasedRoot; extern KGUARDED_MUTEX MmSectionBasedMutex; extern PVOID MmHighSectionBase; +extern SIZE_T MmSystemLockPagesCount; BOOLEAN FORCEINLINE @@ -984,6 +985,43 @@ } // +// New ARM3<->RosMM PAGE Architecture +// +BOOLEAN +FORCEINLINE +MiIsRosSectionObject(IN PVOID Section) +{ + PROS_SECTION_OBJECT RosSection = Section; + if ((RosSection->Type == 'SC') && (RosSection->Size == 'TN')) return TRUE; + return FALSE; +} + +#ifdef _WIN64 +// HACK ON TOP OF HACK ALERT!!! +#define MI_GET_ROS_DATA(x) \ + (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ + ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) +#else +#define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) +#endif +#define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) +#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); +typedef struct _MMROSPFN +{ + PMM_RMAP_ENTRY RmapListHead; + SWAPENTRY SwapEntry; +} MMROSPFN, *PMMROSPFN; + +#define RosMmData AweReferenceCount + +VOID +NTAPI +MiDecrementReferenceCount( + IN PMMPFN Pfn1, + IN PFN_NUMBER PageFrameIndex +); + +// // Locks the working set for the given process // FORCEINLINE @@ -1063,7 +1101,7 @@ /* Own the session working set */ ASSERT((Thread->OwnsSessionWorkingSetExclusive == FALSE) && (Thread->OwnsSessionWorkingSetShared == FALSE)); - Thread->OwnsSessionWorkingSetExclusive = TRUE; + Thread->OwnsSessionWorkingSetExclusive = TRUE; } else { @@ -1142,6 +1180,237 @@ return &MmPfnDatabase[Pfn]; }; +// +// Drops a locked page without dereferencing it +// +FORCEINLINE +VOID +MiDropLockCount(IN PMMPFN Pfn1) +{ + /* This page shouldn't be locked, but it should be valid */ + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + ASSERT(Pfn1->u2.ShareCount == 0); + + /* Is this the last reference to the page */ + if (Pfn1->u3.e2.ReferenceCount == 1) + { + /* It better not be valid */ + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* Update the counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + +// +// Drops a locked page and dereferences it +// +FORCEINLINE +VOID +MiDereferencePfnAndDropLockCount(IN PMMPFN Pfn1) +{ + USHORT RefCount, OldRefCount; + PFN_NUMBER PageFrameIndex; + + /* Loop while we decrement the page successfully */ + do + { + /* There should be at least one reference */ + OldRefCount = Pfn1->u3.e2.ReferenceCount; + ASSERT(OldRefCount != 0); + + /* Are we the last one */ + if (OldRefCount == 1) + { + /* The page shoudln't be shared not active at this point */ + ASSERT(Pfn1->u3.e2.ReferenceCount == 1); + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + ASSERT(Pfn1->u2.ShareCount == 0); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* Update the counter, and drop a reference the long way */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + PageFrameIndex = MiGetPfnEntryIndex(Pfn1); + MiDecrementReferenceCount(Pfn1, PageFrameIndex); + return; + } + + /* Drop a reference the short way, and that's it */ + RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, + OldRefCount - 1, + OldRefCount); + ASSERT(RefCount != 0); + } while (OldRefCount != RefCount); + + /* If we got here, there should be more than one reference */ + ASSERT(RefCount > 1); + if (RefCount == 2) + { + /* Is it still being shared? */ + if (Pfn1->u2.ShareCount >= 1) + { + /* Then it should be valid */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle ethis */ + ASSERT(FALSE); + } + + /* Update the counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } + } +} + +// +// References a locked page and updates the counter +// Used in MmProbeAndLockPages to handle different edge cases +// +FORCEINLINE +VOID +MiReferenceProbedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT RefCount, OldRefCount; + + /* Sanity check */ + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + + /* Does ARM3 own the page? */ + if (MI_IS_ROS_PFN(Pfn1)) + { + /* ReactOS Mm doesn't track share count */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + } + else + { + /* On ARM3 pages, we should see a valid share count */ + ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); + + /* We don't support mapping a prototype page yet */ + ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Loop trying to update the reference count */ + do + { + /* Get the current reference count, make sure it's valid */ + OldRefCount = Pfn1->u3.e2.ReferenceCount; + ASSERT(OldRefCount != 0); + ASSERT(OldRefCount < 2500); + + /* Bump it up by one */ + RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, + OldRefCount + 1, + OldRefCount); + ASSERT(RefCount != 0); + } while (OldRefCount != RefCount); + + /* Was this the first lock attempt? If not, undo our bump */ + if (OldRefCount != 1) InterlockedDecrementSizeT(&MmSystemLockPagesCount); +} + +// +// References a locked page and updates the counter +// Used in all other cases except MmProbeAndLockPages +// +FORCEINLINE +VOID +MiReferenceUsedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT NewRefCount; + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Update the reference count */ + NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); + if (NewRefCount == 2) + { + /* Is it locked or shared? */ + if (Pfn1->u2.ShareCount) + { + /* It's shared, so make sure it's active */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + } + else + { + /* It's locked, so we shouldn't lock again */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } + } + else + { + /* Someone had already locked the page, so undo our bump */ + ASSERT(NewRefCount < 2500); + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + +// +// References a locked page and updates the counter +// Used in all other cases except MmProbeAndLockPages +// +FORCEINLINE +VOID +MiReferenceUnusedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT NewRefCount; + + /* Make sure the page isn't used yet */ + ASSERT(Pfn1->u2.ShareCount == 0); + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Update the reference count */ + NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); + if (NewRefCount != 1) + { + /* Someone had already locked the page, so undo our bump */ + ASSERT(NewRefCount < 2500); + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + BOOLEAN NTAPI MmArmInitSystem( @@ -1425,13 +1694,6 @@ VOID NTAPI MiDecrementShareCount( - IN PMMPFN Pfn1, - IN PFN_NUMBER PageFrameIndex -); - -VOID -NTAPI -MiDecrementReferenceCount( IN PMMPFN Pfn1, IN PFN_NUMBER PageFrameIndex ); @@ -1739,34 +2001,4 @@ return 0; } -// -// New ARM3<->RosMM PAGE Architecture -// -BOOLEAN -FORCEINLINE -MiIsRosSectionObject(IN PVOID Section) -{ - PROS_SECTION_OBJECT RosSection = Section; - if ((RosSection->Type == 'SC') && (RosSection->Size == 'TN')) return TRUE; - return FALSE; -} - -#ifdef _WIN64 -// HACK ON TOP OF HACK ALERT!!! -#define MI_GET_ROS_DATA(x) \ - (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ - ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) -#else -#define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) -#endif -#define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) -#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); -typedef struct _MMROSPFN -{ - PMM_RMAP_ENTRY RmapListHead; - SWAPENTRY SwapEntry; -} MMROSPFN, *PMMROSPFN; - -#define RosMmData AweReferenceCount - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -21,8 +21,6 @@ #if MI_TRACE_PFNS BOOLEAN UserPdeFault = FALSE; #endif - -LONG MmSystemLockPagesCount; /* PRIVATE FUNCTIONS **********************************************************/ @@ -505,7 +503,7 @@ IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, IN KIRQL OldIrql, - IN PMMPFN* LockedPfn) + IN PMMPFN* LockedProtoPfn) { MMPTE TempPte; PMMPTE OriginalPte, PageTablePte; @@ -569,8 +567,14 @@ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype != 0); } - /* Not yet handled by ReactOS */ - ASSERT(LockedPfn == NULL); + /* Did we get a locked incoming PFN? */ + if (*LockedProtoPfn) + { + /* Drop a reference */ + ASSERT((*LockedProtoPfn)->u3.e2.ReferenceCount >= 1); + MiDereferencePfnAndDropLockCount(*LockedProtoPfn); + *LockedProtoPfn = NULL; + } /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -630,7 +634,6 @@ PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - USHORT NewRefCount; DPRINT1("Transition fault on 0x%p with PTE 0x%lx in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); /* Windowss does this check */ @@ -681,57 +684,14 @@ /* Otherwise, the page is removed from its list */ DPRINT1("Transition page in free/zero list\n"); MiUnlinkPageFromList(Pfn1); - - /* Windows does these checks -- perhaps a macro? */ - ASSERT(Pfn1->u2.ShareCount == 0); - ASSERT(Pfn1->u2.ShareCount == 0); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - - /* Check if this was a prototype PTE */ - if ((Pfn1->u3.e1.PrototypePte == 1) && - (Pfn1->OriginalPte.u.Soft.Prototype == 1)) - { - DPRINT1("Prototype floating page not yet supported\n"); - ASSERT(FALSE); - } - - /* Update counter */ - InterlockedIncrementSizeT(&MmSystemLockPagesCount); - - /* We must be the first reference */ - NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); - ASSERT(NewRefCount == 1); + MiReferenceUnusedPageAndBumpLockCount(Pfn1); } /* At this point, there should no longer be any in-page errors */ ASSERT(Pfn1->u4.InPageError == 0); /* Check if this was a PFN with no more share references */ - if (Pfn1->u2.ShareCount == 0) - { - /* Windows checks for these... maybe a macro? */ - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Was this the last active reference to it */ - DPRINT1("Page share count is zero\n"); - if (Pfn1->u3.e2.ReferenceCount == 1) - { - /* The page should be leaking somewhere on the free/zero list */ - DPRINT1("Page reference count is one\n"); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - if ((Pfn1->u3.e1.PrototypePte == 1) && - (Pfn1->OriginalPte.u.Soft.Prototype == 1)) - { - /* Do extra processing if it was a prototype page */ - DPRINT1("Prototype floating page not yet supported\n"); - ASSERT(FALSE); - } - - /* Update counter */ - InterlockedDecrementSizeT(&MmSystemLockPagesCount); - } - } + if (Pfn1->u2.ShareCount == 0) MiDropLockCount(Pfn1); /* Bump the share count and make the page valid */ Pfn1->u2.ShareCount++; @@ -821,7 +781,7 @@ PointerPte, PointerProtoPte, OldIrql, - NULL); + OutPfn); } /* Make sure there's some protection mask */ @@ -897,7 +857,7 @@ PointerPte, PointerProtoPte, OldIrql, - NULL); + OutPfn); } NTSTATUS @@ -915,7 +875,7 @@ KIRQL OldIrql, LockIrql; NTSTATUS Status; PMMPTE SuperProtoPte; - PMMPFN Pfn1; + PMMPFN Pfn1, OutPfn = NULL; PFN_NUMBER PageFrameIndex, PteCount, ProcessedPtes; DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", Address, @@ -964,7 +924,7 @@ Address, PointerPte, PointerProtoPte, - NULL, + &OutPfn, NULL, NULL, Process, @@ -1010,14 +970,24 @@ while (TRUE) { /* For our current usage, this should be true */ - ASSERT(TempPte.u.Hard.Valid == 1); - ASSERT(TempPte.u.Soft.Prototype == 0); - ASSERT(TempPte.u.Soft.Transition == 0); - - /* Bump the share count on the PTE */ - PageFrameIndex = PFN_FROM_PTE(&TempPte); - Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); - Pfn1->u2.ShareCount++; + if (TempPte.u.Hard.Valid == 1) + { + /* Bump the share count on the PTE */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + Pfn1->u2.ShareCount++; + } + else if ((TempPte.u.Soft.Prototype == 0) && + (TempPte.u.Soft.Transition == 1)) + { + /* No standby support yet */ + ASSERT(FALSE); + } + else + { + /* Page is invalid, get out of the loop */ + break; + } /* One more done, was it the last? */ if (++ProcessedPtes == PteCount) @@ -1028,7 +998,7 @@ PointerPte, PointerProtoPte, LockIrql, - NULL); + &OutPfn); /* THIS RELEASES THE PFN LOCK! */ break; @@ -1038,21 +1008,62 @@ ASSERT(FALSE); } - /* Only path that we support for now */ - ASSERT(ProcessedPtes != 0); - - /* Bump the transition count */ - InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); - ProcessedPtes--; - - /* Loop all the processing we did */ - ASSERT(ProcessedPtes == 0); + /* Did we resolve the fault? */ + if (ProcessedPtes) + { + /* Bump the transition count */ + InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); + ProcessedPtes--; + + /* Loop all the processing we did */ + ASSERT(ProcessedPtes == 0); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return STATUS_PAGE_FAULT_TRANSITION; + } + + /* We did not -- PFN lock is still held, prepare to resolve prototype PTE fault */ + OutPfn = MI_PFN_ELEMENT(SuperProtoPte->u.Hard.PageFrameNumber); + MiReferenceUsedPageAndBumpLockCount(OutPfn); + ASSERT(OutPfn->u3.e2.ReferenceCount > 1); + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + &OutPfn, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Did the routine clean out the PFN or should we? */ + if (OutPfn) + { + /* We had a locked PFN, so acquire the PFN lock to dereference it */ + ASSERT(PointerProtoPte != NULL); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Dereference the locked PFN */ + MiDereferencePfnAndDropLockCount(OutPfn); + ASSERT(OutPfn->u3.e2.ReferenceCount >= 1); + + /* And now release the lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } /* Complete this as a transition fault */ ASSERT(OldIrql == KeGetCurrentIrql()); ASSERT(OldIrql <= APC_LEVEL); ASSERT(KeAreAllApcsDisabled() == TRUE); - return STATUS_PAGE_FAULT_TRANSITION; + return Status; } } @@ -1729,8 +1740,46 @@ } else { - /* This path is not yet supported */ - ASSERT(FALSE); + /* Get the protection code and check if this is a proto PTE */ + ProtectionCode = TempPte.u.Soft.Protection; + DPRINT1("Code: %lx\n", ProtecitonCode); + if (TempPte.u.Soft.Prototype) + { + /* Do we need to go find the real PTE? */ + DPRINT1("Soft: %lx\n", TempPte.u.Soft.PageFileHigh); + if (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) + { + /* Get the prototype pte and VAD for it */ + ProtoPte = MiCheckVirtualAddress(Address, + &ProtectionCode, + &Vad); + DPRINT1("Address: %p ProtoP %p Code: %lx Vad: %p\n", Address, ProtoPte, ProtectionCode, Vad); + if (!ProtoPte) + { + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_ACCESS_VIOLATION; + } + } + else + { + /* Get the prototype PTE! */ + ProtoPte = MiProtoPteToPte(&TempPte); + + /* Is it read-only */ + if (TempPte.u.Proto.ReadOnly) + { + /* Set read-only code */ + ProtectionCode = MM_READONLY; + } + else + { + /* Set unknown protection */ + ProtectionCode = 0x100; + ASSERT(CurrentProcess->CloneRoot != NULL); + } + } + } } /* FIXME: Run MiAccessCheck */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -806,7 +806,6 @@ return Status; } - NTSTATUS NTAPI MiSessionCommitPageTables(IN PVOID StartVa, Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -1313,9 +1313,9 @@ OUT PVOID *NextVa) { - PMMPTE PointerPte; + PMMPTE PointerPte, ProtoPte; PMMPDE PointerPde; - MMPTE TempPte; + MMPTE TempPte, TempProtoPte; BOOLEAN DemandZeroPte = TRUE, ValidPte = FALSE; ULONG State = MEM_RESERVE, Protect = 0; ASSERT((Vad->StartingVpn <= ((ULONG_PTR)Va >> PAGE_SHIFT)) && @@ -1353,6 +1353,7 @@ if (ValidPte) { /* FIXME: watch out for large pages */ + ASSERT(PointerPde->u.Hard.LargePage == FALSE); /* Capture the PTE */ TempPte = *PointerPte; @@ -1375,6 +1376,11 @@ { /* This means it's committed */ State = MEM_COMMIT; + + /* We don't support these */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + ASSERT(Vad->u.VadFlags.VadType != VadRotatePhysical); + ASSERT(Vad->u.VadFlags.VadType != VadAwe); /* Get protection state of this page */ Protect = MiGetPageProtection(PointerPte); @@ -1395,11 +1401,35 @@ /* Check if this was a demand-zero PTE, since we need to find the state */ if (DemandZeroPte) { - /* Check if this is private commited memory, or an image-backed VAD */ + /* Not yet handled */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + ASSERT(Vad->u.VadFlags.VadType != VadAwe); + + /* Check if this is private commited memory, or an section-backed VAD */ if ((Vad->u.VadFlags.PrivateMemory == 0) && (Vad->ControlArea)) { - DPRINT1("Not supported\n"); - ASSERT(FALSE); + /* Tell caller about the next range */ + *NextVa = (PVOID)((ULONG_PTR)Va + PAGE_SIZE); + + /* Get the prototype PTE for this VAD */ + ProtoPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(Vad, + (ULONG_PTR)Va >> PAGE_SHIFT); + if (ProtoPte) + { + /* We should unlock the working set, but it's not being held! */ + + /* Is the prototype PTE actually valid (committed)? */ + TempProtoPte = *ProtoPte; + if (TempProtoPte.u.Long) + { + /* Unless this is a memory-mapped file, handle it like private VAD */ + State = MEM_COMMIT; + ASSERT(Vad->u.VadFlags.VadType != VadImageMap); + Protect = MmProtectToValue[Vad->u.VadFlags.Protection]; + } + + /* We should re-lock the working set */ + } } else if (Vad->u.VadFlags.MemCommit) {

1 0

[cgutman] 57032: [NDIS] - Fix driver object dispatch table corruption in NdisMRegisterDevice See issue #7191 for more details.
by cgutman＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: cgutman Date: Fri Aug 3 08:23:02 2012 New Revision: 57032 URL: http://svn.reactos.org/svn/reactos?rev=57032&view=rev Log: [NDIS] - Fix driver object dispatch table corruption in NdisMRegisterDevice See issue #7191 for more details. Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Aug 3 08:23:02 2012 @@ -37,6 +37,7 @@ typedef struct _NDIS_M_DEVICE_BLOCK { PDEVICE_OBJECT DeviceObject; PNDIS_STRING SymbolicName; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION+1]; } NDIS_M_DEVICE_BLOCK, *PNDIS_M_DEVICE_BLOCK; /* resources allocated on behalf on the miniport */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 3 08:23:02 2012 @@ -2503,7 +2503,59 @@ return STATUS_SUCCESS; } - +NTSTATUS +NTAPI +NdisGenericIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Use the characteristics to classify the device */ + if (DeviceObject->DeviceType == FILE_DEVICE_PHYSICAL_NETCARD) + { + if ((IrpSp->MajorFunction == IRP_MJ_CREATE) || + (IrpSp->MajorFunction == IRP_MJ_CLOSE)) + { + return NdisICreateClose(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_PNP) + { + return NdisIDispatchPnp(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_SHUTDOWN) + { + return NdisIShutdown(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL) + { + return NdisIDeviceIoControl(DeviceObject, Irp); + } + } + else if (DeviceObject->DeviceType == FILE_DEVICE_NETWORK) + { + PNDIS_M_DEVICE_BLOCK DeviceBlock = DeviceObject->DeviceExtension; + + ASSERT(DeviceBlock->DeviceObject == DeviceObject); + + if (DeviceBlock->MajorFunction[IrpSp->MajorFunction] != NULL) + { + return DeviceBlock->MajorFunction[IrpSp->MajorFunction](DeviceObject, Irp); + } + } + else + { + ASSERT(FALSE); + } + + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_DEVICE_REQUEST; +} + /* * @implemented */ @@ -2527,6 +2579,7 @@ PNDIS_M_DRIVER_BLOCK Miniport = GET_MINIPORT_DRIVER(NdisWrapperHandle); PNDIS_M_DRIVER_BLOCK *MiniportPtr; NTSTATUS Status; + ULONG i; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -2649,11 +2702,12 @@ *MiniportPtr = Miniport; - Miniport->DriverObject->MajorFunction[IRP_MJ_CREATE] = NdisICreateClose; - Miniport->DriverObject->MajorFunction[IRP_MJ_CLOSE] = NdisICreateClose; - Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; - Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; - Miniport->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NdisIDeviceIoControl; + /* We have to register for all of these so handler registered in NdisMRegisterDevice work */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + Miniport->DriverObject->MajorFunction[i] = NdisGenericIrpHandler; + } + Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; return NDIS_STATUS_SUCCESS; @@ -3076,7 +3130,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); Status = IoCreateDevice(DriverBlock->DriverObject, - 0, /* This space is reserved for us. Should we use it? */ + sizeof(NDIS_M_DEVICE_BLOCK), DeviceName, FILE_DEVICE_NETWORK, 0, @@ -3098,7 +3152,7 @@ return Status; } - DeviceBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DEVICE_BLOCK)); + DeviceBlock = DeviceObject->DeviceExtension; if (!DeviceBlock) { @@ -3109,15 +3163,7 @@ } for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; - - DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; - - if (!DriverBlock->DriverObject->MajorFunction[IRP_MJ_CREATE]) - DriverBlock->DriverObject->MajorFunction[IRP_MJ_CREATE] = NdisICreateClose; - - if (!DriverBlock->DriverObject->MajorFunction[IRP_MJ_CLOSE]) - DriverBlock->DriverObject->MajorFunction[IRP_MJ_CLOSE] = NdisICreateClose; + DeviceBlock->MajorFunction[i] = MajorFunctions[i]; DeviceBlock->DeviceObject = DeviceObject; DeviceBlock->SymbolicName = SymbolicName; @@ -3147,8 +3193,6 @@ IoDeleteDevice(DeviceBlock->DeviceObject); IoDeleteSymbolicLink(DeviceBlock->SymbolicName); - - ExFreePool(DeviceBlock); return NDIS_STATUS_SUCCESS; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs