Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 51773: [ApiTest] - Add a test for stack corruption when in window procedure call out.
by jimtabor＠svn.reactos.org 15 May '11

15 May '11

Author: jimtabor Date: Sun May 15 21:15:38 2011 New Revision: 51773 URL: http://svn.reactos.org/svn/reactos?rev=51773&view=rev Log: [ApiTest] - Add a test for stack corruption when in window procedure call out. Added: trunk/rostests/apitests/user32/WndProc.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sun May 15 21:15:38 2011 @@ -14,6 +14,7 @@ ScrollDC.c ScrollWindowEx.c SetCursorPos.c + WndProc.c testlist.c user32_apitest.rc) Added: trunk/rostests/apitests/user32/WndProc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/WndProc.c… ============================================================================== --- trunk/rostests/apitests/user32/WndProc.c (added) +++ trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] Sun May 15 21:15:38 2011 @@ -1,0 +1,100 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for mismatch with function prototype in window procedure callback. + * PROGRAMMERS: + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +/* Used wine Redraw test for proof in principle. */ + +/* Global variables to trigger exit from loop */ +static int redrawComplete, WMPAINT_count; + +/* + Force stack corruption when calling from assumed window procedure callback. + Adding (6 and) more will force exception faults and terminate the test program. + The test is with five and this is safe for windows. + + But,,,, ReactOS compiled with GCC can handle this,,,,,, + */ +static LRESULT WINAPI redraw_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ExtraData,DWORD ExtraData1,DWORD ExtraData2,DWORD ExtraData3) +{ + switch (msg) + { + case WM_PAINT: + trace("doing WM_PAINT %d\n", WMPAINT_count); + WMPAINT_count++; + if (WMPAINT_count > 10 && redrawComplete == 0) + { + PAINTSTRUCT ps; + BeginPaint(hwnd, &ps); + EndPaint(hwnd, &ps); + return 1; + } + /* + This will force one stack corruption "ret" fault with normal window + procedure callback. + */ +#ifdef __MINGW32__ + asm ("movl $0, %eax\n\t" + "leave\n\t" + "ret"); +#else +//#ifdef _MSC_VER + __asm + { + mov eax, 0 + leave + ret + } +#endif + } + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +static void test_wndproc(void) +{ + WNDCLASSA cls; + HWND hwndMain; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = (WNDPROC)redraw_window_procA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "RedrawWindowClass"; + + if (!RegisterClassA(&cls)) + { + trace("Register failed %d\n", (int)GetLastError()); + return; + } + + hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); + + ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + ShowWindow(hwndMain, SW_SHOW); + ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + RedrawWindow(hwndMain, NULL,NULL,RDW_UPDATENOW | RDW_ALLCHILDREN); + ok( WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */ + "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + redrawComplete = TRUE; + ok( WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count); + + /* clean up */ + DestroyWindow( hwndMain); +} + +START_TEST(WndProc) +{ + test_wndproc(); +} Propchange: trunk/rostests/apitests/user32/WndProc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sun May 15 21:15:38 2011 @@ -15,6 +15,7 @@ extern void func_DeferWindowPos(void); extern void func_GetKeyState(void); extern void func_SetCursorPos(void); +extern void func_WndProc(void); const struct test winetest_testlist[] = { @@ -28,6 +29,7 @@ { "DeferWindowPos", func_DeferWindowPos }, { "GetKeyState", func_GetKeyState }, { "SetCursorPos", func_SetCursorPos }, + { "WndProc", func_WndProc }, { 0, 0 } }; Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Sun May 15 21:15:38 2011 @@ -20,6 +20,7 @@ <file>GetPeekMessage.c</file> <file>DeferWindowPos.c</file> <file>SetCursorPos.c</file> + <file>WndProc.c</file> </module> </group>

1 0

[jgardou] 51772: [CMAKE] - generate source files and header files in one pass by passing right arguments to widl. Why this didn't work before is left as an exercise for the reader.
by jgardou＠svn.reactos.org 15 May '11

15 May '11

Author: jgardou Date: Sun May 15 19:31:13 2011 New Revision: 51772 URL: http://svn.reactos.org/svn/reactos?rev=51772&view=rev Log: [CMAKE] - generate source files and header files in one pass by passing right arguments to widl. Why this didn't work before is left as an exercise for the reader. Modified: branches/cmake-bringup/cmake/idl-support.cmake Modified: branches/cmake-bringup/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/idl-support… ============================================================================== --- branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] Sun May 15 19:31:13 2011 @@ -9,7 +9,6 @@ set(IDL_CLIENT_ARG /cstub) #.c for stub client library set(IDL_PROXY_ARG /proxy) set(IDL_INTERFACE_ARG /iid) - set(IDL_DLLDATA_ARG /dlldata) if(ARCH MATCHES i386) set(IDL_FLAGS /win32) elseif(ARCH MATCHES amd64) @@ -20,13 +19,12 @@ else() set(IDL_COMPILER native-widl) set(IDL_HEADER_ARG -h -o) #.h - set(IDL_HEADER_ARG2 -H) #.h + set(IDL_HEADER_ARG2 -h -H) #.h set(IDL_TYPELIB_ARG -t -o) #.tlb - set(IDL_SERVER_ARG -s -S) #.c for server library - set(IDL_CLIENT_ARG -c -C) #.c for stub client library + set(IDL_SERVER_ARG -s -o) #.c for server library + set(IDL_CLIENT_ARG -c -o) #.c for stub client library set(IDL_PROXY_ARG -p -o) set(IDL_INTERFACE_ARG -u -o) - set(IDL_DLLDATA_ARG --dlldata-only -o) if(ARCH MATCHES i386) set(IDL_FLAGS -m32 --win32) elseif(ARCH MATCHES amd64) @@ -92,20 +90,12 @@ foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) if(NOT MSVC) - # cmake internal dependency checker detects that .c depends on .h. - # Building them in two passes avoids unnecessary recompilation (to put it simple) - # Fortunately, midl is smarter and generates .h BEFORE .c - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - set(_depends ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_HEADER_ARG2} ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${DLLDATA_ARG} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${_depends}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endforeach() # Extra pass to generate dlldata @@ -126,29 +116,15 @@ foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c - PROPERTIES GENERATED TRUE) list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c - PROPERTIES GENERATED TRUE) list(APPEND client_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c) endforeach() add_library(${TARGET} ${server_SOURCES} ${client_SOURCES})

1 0

[jgardou] 51771: [CMAKE] - refactor generation of rpcproxy file to avoid recompiling Get rid of unnecessary libraries in the process. Tested with both mingw32-make+widl/nmake+midl - do not rebuild ...
by jgardou＠svn.reactos.org 15 May '11

15 May '11

Author: jgardou Date: Sun May 15 18:10:27 2011 New Revision: 51771 URL: http://svn.reactos.org/svn/reactos?rev=51771&view=rev Log: [CMAKE] - refactor generation of rpcproxy file to avoid recompiling Get rid of unnecessary libraries in the process. Tested with both mingw32-make+widl/nmake+midl - do not rebuild livecd hives if not necessary Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/boot/bootdata/CMakeLists.txt branches/cmake-bringup/cmake/idl-support.cmake branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -21,7 +21,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) -set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) +#set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) if(NOT ARCH) set(ARCH i386) Modified: branches/cmake-bringup/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/CMa… ============================================================================== --- branches/cmake-bringup/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -12,9 +12,21 @@ ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam + ${CMAKE_CURRENT_BINARY_DIR}/default + ${CMAKE_CURRENT_BINARY_DIR}/security + ${CMAKE_CURRENT_BINARY_DIR}/software + ${CMAKE_CURRENT_BINARY_DIR}/system + COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES} + DEPENDS native-mkhive ${CD_HIVES}) + add_custom_target(livecd_hives - native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES} - DEPENDS native-mkhive ${CD_HIVES}) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sam + ${CMAKE_CURRENT_BINARY_DIR}/default + ${CMAKE_CURRENT_BINARY_DIR}/security + ${CMAKE_CURRENT_BINARY_DIR}/software + ${CMAKE_CURRENT_BINARY_DIR}/system) add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/sam Modified: branches/cmake-bringup/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/idl-support… ============================================================================== --- branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] Sun May 15 18:10:27 2011 @@ -3,12 +3,13 @@ if(MSVC) set(IDL_COMPILER midl) set(IDL_HEADER_ARG /h) #.h - set(IDL_HEADER_ARG2 /h) #.h + set(IDL_HEADER_ARG2 /header) #.h set(IDL_TYPELIB_ARG /tlb) #.tlb set(IDL_SERVER_ARG /sstub) #.c for stub server library set(IDL_CLIENT_ARG /cstub) #.c for stub client library set(IDL_PROXY_ARG /proxy) set(IDL_INTERFACE_ARG /iid) + set(IDL_DLLDATA_ARG /dlldata) if(ARCH MATCHES i386) set(IDL_FLAGS /win32) elseif(ARCH MATCHES amd64) @@ -19,12 +20,13 @@ else() set(IDL_COMPILER native-widl) set(IDL_HEADER_ARG -h -o) #.h - set(IDL_HEADER_ARG2 -h -H) #.h + set(IDL_HEADER_ARG2 -H) #.h set(IDL_TYPELIB_ARG -t -o) #.tlb set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library - set(IDL_PROXY_ARG -p -P) + set(IDL_PROXY_ARG -p -o) set(IDL_INTERFACE_ARG -u -o) + set(IDL_DLLDATA_ARG --dlldata-only -o) if(ARCH MATCHES i386) set(IDL_FLAGS -m32 --win32) elseif(ARCH MATCHES amd64) @@ -80,38 +82,42 @@ add_custom_target(${TARGET} ALL DEPENDS ${HEADERS}) endmacro() -macro(add_rpcproxy_library TARGET) +macro(add_rpcproxy_files) get_includes(INCLUDES) get_defines(DEFINES) + + if(MSVC) + set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) + endif() foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) - if(MSVC) - set(IDL_DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) - else() - set(IDL_DLLDATA_ARG "") + if(NOT MSVC) + # cmake internal dependency checker detects that .c depends on .h. + # Building them in two passes avoids unnecessary recompilation (to put it simple) + # Fortunately, midl is smarter and generates .h BEFORE .c + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + set(_depends ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) + list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_DLLDATA_ARG} ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c - PROPERTIES GENERATED TRUE) - list(APPEND rpcproxy_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.idl) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_HEADER_ARG2} ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${DLLDATA_ARG} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${_depends}) endforeach() - if(NOT MSVC) - # Extra pass to generate dlldata for widl + # Extra pass to generate dlldata + if(MSVC) + #nobody told how to generate it, so mark it as generated + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) + else() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} DEPENDS ${IDLS}) endif() - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - PROPERTIES GENERATED TRUE) - add_library(${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${rpcproxy_SOURCES}) endmacro() macro(add_rpc_library TARGET) @@ -120,7 +126,11 @@ foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) set_source_files_properties( @@ -129,7 +139,11 @@ list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) set_source_files_properties( Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -14,7 +14,7 @@ spec2def(quartz.dll quartz.spec) -add_rpcproxy_library(quartzproxy quartz_strmif.idl) +add_rpcproxy_files(quartz_strmif.idl) list(APPEND SOURCE avidec.c @@ -42,6 +42,8 @@ control.c avisplit.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) add_library(quartz SHARED ${SOURCE}) @@ -49,7 +51,6 @@ set_module_type(quartz win32dll) target_link_libraries(quartz - quartzproxy strmiids uuid wine Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -4,7 +4,7 @@ spec2def(actxprxy.dll actxprxy.spec) -add_rpcproxy_library(actxprxylib +add_rpcproxy_files( actxprxy_activscp.idl actxprxy_comcat.idl actxprxy_docobj.idl @@ -18,6 +18,17 @@ list(APPEND SOURCE usrmarshal.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_activscp_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_comcat_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_docobj_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_hlink_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_htiframe_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_objsafe_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_ocmm_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_servprov_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_shobjidl_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_urlhist_p.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) add_library(actxprxy SHARED ${SOURCE}) @@ -25,7 +36,6 @@ set_entrypoint(actxprxy 0) target_link_libraries(actxprxy - actxprxylib uuid wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -20,7 +20,7 @@ ${CMAKE_CURRENT_BINARY_DIR} ${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_rpcproxy_library(ole32proxy +add_rpcproxy_files( dcom.idl ole32_unknwn.idl ole32_objidl.idl @@ -65,7 +65,12 @@ usrmarshal.c ole32res.rc ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c + ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c + ${CMAKE_CURRENT_BINARY_DIR}/ole32_unknwn_p.c + ${CMAKE_CURRENT_BINARY_DIR}/ole32_objidl_p.c + ${CMAKE_CURRENT_BINARY_DIR}/ole32_oleidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/ole32.def) add_library(ole32 SHARED ${SOURCE}) @@ -73,7 +78,6 @@ set_module_type(ole32 win32dll) target_link_libraries(ole32 - ole32proxy wine irotrpc uuid Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -20,6 +20,9 @@ vartype.c oleaut32.rc ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_oaidl_p.c + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) remove_definitions(-D_WIN32_WINNT=0x502) @@ -47,14 +50,13 @@ spec2def(oleaut32.dll oleaut32.spec) -add_rpcproxy_library(oleaut32proxy oleaut32_oaidl.idl oleaut32_ocidl.idl) +add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) add_library(oleaut32 SHARED ${SOURCE}) set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 - oleaut32proxy wine wineldr uuid Modified: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -12,13 +12,15 @@ list(APPEND SOURCE version.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_p.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) -add_rpcproxy_library(qmgrprxylib qmgrprxy.idl) +add_rpcproxy_files(qmgrprxy.idl) add_library(qmgrprxy SHARED ${SOURCE}) set_module_type(qmgrprxy win32dll) -target_link_libraries(qmgrprxy qmgrprxylib ${PSEH_LIB} wine) +target_link_libraries(qmgrprxy ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET qmgrprxy DESTINATION reactos/system32 FOR all) Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -16,16 +16,17 @@ regsvr.c sti.c sti_main.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) -add_rpcproxy_library(stiproxy sti_wia.idl) +add_rpcproxy_files(sti_wia.idl) add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0) target_link_libraries(sti - stiproxy wine uuid ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sun May 15 18:10:27 2011 @@ -10,7 +10,7 @@ spec2def(urlmon.dll urlmon.spec) -add_rpcproxy_library(urlmonproxy urlmon_urlmon.idl) +add_rpcproxy_files(urlmon_urlmon.idl) list(APPEND SOURCE bindctx.c @@ -36,6 +36,8 @@ urlmon_main.c usrmarshal.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) @@ -45,7 +47,6 @@ set_module_type(urlmon win32dll) target_link_libraries(urlmon - urlmonproxy uuid wine ${PSEH_LIB})

1 0

[janderwald] 51770: [USBSTOR] - Implement retrieving serial number from device - Use serial number to format instance id and retrieve in StorageDeviceProperty requests - Silence traces
by janderwald＠svn.reactos.org 15 May '11

15 May '11

Author: janderwald Date: Sun May 15 17:57:02 2011 New Revision: 51770 URL: http://svn.reactos.org/svn/reactos?rev=51770&view=rev Log: [USBSTOR] - Implement retrieving serial number from device - Use serial number to format instance id and retrieve in StorageDeviceProperty requests - Silence traces Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/pdo.c branches/usb-bringup/drivers/usb/usbstor/queue.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -161,8 +161,36 @@ } // - // FIXME: scan string descriptors - // + // check if there is a serial number provided + // + if (DeviceExtension->DeviceDescriptor->iSerialNumber) + { + // + // get serial number + // + Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_STRING_DESCRIPTOR_TYPE, 100 * sizeof(WCHAR), DeviceExtension->DeviceDescriptor->iSerialNumber, 0x0409, (PVOID*)&DeviceExtension->SerialNumber); + if (!NT_SUCCESS(Status)) + { + // + // failed to get serial number descriptor, free device descriptor + // + FreeItem(DeviceExtension->DeviceDescriptor); + DeviceExtension->DeviceDescriptor = NULL; + + // + // free configuration descriptor + // + FreeItem(DeviceExtension->ConfigurationDescriptor); + DeviceExtension->ConfigurationDescriptor = NULL; + + // + // set serial number to zero + // + DeviceExtension->SerialNumber = NULL; + return Status; + } + } + return Status; } Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -240,11 +240,15 @@ PSTORAGE_PROPERTY_QUERY PropertyQuery; PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader; PSTORAGE_ADAPTER_DESCRIPTOR AdapterDescriptor; - ULONG FieldLengthVendor, FieldLengthProduct, FieldLengthRevision, TotalLength; + ULONG FieldLengthVendor, FieldLengthProduct, FieldLengthRevision, TotalLength, FieldLengthSerialNumber; PPDO_DEVICE_EXTENSION PDODeviceExtension; PUFI_INQUIRY_RESPONSE InquiryData; PSTORAGE_DEVICE_DESCRIPTOR DeviceDescriptor; PUCHAR Buffer; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + UNICODE_STRING SerialNumber; + ANSI_STRING AnsiString; + NTSTATUS Status; DPRINT1("USBSTOR_HandleQueryProperty\n"); @@ -307,6 +311,14 @@ // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension); + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension); + ASSERT(FDODeviceExtension->Common.IsFDO); // // get inquiry data @@ -322,14 +334,28 @@ FieldLengthRevision = USBSTOR_GetFieldLength(InquiryData->Revision, 4); // - // FIXME handle serial number - // - - // - // total length required is sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLength + 3 extra null bytes - 1 + // is there a serial number + // + if (FDODeviceExtension->SerialNumber) + { + // + // get length + // + FieldLengthSerialNumber = wcslen(FDODeviceExtension->SerialNumber->bString); + } + else + { + // + // no serial number + // + FieldLengthSerialNumber = 0; + } + + // + // total length required is sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLength + 4 extra null bytes - 1 // -1 due STORAGE_DEVICE_DESCRIPTOR contains one byte length of parameter data // - TotalLength = sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 2; + TotalLength = sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + FieldLengthSerialNumber + 3; // // check if output buffer is long enough @@ -370,8 +396,8 @@ DeviceDescriptor->VendorIdOffset = sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR); DeviceDescriptor->ProductIdOffset = DeviceDescriptor->VendorIdOffset + FieldLengthVendor + 1; DeviceDescriptor->ProductRevisionOffset = DeviceDescriptor->ProductIdOffset + FieldLengthProduct + 1; - DeviceDescriptor->SerialNumberOffset = 0; //FIXME - DeviceDescriptor->RawPropertiesLength = FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 3; + DeviceDescriptor->SerialNumberOffset = (FieldLengthSerialNumber > 0 ? DeviceDescriptor->ProductRevisionOffset + FieldLengthRevision + 1 : 0); + DeviceDescriptor->RawPropertiesLength = FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + FieldLengthSerialNumber + 3 + (FieldLengthSerialNumber > 0 ? + 1 : 0); // // copy descriptors @@ -400,12 +426,34 @@ Buffer += FieldLengthRevision + 1; // - // TODO: copy revision - // + // copy serial number + // + if (FieldLengthSerialNumber) + { + // + // init unicode string + // + RtlInitUnicodeString(&SerialNumber, FDODeviceExtension->SerialNumber->bString); + + // + // init ansi string + // + AnsiString.Buffer = (PCHAR)Buffer; + AnsiString.Length = 0; + AnsiString.MaximumLength = FieldLengthSerialNumber * sizeof(WCHAR); + + // + // convert to ansi code + // + Status = RtlUnicodeStringToAnsiString(&AnsiString, &SerialNumber, FALSE); + ASSERT(Status == STATUS_SUCCESS); + } + DPRINT("Vendor %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->VendorIdOffset)); DPRINT("Product %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductIdOffset)); DPRINT("Revision %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductRevisionOffset)); + DPRINT("Serial %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->SerialNumberOffset)); // // done Modified: branches/usb-bringup/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -638,6 +638,7 @@ IN OUT PIRP Irp) { PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; WCHAR Buffer[100]; ULONG Length; LPWSTR InstanceId; @@ -648,10 +649,27 @@ PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // // format instance id - // FIXME: retrieve serial number from string device descriptor - // - swprintf(Buffer, L"%s&%d", L"09188212515A", PDODeviceExtension->LUN); + // + if (FDODeviceExtension->SerialNumber) + { + // + // using serial number from device + // + swprintf(Buffer, L"%s&%d", FDODeviceExtension->SerialNumber->bString, PDODeviceExtension->LUN); + } + else + { + // + // FIXME: should use some random value + // + swprintf(Buffer, L"%s&%d", L"00000000", PDODeviceExtension->LUN); + } // // calculate length Modified: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -175,7 +175,7 @@ // // if list is freezed, dont start this packet // - DPRINT1("IrpListFreeze: %lu IrpPendingCount %lu\n", IrpListFreeze, FDODeviceExtension->IrpPendingCount); + DPRINT("IrpListFreeze: %lu IrpPendingCount %lu\n", IrpListFreeze, FDODeviceExtension->IrpPendingCount); return (IrpListFreeze || SrbProcessing); } @@ -503,7 +503,7 @@ NTSTATUS Status; BOOLEAN ResetInProgress; - DPRINT1("USBSTOR_StartIo\n"); + DPRINT("USBSTOR_StartIo\n"); // // get FDO device extension Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -103,7 +103,7 @@ PREAD_CAPACITY_DATA CapacityData; PUFI_CAPACITY_RESPONSE Response; - DPRINT1("USBSTOR_CSWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); + DPRINT("USBSTOR_CSWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); // // access context @@ -280,7 +280,7 @@ PIRP_CONTEXT Context; PIO_STACK_LOCATION IoStack; - DPRINT1("USBSTOR_DataCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); + DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); // // access context @@ -345,7 +345,7 @@ UCHAR Code; USBD_PIPE_HANDLE PipeHandle; - DPRINT1("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); + DPRINT("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); // // access context @@ -993,7 +993,7 @@ Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; Cmd.LogicalBlockByte3 = pCDB->CDB10.LogicalBlockByte3; - DPRINT1("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request @@ -1081,7 +1081,7 @@ // pCDB = (PCDB)Request->Cdb; - DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); + DPRINT("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) { @@ -1090,7 +1090,7 @@ // ASSERT(Request->DataBuffer); - DPRINT1("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); + DPRINT("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) @@ -1106,7 +1106,7 @@ } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ || pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE) { - DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); + DPRINT("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); // // send read / write command @@ -1115,7 +1115,7 @@ } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { - DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); + DPRINT("SCSIOP_MEDIUM_REMOVAL\n"); // // just complete the request @@ -1139,7 +1139,7 @@ } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) { - DPRINT1("SCSIOP_TEST_UNIT_READY\n"); + DPRINT("SCSIOP_TEST_UNIT_READY\n"); // // send test unit command Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sun May 15 17:57:02 2011 @@ -108,7 +108,7 @@ // // function always succeeds ;) // - DPRINT1("USBSTOR_DispatchScsi\n"); + DPRINT("USBSTOR_DispatchClose\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun May 15 17:57:02 2011 @@ -57,6 +57,7 @@ USB_BUS_INTERFACE_USBDI_V2 BusInterface; // bus interface of device PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; // usb device descriptor PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; // usb configuration descriptor + PUSB_STRING_DESCRIPTOR SerialNumber; // usb serial number PUSBD_INTERFACE_INFORMATION InterfaceInformation; // usb interface information USBD_CONFIGURATION_HANDLE ConfigurationHandle; // usb configuration handle UCHAR BulkInPipeIndex; // bulk in pipe index @@ -81,9 +82,6 @@ ULONG BlockLength; // length of block ULONG LastLogicBlockAddress; // last block address }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; - - - // // max lun command identifier

1 0

[mkupfer] 51769: - German translation fixes
by mkupfer＠svn.reactos.org 15 May '11

15 May '11

Author: mkupfer Date: Sun May 15 16:43:16 2011 New Revision: 51769 URL: http://svn.reactos.org/svn/reactos?rev=51769&view=rev Log: - German translation fixes Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Sun May 15 16:43:16 2011 @@ -20,8 +20,8 @@ CAPTION "Erweiterte Tasteneinstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Um Caps Lock zu deaktivieren", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "Caps &Lock Taste drücken", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP + GROUPBOX "Um die Feststelltaste zu deaktivieren", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Festste&lltaste drücken", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "Um&schalttaste drücken", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP GROUPBOX "Schnelltasten für Eingabesprachen", -1, 7, 37, 258, 95 LTEXT "Aktion", -1, 14, 47, 60, 9 Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Sun May 15 16:43:16 2011 @@ -75,7 +75,7 @@ BEGIN LTEXT "Netzwerkverbindungs&details:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Schließen", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE

1 0

[gedmurphy] 51768: [SHELL32_NEW] - Add the shell32 code which has been converted into C++ from the existing C code. - This is a straight drop using the code Andrew sent to me, it's currently unchan...
by gedmurphy＠svn.reactos.org 15 May '11

15 May '11

Author: gedmurphy Date: Sun May 15 15:55:49 2011 New Revision: 51768 URL: http://svn.reactos.org/svn/reactos?rev=51768&view=rev Log: [SHELL32_NEW] - Add the shell32 code which has been converted into C++ from the existing C code. - This is a straight drop using the code Andrew sent to me, it's currently unchanged and untested - All C++ conversion work to date was carried out by Andrew Hill <ash77 at reactos dot org> Added: trunk/reactos/dll/win32/shell32_new/ (with props) trunk/reactos/dll/win32/shell32_new/GlueCode.cpp (with props) trunk/reactos/dll/win32/shell32_new/GlueCode.h (with props) trunk/reactos/dll/win32/shell32_new/authors.cpp (with props) trunk/reactos/dll/win32/shell32_new/autocomplete.cpp (with props) trunk/reactos/dll/win32/shell32_new/autocomplete.h (with props) trunk/reactos/dll/win32/shell32_new/avi_res.rc (with props) trunk/reactos/dll/win32/shell32_new/basebar.cpp (with props) trunk/reactos/dll/win32/shell32_new/basebar.h (with props) trunk/reactos/dll/win32/shell32_new/bitmap_res.rc (with props) trunk/reactos/dll/win32/shell32_new/brsfolder.cpp (with props) trunk/reactos/dll/win32/shell32_new/changenotify.cpp (with props) trunk/reactos/dll/win32/shell32_new/classes.cpp (with props) trunk/reactos/dll/win32/shell32_new/clipboard.cpp (with props) trunk/reactos/dll/win32/shell32_new/control.cpp (with props) trunk/reactos/dll/win32/shell32_new/cpanel.h (with props) trunk/reactos/dll/win32/shell32_new/dataobject.cpp (with props) trunk/reactos/dll/win32/shell32_new/dde.cpp (with props) trunk/reactos/dll/win32/shell32_new/debughlp.cpp (with props) trunk/reactos/dll/win32/shell32_new/debughlp.h (with props) trunk/reactos/dll/win32/shell32_new/desktop.cpp (with props) trunk/reactos/dll/win32/shell32_new/dialogs.cpp (with props) trunk/reactos/dll/win32/shell32_new/dragdrophelper.cpp (with props) trunk/reactos/dll/win32/shell32_new/dragdrophelper.h (with props) trunk/reactos/dll/win32/shell32_new/drive.cpp (with props) trunk/reactos/dll/win32/shell32_new/enumidlist.cpp (with props) trunk/reactos/dll/win32/shell32_new/enumidlist.h (with props) trunk/reactos/dll/win32/shell32_new/extracticon.cpp (with props) trunk/reactos/dll/win32/shell32_new/folder_options.cpp (with props) trunk/reactos/dll/win32/shell32_new/folders.cpp (with props) trunk/reactos/dll/win32/shell32_new/fprop.cpp (with props) trunk/reactos/dll/win32/shell32_new/icon_res.rc (with props) trunk/reactos/dll/win32/shell32_new/iconcache.cpp (with props) trunk/reactos/dll/win32/shell32_new/lang/ (with props) trunk/reactos/dll/win32/shell32_new/lang/bg-BG.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/ca-ES.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/da-DK.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/el-GR.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/en-GB.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/en-US.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/es-ES.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/fi-FI.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/fr-FR.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/hu-HU.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/it-IT.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/ko-KR.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/nl-NL.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/no-NO.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/pl-PL.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/pt-BR.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/pt-PT.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/sl-SI.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/sv-SE.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/zh-CN.rc (with props) trunk/reactos/dll/win32/shell32_new/lang/zh-TW.rc (with props) trunk/reactos/dll/win32/shell32_new/menuband.cpp (with props) trunk/reactos/dll/win32/shell32_new/menuband.h (with props) trunk/reactos/dll/win32/shell32_new/menubandsite.cpp (with props) trunk/reactos/dll/win32/shell32_new/menubandsite.h (with props) trunk/reactos/dll/win32/shell32_new/menudeskbar.cpp (with props) trunk/reactos/dll/win32/shell32_new/menudeskbar.h (with props) trunk/reactos/dll/win32/shell32_new/pidl.cpp (with props) trunk/reactos/dll/win32/shell32_new/pidl.h (with props) trunk/reactos/dll/win32/shell32_new/precomp.h (with props) trunk/reactos/dll/win32/shell32_new/regsvr.cpp (with props) trunk/reactos/dll/win32/shell32_new/res/ (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/ (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/adminfoldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/autocomplete.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/controlpanel.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/dragdrophelper.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/folderoptions.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/foldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/fontsfoldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/menubandsite.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/mycomputer.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/mydocuments.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/networkplaces.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/newmenu.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/printers.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/recyclebin.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shelldesktop.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shellfsfolder.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shelllink.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/startmenu.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/avis/ (with props) trunk/reactos/dll/win32/shell32_new/res/avis/160+161+167+168.avi (with props) trunk/reactos/dll/win32/shell32_new/res/avis/162.avi (with props) trunk/reactos/dll/win32/shell32_new/res/avis/163.avi (with props) trunk/reactos/dll/win32/shell32_new/res/avis/164+169.avi (with props) trunk/reactos/dll/win32/shell32_new/res/avis/170.avi (with props) trunk/reactos/dll/win32/shell32_new/res/avis/Licence/ (with props) trunk/reactos/dll/win32/shell32_new/res/avis/Licence/COPYING (with props) trunk/reactos/dll/win32/shell32_new/res/avis/Licence/Tango.txt (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/ (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/204.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/205.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/206.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/207.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/225.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/226.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/227.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/228.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/bitmaps/shell_about_logo_24bpp.bmp (with props) trunk/reactos/dll/win32/shell32_new/res/icons/ (with props) trunk/reactos/dll/win32/shell32_new/res/icons/1.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/10.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/1001.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/1004.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/11.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/12.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/13.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/134.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/135.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/137.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/138.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/14.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/15.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/151.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/152.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/153.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/154.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/155.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/156.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/157.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/160.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/161.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16710.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16715.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16717.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16718.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/16721.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/17.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/1700.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/172.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/173.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/18.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/182.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/183.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/184.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/185.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/186.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/187.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/19.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/191.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/192.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/2.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/20.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/21.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/210.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/22.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/220.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/221.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/222.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/224.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/225.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/226.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/228.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/23.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/233.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/235.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/236.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/237.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/238.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/24.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/240.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/245.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/246.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/248.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/249.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/25.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/250.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/252.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/254.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/255.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/263.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/265.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/268.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/269.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/270.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/271.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/277.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/279.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/28.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/289.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/29.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/290.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/291.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/292.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/293.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/294.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/295.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/296.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/297.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/298.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/299.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/3.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/30.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/302.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/304.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/305.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/309.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/315.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/317.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/318.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/319.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/32.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/322.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/323.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/324.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/325.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/326.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/327.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/328.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/329.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/33.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/330.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/35.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/36.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/37.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/38.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/39.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/4.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/40.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/41.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/44.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/45.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/46.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/47.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/48.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/5.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/54.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/6.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/7.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/8.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/8240.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/9.ico (with props) trunk/reactos/dll/win32/shell32_new/res/icons/Icon_Licence/ (with props) trunk/reactos/dll/win32/shell32_new/res/icons/Icon_Licence/COPYING (with props) trunk/reactos/dll/win32/shell32_new/res/icons/Icon_Licence/Tango.txt (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/ (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/adminfoldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/autocomplete.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/controlpanel.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/dragdrophelper.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/folderoptions.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/foldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/fontsfoldershortcut.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/menubandsite.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/mycomputer.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/mydocuments.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/networkplaces.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/newmenu.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/printers.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/recyclebin.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/shelldesktop.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/shellfsfolder.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/shelllink.rgs (with props) trunk/reactos/dll/win32/shell32_new/res/rgs/startmenu.rgs (with props) trunk/reactos/dll/win32/shell32_new/rgs_res.rc (with props) trunk/reactos/dll/win32/shell32_new/ros-systray.cpp (with props) trunk/reactos/dll/win32/shell32_new/she_ocmenu.cpp (with props) trunk/reactos/dll/win32/shell32_new/she_ocmenu.h (with props) trunk/reactos/dll/win32/shell32_new/shell.cpp (with props) trunk/reactos/dll/win32/shell32_new/shell32.rbuild (with props) trunk/reactos/dll/win32/shell32_new/shell32.rbuild.bak (with props) trunk/reactos/dll/win32/shell32_new/shell32.rc (with props) trunk/reactos/dll/win32/shell32_new/shell32.spec (with props) trunk/reactos/dll/win32/shell32_new/shell32_main.cpp (with props) trunk/reactos/dll/win32/shell32_new/shell32_main.h (with props) trunk/reactos/dll/win32/shell32_new/shellfolder.h (with props) trunk/reactos/dll/win32/shell32_new/shellitem.cpp (with props) trunk/reactos/dll/win32/shell32_new/shellitem.h (with props) trunk/reactos/dll/win32/shell32_new/shelllink.cpp (with props) trunk/reactos/dll/win32/shell32_new/shelllink.h (with props) trunk/reactos/dll/win32/shell32_new/shellole.cpp (with props) trunk/reactos/dll/win32/shell32_new/shellord.cpp (with props) trunk/reactos/dll/win32/shell32_new/shellpath.cpp (with props) trunk/reactos/dll/win32/shell32_new/shellreg.cpp (with props) trunk/reactos/dll/win32/shell32_new/shellstring.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_admintools.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_admintools.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_cpanel.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_cpanel.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_desktop.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_desktop.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_fonts.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_fonts.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_fs.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_fs.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_mycomp.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_mycomp.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_mydocuments.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_mydocuments.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_netplaces.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_netplaces.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_printers.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_printers.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_recyclebin.cpp (with props) trunk/reactos/dll/win32/shell32_new/shfldr_recyclebin.h (with props) trunk/reactos/dll/win32/shell32_new/shfldr_unixfs.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlexec.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlfileop.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlfolder.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlfsbind.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlmenu.cpp (with props) trunk/reactos/dll/win32/shell32_new/shlview.cpp (with props) trunk/reactos/dll/win32/shell32_new/shobjidl_local.idl (with props) trunk/reactos/dll/win32/shell32_new/shpolicy.cpp (with props) trunk/reactos/dll/win32/shell32_new/shresdef.h (with props) trunk/reactos/dll/win32/shell32_new/shv_def_cmenu.cpp (with props) trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp (with props) trunk/reactos/dll/win32/shell32_new/shv_item_new.h (with props) trunk/reactos/dll/win32/shell32_new/startmenu.cpp (with props) trunk/reactos/dll/win32/shell32_new/startmenu.h (with props) trunk/reactos/dll/win32/shell32_new/stubs.cpp (with props) trunk/reactos/dll/win32/shell32_new/systray.cpp (with props) trunk/reactos/dll/win32/shell32_new/toolband.cpp (with props) trunk/reactos/dll/win32/shell32_new/toolband.h (with props) trunk/reactos/dll/win32/shell32_new/undocshell.h (with props) trunk/reactos/dll/win32/shell32_new/version.h (with props) trunk/reactos/dll/win32/shell32_new/version.rc (with props) trunk/reactos/dll/win32/shell32_new/xdg.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/shell32_new/GlueCode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/Glue… Added: trunk/reactos/dll/win32/shell32_new/GlueCode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/Glue… Added: trunk/reactos/dll/win32/shell32_new/authors.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/auth… Added: trunk/reactos/dll/win32/shell32_new/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/auto… Added: trunk/reactos/dll/win32/shell32_new/autocomplete.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/auto… Added: trunk/reactos/dll/win32/shell32_new/avi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/avi_… Added: trunk/reactos/dll/win32/shell32_new/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/base… Added: trunk/reactos/dll/win32/shell32_new/basebar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/base… Added: trunk/reactos/dll/win32/shell32_new/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/bitm… Added: trunk/reactos/dll/win32/shell32_new/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/brsf… Added: trunk/reactos/dll/win32/shell32_new/changenotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/chan… Added: trunk/reactos/dll/win32/shell32_new/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/clas… Added: trunk/reactos/dll/win32/shell32_new/clipboard.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/clip… Added: trunk/reactos/dll/win32/shell32_new/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/cont… Added: trunk/reactos/dll/win32/shell32_new/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/cpan… Added: trunk/reactos/dll/win32/shell32_new/dataobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/data… Added: trunk/reactos/dll/win32/shell32_new/dde.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/dde.… Added: trunk/reactos/dll/win32/shell32_new/debughlp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/debu… Added: trunk/reactos/dll/win32/shell32_new/debughlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/debu… Added: trunk/reactos/dll/win32/shell32_new/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/desk… Added: trunk/reactos/dll/win32/shell32_new/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/dial… Added: trunk/reactos/dll/win32/shell32_new/dragdrophelper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/drag… Added: trunk/reactos/dll/win32/shell32_new/dragdrophelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/drag… Added: trunk/reactos/dll/win32/shell32_new/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/driv… Added: trunk/reactos/dll/win32/shell32_new/enumidlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/enum… Added: trunk/reactos/dll/win32/shell32_new/enumidlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/enum… Added: trunk/reactos/dll/win32/shell32_new/extracticon.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/extr… Added: trunk/reactos/dll/win32/shell32_new/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/fold… Added: trunk/reactos/dll/win32/shell32_new/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/fold… Added: trunk/reactos/dll/win32/shell32_new/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/fpro… Added: trunk/reactos/dll/win32/shell32_new/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/icon… Added: trunk/reactos/dll/win32/shell32_new/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/icon… Added: trunk/reactos/dll/win32/shell32_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Added: trunk/reactos/dll/win32/shell32_new/menuband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/menuband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/menubandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/menubandsite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/menudeskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/menudeskbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/menu… Added: trunk/reactos/dll/win32/shell32_new/pidl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/pidl… Added: trunk/reactos/dll/win32/shell32_new/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/pidl… Added: trunk/reactos/dll/win32/shell32_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/prec… Added: trunk/reactos/dll/win32/shell32_new/regsvr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/regs… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/adminfoldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/autocomplete.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/controlpanel.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/dragdrophelper.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/folderoptions.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/foldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/fontsfoldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/menubandsite.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/mycomputer.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/mydocuments.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/networkplaces.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/newmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/printers.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shelldesktop.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shellfsfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/shelllink.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/Copy of rgs/startmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/160+161+167+168.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/162.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/163.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/164+169.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/170.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/Licence/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/avis/Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/204.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/205.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/206.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/207.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/225.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/226.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/227.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/228.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/bitmaps/shell_about_logo_24bpp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/10.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/1001.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/1004.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/12.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/134.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/135.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/137.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/138.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/14.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/15.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/151.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/152.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/153.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/154.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/155.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/156.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/157.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/160.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/161.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16710.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16715.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16717.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16718.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/16721.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/17.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/1700.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/172.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/173.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/18.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/182.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/183.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/184.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/185.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/186.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/187.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/19.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/191.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/192.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/21.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/210.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/22.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/220.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/221.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/222.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/224.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/225.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/226.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/228.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/23.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/233.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/235.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/236.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/237.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/238.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/24.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/240.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/245.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/246.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/248.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/249.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/25.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/250.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/252.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/254.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/255.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/263.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/265.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/268.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/269.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/270.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/271.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/277.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/279.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/28.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/289.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/29.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/290.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/291.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/292.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/293.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/294.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/295.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/296.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/297.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/298.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/299.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/30.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/302.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/304.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/305.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/309.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/315.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/317.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/318.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/319.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/322.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/323.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/324.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/325.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/326.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/327.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/328.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/329.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/33.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/330.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/35.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/36.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/38.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/39.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/40.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/41.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/44.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/45.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/46.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/47.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/48.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/54.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/8240.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/9.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/Icon_Licence/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/icons/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/adminfoldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/autocomplete.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/controlpanel.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/dragdrophelper.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/folderoptions.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/foldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/fontsfoldershortcut.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/menubandsite.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/mycomputer.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/mydocuments.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/networkplaces.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/newmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/printers.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/shelldesktop.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/shellfsfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/shelllink.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/res/rgs/startmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/res/… Added: trunk/reactos/dll/win32/shell32_new/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/rgs_… Added: trunk/reactos/dll/win32/shell32_new/ros-systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/ros-… Added: trunk/reactos/dll/win32/shell32_new/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/she_… Added: trunk/reactos/dll/win32/shell32_new/she_ocmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/she_… Added: trunk/reactos/dll/win32/shell32_new/shell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32.rbuild.bak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellitem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shelllink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shellstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Added: trunk/reactos/dll/win32/shell32_new/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shfldr_unixfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shfl… Added: trunk/reactos/dll/win32/shell32_new/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shle… Added: trunk/reactos/dll/win32/shell32_new/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlf… Added: trunk/reactos/dll/win32/shell32_new/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlf… Added: trunk/reactos/dll/win32/shell32_new/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlf… Added: trunk/reactos/dll/win32/shell32_new/shlmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlm… Added: trunk/reactos/dll/win32/shell32_new/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlv… Added: trunk/reactos/dll/win32/shell32_new/shobjidl_local.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shob… Added: trunk/reactos/dll/win32/shell32_new/shpolicy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shpo… Added: trunk/reactos/dll/win32/shell32_new/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shre… Added: trunk/reactos/dll/win32/shell32_new/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shv_… Added: trunk/reactos/dll/win32/shell32_new/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shv_… Added: trunk/reactos/dll/win32/shell32_new/shv_item_new.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shv_… Added: trunk/reactos/dll/win32/shell32_new/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/star… Added: trunk/reactos/dll/win32/shell32_new/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/star… Added: trunk/reactos/dll/win32/shell32_new/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/stub… Added: trunk/reactos/dll/win32/shell32_new/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/syst… Added: trunk/reactos/dll/win32/shell32_new/toolband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/tool… Added: trunk/reactos/dll/win32/shell32_new/toolband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/tool… Added: trunk/reactos/dll/win32/shell32_new/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/undo… Added: trunk/reactos/dll/win32/shell32_new/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/vers… Added: trunk/reactos/dll/win32/shell32_new/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/vers… Added: trunk/reactos/dll/win32/shell32_new/xdg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/xdg.…

1 0

[osiejka] 51767: [GLU32] - Properly fix compiler warning, by initializing the integer array with zeros. Remove GNUC #ifdef, introduced in rev 42970. Patch by Markus (thechief at praise dash land do...
by osiejka＠svn.reactos.org 15 May '11

15 May '11

Author: osiejka Date: Sun May 15 15:51:26 2011 New Revision: 51767 URL: http://svn.reactos.org/svn/reactos?rev=51767&view=rev Log: [GLU32] - Properly fix compiler warning, by initializing the integer array with zeros. Remove GNUC #ifdef, introduced in rev 42970. Patch by Markus (thechief at praise dash land dot de) See issue #6179 for more details. Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1] Sun May 15 15:51:26 2011 @@ -178,13 +178,7 @@ Arc_ptr jarc1; TrimVertex* v = jarc->pwlArc->pts; - int loc[3]; - -#if defined(__GNUC__) && \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) - /* Silence incorrect GCC 4.4.0 warnings */ - loc[0] = loc[1] = loc[2] = 0; -#endif + int loc[3] = {0,0,0}; switch( pwlarc_intersect( jarc->pwlArc, param, value, dir, loc ) ) {

1 0

[gedmurphy] 51766: Add the Windows version of SHIShellFolder_EnumObjects, but compile it out as per Wine's notes Move the scope in the reg script
by gedmurphy＠svn.reactos.org 15 May '11

15 May '11

Author: gedmurphy Date: Sun May 15 15:42:03 2011 New Revision: 51766 URL: http://svn.reactos.org/svn/reactos?rev=51766&view=rev Log: Add the Windows version of SHIShellFolder_EnumObjects, but compile it out as per Wine's notes Move the scope in the reg script Modified: trunk/reactos/dll/win32/browseui/res/addressband.rgs trunk/reactos/dll/win32/shlwapi/ordinal.c Modified: trunk/reactos/dll/win32/browseui/res/addressband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/add… ============================================================================== --- trunk/reactos/dll/win32/browseui/res/addressband.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/res/addressband.rgs [iso-8859-1] Sun May 15 15:42:03 2011 @@ -2,9 +2,9 @@ { NoRemove CLSID { - val MenuTextPUI = s '@browseui.dll,-13137' ForceRemove {01E04581-4EEE-11d0-BFE9-00AA005B4383} = s '&Address' { + val MenuTextPUI = s '@browseui.dll,-13137' InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sun May 15 15:42:03 2011 @@ -144,7 +144,7 @@ * the view pointer returned by this size. * */ -HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) +HANDLE WINAPI SHAllocShared(LPVOID lpvData, ULONG dwSize, DWORD dwProcId) { HANDLE hMap; LPVOID pMapped; @@ -3735,6 +3735,7 @@ /************************************************************************* * @ [SHLWAPI.404] */ +#if 1 HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum) { /* Windows attempts to get an IPersist interface and, if that fails, an @@ -3751,6 +3752,29 @@ return IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); } +#else +HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum) +{ + IPersist *persist; + HRESULT hr; + + hr = IShellFolder_QueryInterface(lpFolder, &IID_IPersist, (LPVOID)&persist); + if(SUCCEEDED(hr)) + { + CLSID clsid; + hr = IPersist_GetClassID(persist, &clsid); + if(SUCCEEDED(hr)) + { + if(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder)) + hr = IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); + else + hr = E_FAIL; + } + IPersist_Release(persist); + } + return hr; +} +#endif /* INTERNAL: Map from HLS color space to RGB */ static WORD ConvertHue(int wHue, WORD wMid1, WORD wMid2)

1 0

[akhaldi] 51765: [CMAKE] * Define HAVE_SPAWNVP for the host config.
by akhaldi＠svn.reactos.org 15 May '11

15 May '11

Author: akhaldi Date: Sun May 15 15:00:55 2011 New Revision: 51765 URL: http://svn.reactos.org/svn/reactos?rev=51765&view=rev Log: [CMAKE] * Define HAVE_SPAWNVP for the host config. Modified: branches/cmake-bringup/include/host/config.h Modified: branches/cmake-bringup/include/host/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/conf… ============================================================================== --- branches/cmake-bringup/include/host/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/host/config.h [iso-8859-1] Sun May 15 15:00:55 2011 @@ -4,6 +4,8 @@ #include "reactos/buildno.h" #define __WINE_CONFIG_H + +#define HAVE_SPAWNVP 1 /* Define to 1 if you have the <float.h> header file. */ #define HAVE_FLOAT_H 1

1 0

[janderwald] 51764: [USBSTOR] - Add asserts - Rewrite queue methods to accept the FDO only - Fix multiple synchronization bugs - Don't start next irp before current irp has completed - Use contious...
by janderwald＠svn.reactos.org 15 May '11

15 May '11

Author: janderwald Date: Sun May 15 14:59:16 2011 New Revision: 51764 URL: http://svn.reactos.org/svn/reactos?rev=51764&view=rev Log: [USBSTOR] - Add asserts - Rewrite queue methods to accept the FDO only - Fix multiple synchronization bugs - Don't start next irp before current irp has completed - Use contiouslogicalbytes blocks from srb - Should fix race conditions Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/queue.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 15 14:59:16 2011 @@ -32,6 +32,11 @@ Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // + // sanity check + // + ASSERT(Request); + + // // get device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -39,8 +44,7 @@ // // sanity check // - ASSERT(Request); - ASSERT(PDODeviceExtension); + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); switch(Request->Function) { @@ -87,7 +91,7 @@ // // add the request // - if (!USBSTOR_QueueAddIrp(DeviceObject, Irp)) + if (!USBSTOR_QueueAddIrp(PDODeviceExtension->LowerDeviceObject, Irp)) { // // irp was not added to the queue @@ -154,8 +158,7 @@ // // release queue // - USBSTOR_QueueRelease(DeviceObject); - + USBSTOR_QueueRelease(PDODeviceExtension->LowerDeviceObject); // // set status success @@ -173,7 +176,7 @@ // // flush all requests // - USBSTOR_QueueFlushIrps(DeviceObject); + USBSTOR_QueueFlushIrps(PDODeviceExtension->LowerDeviceObject); // // set status success Modified: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Sun May 15 14:59:16 2011 @@ -15,6 +15,10 @@ USBSTOR_QueueInitialize( PFDO_DEVICE_EXTENSION FDODeviceExtension) { + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // initialize queue lock @@ -85,21 +89,19 @@ { PDRIVER_CANCEL OldDriverCancel; KIRQL OldLevel; - PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; BOOLEAN IrpListFreeze; BOOLEAN SrbProcessing; // - // get pdo device extension - // - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); - - // // get FDO device extension // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // mark irp pending @@ -183,25 +185,19 @@ IN PDEVICE_OBJECT DeviceObject) { KIRQL OldLevel; - PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; PLIST_ENTRY Entry; PIRP Irp = NULL; // - // get pdo device extension - // - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); - - // // get FDO device extension // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // acquire lock @@ -240,7 +236,6 @@ IN PDEVICE_OBJECT DeviceObject) { KIRQL OldLevel; - PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; PLIST_ENTRY Entry; PIRP Irp; @@ -248,19 +243,14 @@ PSCSI_REQUEST_BLOCK Request; // - // get pdo device extension - // - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); - - // // get FDO device extension // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // acquire lock @@ -320,10 +310,58 @@ } VOID +USBSTOR_QueueTerminateRequest( + IN PDEVICE_OBJECT FDODeviceObject, + IN BOOLEAN ModifySrbState) +{ + KIRQL OldLevel; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)FDODeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // decrement pending irp count + // + FDODeviceExtension->IrpPendingCount--; + + if (ModifySrbState) + { + // + // sanity check + // + ASSERT(FDODeviceExtension->SrbActive == TRUE); + + // + // indicate processing is completed + // + FDODeviceExtension->SrbActive = FALSE; + } + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + +} + +VOID USBSTOR_QueueNextRequest( IN PDEVICE_OBJECT DeviceObject) { - PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; PIRP Irp; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; @@ -331,12 +369,12 @@ // // get pdo device extension // - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // remove first irp from list @@ -351,6 +389,7 @@ // // no work to do // + IoStartNextPacket(DeviceObject, TRUE); return; } @@ -365,16 +404,25 @@ Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // + // sanity check + // + ASSERT(Request); + + // // start next packet // - IoStartPacket(PDODeviceExtension->LowerDeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); + IoStartPacket(DeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); + + // + // start next request + // + IoStartNextPacket(DeviceObject, TRUE); } VOID USBSTOR_QueueRelease( IN PDEVICE_OBJECT DeviceObject) { - PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; PIRP Irp; KIRQL OldLevel; @@ -382,19 +430,14 @@ PSCSI_REQUEST_BLOCK Request; // - // get pdo device extension - // - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); - - // // get FDO device extension // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); // // acquire lock @@ -440,7 +483,7 @@ // // start new packet // - IoStartPacket(PDODeviceExtension->LowerDeviceObject, // FDO + IoStartPacket(DeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); @@ -511,12 +554,8 @@ // // queue next request // + USBSTOR_QueueTerminateRequest(DeviceObject, FALSE); USBSTOR_QueueNextRequest(DeviceObject); - - // - // start next request - // - IoStartNextPacket(DeviceObject, TRUE); } // @@ -540,6 +579,12 @@ // ResetInProgress = FDODeviceExtension->ResetInProgress; ASSERT(ResetInProgress == FALSE); + + // + // sanity check + // + ASSERT(FDODeviceExtension->SrbActive == FALSE); + FDODeviceExtension->SrbActive = TRUE; // // release lock @@ -572,37 +617,16 @@ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - // - // execute scsi - // - Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); - - // - // acquire lock - // - KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); - - // - // FIXME: synchronize with error handler - // - FDODeviceExtension->IrpPendingCount--; - - // - // release lock - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); - } - - // - // FIXME: synchronize action with error handling - // - USBSTOR_QueueNextRequest(IoStack->DeviceObject); - - // - // start next request - // - IoStartNextPacket(DeviceObject, TRUE); -} + USBSTOR_QueueTerminateRequest(DeviceObject, TRUE); + return; + } + + // + // execute scsi + // + Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + + // + // FIXME: handle error + // +} Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 15 14:59:16 2011 @@ -233,6 +233,16 @@ // complete request // IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // terminate current request + // + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, TRUE); + + // + // start next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); } if (Context->Event) @@ -432,7 +442,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalRequest, IN OPTIONAL PKEVENT Event, - IN ULONG CommandLength, + IN UCHAR CommandLength, IN PUCHAR Command, IN ULONG TransferDataLength, IN PUCHAR TransferData) @@ -740,11 +750,11 @@ UFI_SENSE_CMD Cmd; NTSTATUS Status; PVOID Response; - PPDO_DEVICE_EXTENSION PDODeviceExtension; PCBW OutControl; PCDB pCDB; PUFI_MODE_PARAMETER_HEADER Header; #endif + PPDO_DEVICE_EXTENSION PDODeviceExtension; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; @@ -763,6 +773,26 @@ Irp->IoStatus.Information = Request->DataTransferLength; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // terminate current request + // + USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, TRUE); + + // + // start next request + // + USBSTOR_QueueNextRequest(PDODeviceExtension->LowerDeviceObject); return STATUS_SUCCESS; @@ -956,7 +986,8 @@ RtlZeroMemory(&Cmd, sizeof(UFI_READ_WRITE_CMD)); Cmd.Code = pCDB->AsByte[0]; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); - Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); + Cmd.ContiguousLogicBlocksByte0 = pCDB->CDB10.TransferBlocksMsb; + Cmd.ContiguousLogicBlocksByte1 = pCDB->CDB10.TransferBlocksLsb; Cmd.LogicalBlockByte0 = pCDB->CDB10.LogicalBlockByte0; Cmd.LogicalBlockByte1 = pCDB->CDB10.LogicalBlockByte1; Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; @@ -1023,6 +1054,17 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // // get current stack location @@ -1082,6 +1124,17 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Request->DataTransferLength; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // terminate current request + // + USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, TRUE); + + // + // start next request + // + USBSTOR_QueueNextRequest(PDODeviceExtension->LowerDeviceObject); + return STATUS_SUCCESS; } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun May 15 14:59:16 2011 @@ -68,6 +68,7 @@ BOOLEAN IrpListFreeze; // if true the irp list is freezed BOOLEAN ResetInProgress; // if hard reset is in progress ULONG IrpPendingCount; // count of irp pending + BOOLEAN SrbActive; // debug field if srb is pending }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -164,7 +165,8 @@ UCHAR LogicalBlockByte2; // lba byte 2 UCHAR LogicalBlockByte3; // lba byte 3 UCHAR Reserved; // reserved 0x00 - USHORT ContiguousLogicBlocks; // num of contiguous logical blocks + UCHAR ContiguousLogicBlocksByte0; // msb contigious logic blocks byte + UCHAR ContiguousLogicBlocksByte1; // msb contigious logic blocks UCHAR Reserved1[3]; // reserved 0x00 }UFI_READ_WRITE_CMD; @@ -424,3 +426,11 @@ USBSTOR_QueueInitialize( PFDO_DEVICE_EXTENSION FDODeviceExtension); +VOID +USBSTOR_QueueNextRequest( + IN PDEVICE_OBJECT DeviceObject); + +VOID +USBSTOR_QueueTerminateRequest( + IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN ModifySrbState);

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