Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60369: [RICHED20] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:32:14 2013 New Revision: 60369 URL: http://svn.reactos.org/svn/reactos?rev=60369&view=rev Log: [RICHED20] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/table.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c… Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 60368: [RSABASE_WINETEST] * Remove rsabase tests as they are covered in rsaenh tests.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:31:25 2013 New Revision: 60368 URL: http://svn.reactos.org/svn/reactos?rev=60368&view=rev Log: [RSABASE_WINETEST] * Remove rsabase tests as they are covered in rsaenh tests. Removed: trunk/rostests/winetests/rsabase/ Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:31:25 2013 @@ -73,7 +73,6 @@ add_subdirectory(riched20) add_subdirectory(riched32) add_subdirectory(rpcrt4) -add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(schannel) add_subdirectory(scrrun)

1 0

[akhaldi] 60367: [QMGR_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:14:05 2013 New Revision: 60367 URL: http://svn.reactos.org/svn/reactos?rev=60367&view=rev Log: [QMGR_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists… ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:14:05 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE enum_files.c @@ -10,7 +8,6 @@ testlist.c) add_executable(qmgr_winetest ${SOURCE}) -target_link_libraries(qmgr_winetest wine) set_module_type(qmgr_winetest win32cui) add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 60366: [QUERY] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:12:21 2013 New Revision: 60366 URL: http://svn.reactos.org/svn/reactos?rev=60366&view=rev Log: [QUERY] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/query/CMakeLists.txt trunk/reactos/dll/win32/query/query_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:12:21 2013 @@ -1,9 +1,9 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions( -D__WINESRC__ -DCOM_NO_WINDOWS_H) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(query.dll query.spec) list(APPEND SOURCE @@ -12,13 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/query.def) add_library(query SHARED ${SOURCE}) - set_module_type(query win32dll) - -target_link_libraries(query - wine - uuid) - +target_link_libraries(query wine) add_importlibs(query msvcrt kernel32 ntdll) - add_cd_file(TARGET query DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/query/query_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query_main… ============================================================================== --- trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/query/query_main.c [iso-8859-1] Thu Sep 26 14:12:21 2013 @@ -48,8 +48,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:12:21 2013 @@ -158,7 +158,7 @@ reactos/dll/win32/pstorec # Synced to Wine-1.7.1 reactos/dll/win32/qmgr # Synced to Wine-1.7.1 reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 -reactos/dll/win32/query # Synced to Wine-1.5.19 +reactos/dll/win32/query # Synced to Wine-1.7.1 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 reactos/dll/win32/resutils # Synced to Wine-1.5.19 reactos/dll/win32/riched20 # Synced to Wine-1.5.19

1 0

[akhaldi] 60365: [OLEACC_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:11:05 2013 New Revision: 60365 URL: http://svn.reactos.org/svn/reactos?rev=60365&view=rev Log: [OLEACC_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/oleacc/CMakeLists.txt trunk/rostests/winetests/oleacc/testlist.c Modified: trunk/rostests/winetests/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/CMakeLis… ============================================================================== --- trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:11:05 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(oleacc_winetest main.c testlist.c) -target_link_libraries(oleacc_winetest wine) set_module_type(oleacc_winetest win32cui) -add_importlibs(oleacc_winetest oleacc msvcrt kernel32 ntdll) +add_importlibs(oleacc_winetest oleacc msvcrt kernel32) add_cd_file(TARGET oleacc_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/oleacc/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/testlist… ============================================================================== --- trunk/rostests/winetests/oleacc/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/testlist.c [iso-8859-1] Thu Sep 26 14:11:05 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_main(void);

1 0

[akhaldi] 60364: [QMGR] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:09:59 2013 New Revision: 60364 URL: http://svn.reactos.org/svn/reactos?rev=60364&view=rev Log: [QMGR] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt trunk/reactos/dll/win32/qmgr/qmgr_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:09:59 2013 @@ -13,11 +13,10 @@ qmgr.c qmgr_main.c service.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) -add_library(qmgr SHARED ${SOURCE}) +add_library(qmgr SHARED ${SOURCE} rsrc.rc) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf) add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) Modified: trunk/reactos/dll/win32/qmgr/qmgr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr_main.c… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] Thu Sep 26 14:09:59 2013 @@ -62,8 +62,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL; - break; - case DLL_PROCESS_DETACH: break; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:09:59 2013 @@ -156,7 +156,7 @@ reactos/dll/win32/printui # Synced to Wine-1.7.1 reactos/dll/win32/propsys # Synced to Wine-1.5.26 reactos/dll/win32/pstorec # Synced to Wine-1.7.1 -reactos/dll/win32/qmgr # Synced to Wine-1.5.26 +reactos/dll/win32/qmgr # Synced to Wine-1.7.1 reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 reactos/dll/win32/query # Synced to Wine-1.5.19 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4

1 0

[akhaldi] 60363: [PSTOREC] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:07:55 2013 New Revision: 60363 URL: http://svn.reactos.org/svn/reactos?rev=60363&view=rev Log: [PSTOREC] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:07:55 2013 @@ -1,16 +1,15 @@ -add_typelib(pstorec_tlb.idl) add_definitions(-D__WINESRC__) spec2def(pstorec.dll pstorec.spec) list(APPEND SOURCE pstorec.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/pstorec_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) +add_typelib(pstorec_tlb.idl) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb) -add_library(pstorec SHARED ${SOURCE}) +add_library(pstorec SHARED ${SOURCE} rsrc.rc) set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Thu Sep 26 14:07:55 2013 @@ -56,8 +56,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - break; - case DLL_PROCESS_DETACH: break; } return TRUE; @@ -398,5 +396,5 @@ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; -} + return S_FALSE; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:07:55 2013 @@ -155,7 +155,7 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.1 reactos/dll/win32/propsys # Synced to Wine-1.5.26 -reactos/dll/win32/pstorec # Synced to Wine-1.5.4 +reactos/dll/win32/pstorec # Synced to Wine-1.7.1 reactos/dll/win32/qmgr # Synced to Wine-1.5.26 reactos/dll/win32/qmgrprxy # Synced to Wine-1.5.26 reactos/dll/win32/query # Synced to Wine-1.5.19

1 0

[akhaldi] 60362: [PRINTUI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:06:42 2013 New Revision: 60362 URL: http://svn.reactos.org/svn/reactos?rev=60362&view=rev Log: [PRINTUI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt trunk/reactos/dll/win32/printui/printui.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -1,20 +1,15 @@ +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) - spec2def(printui.dll printui.spec) list(APPEND SOURCE printui.c - printui.rc ${CMAKE_CURRENT_BINARY_DIR}/printui_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/printui.def) -add_library(printui SHARED ${SOURCE}) +add_library(printui SHARED ${SOURCE} printui.rc) set_module_type(printui win32dll) - target_link_libraries(printui wine) - add_importlibs(printui shell32 msvcrt kernel32 ntdll) -add_dependencies(printui psdk) add_cd_file(TARGET printui DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/printui/printui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -41,8 +41,6 @@ #include "printui_private.h" WINE_DEFAULT_DEBUG_CHANNEL(printui); - -static HINSTANCE PRINTUI_hInstance = NULL; /* ################################# */ @@ -231,7 +229,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - PRINTUI_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -153,7 +153,7 @@ reactos/dll/win32/pdh # Synced to Wine-1.7.1 reactos/dll/win32/pidgen # Synced to Wine-1.5.19 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.5.4 +reactos/dll/win32/printui # Synced to Wine-1.7.1 reactos/dll/win32/propsys # Synced to Wine-1.5.26 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/qmgr # Synced to Wine-1.5.26

1 0

[akhaldi] 60361: [PDH_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:05:13 2013 New Revision: 60361 URL: http://svn.reactos.org/svn/reactos?rev=60361&view=rev Log: [PDH_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/pdh/CMakeLists.txt trunk/rostests/winetests/pdh/pdh.c trunk/rostests/winetests/pdh/testlist.c Modified: trunk/rostests/winetests/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:05:13 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(pdh_winetest pdh.c testlist.c) -target_link_libraries(pdh_winetest wine) set_module_type(pdh_winetest win32cui) add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll) add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/pdh/pdh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/pdh.c?rev=6… ============================================================================== --- trunk/rostests/winetests/pdh/pdh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/pdh.c [iso-8859-1] Thu Sep 26 14:05:13 2013 @@ -37,6 +37,30 @@ #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void init_function_ptrs( void ) { pdh = GetModuleHandle( "pdh" ); @@ -54,7 +78,7 @@ static const WCHAR system_uptime[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; -static const WCHAR system_downtime[] = /* does not exist */ +static const WCHAR nonexistent_counter[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; static const WCHAR percentage_processor_time[] = {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', @@ -129,8 +153,10 @@ ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); - ret = PdhAddCounterA( query, "\\System\\System Down Time", 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); + ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter ); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterA failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterA failed %p\n", counter); ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); @@ -176,8 +202,10 @@ ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); - ret = PdhAddCounterW( query, system_downtime, 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); + ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter ); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterW failed %p\n", counter); ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter ); @@ -267,7 +295,7 @@ ret = pPdhAddEnglishCounterW( query, system_uptime, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); - ret = pPdhAddEnglishCounterW( query, system_downtime, 0, &counter ); + ret = pPdhAddEnglishCounterW( query, nonexistent_counter, 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddEnglishCounterA failed %p\n", counter); @@ -705,7 +733,7 @@ ret = PdhValidatePathA( "System Up Time" ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n", ret); - ret = PdhValidatePathA( "\\System\\System Down Time" ); + ret = PdhValidatePathA( "\\System\\Nonexistent Counter" ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathA failed 0x%08x\n", ret); ret = PdhValidatePathA( "\\System\\System Up Time" ); @@ -731,7 +759,7 @@ ret = PdhValidatePathW( uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); - ret = PdhValidatePathW( system_downtime ); + ret = PdhValidatePathW( nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathW failed 0x%08x\n", ret); ret = PdhValidatePathW( system_uptime ); @@ -780,7 +808,7 @@ ret = pPdhValidatePathExW( NULL, uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); - ret = pPdhValidatePathExW( NULL, system_downtime ); + ret = pPdhValidatePathExW( NULL, nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExW failed 0x%08x\n", ret); ret = pPdhValidatePathExW( NULL, system_uptime ); @@ -958,9 +986,9 @@ START_TEST(pdh) { - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (!is_lang_english()) { - skip("non-english locale\n"); + skip("An English UI is needed for the pdh tests\n"); return; } init_function_ptrs(); Modified: trunk/rostests/winetests/pdh/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/testlist.c?… ============================================================================== --- trunk/rostests/winetests/pdh/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/testlist.c [iso-8859-1] Thu Sep 26 14:05:13 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_pdh(void);

1 0

[akhaldi] 60360: [PDH] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 14:04:52 2013 New Revision: 60360 URL: http://svn.reactos.org/svn/reactos?rev=60360&view=rev Log: [PDH] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:04:52 2013 @@ -1,11 +1,9 @@ - -add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(pdh.dll pdh.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -15,10 +13,6 @@ add_library(pdh SHARED ${SOURCE}) set_module_type(pdh win32dll) - target_link_libraries(pdh wine) - add_importlibs(pdh msvcrt kernel32 ntdll) - - add_cd_file(TARGET pdh DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Thu Sep 26 14:04:52 2013 @@ -87,12 +87,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - { - DisableThreadLibraryCalls( hinstDLL ); + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + if (lpvReserved) break; + DeleteCriticalSection(&pdh_handle_cs); + break; } return TRUE; @@ -218,14 +223,27 @@ { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; +static BOOL is_local_machine( const WCHAR *name, DWORD len ) +{ + WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD buflen = sizeof(buf) / sizeof(buf[0]); + + if (!GetComputerNameW( buf, &buflen )) return FALSE; + return len == buflen && !memicmpW( name, buf, buflen ); +} + static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) { const WCHAR *p; - if (strchrW( path, '\\')) p = fullpath; + if (path[0] == '\\' && path[1] == '\\' && (p = strchrW( path + 2, '\\' )) && + is_local_machine( path + 2, p - path - 2 )) + { + path += p - path; + } + if (strchrW( path, '\\' )) p = fullpath; else p = strrchrW( fullpath, '\\' ) + 1; - if (strcmpW( p, path )) return FALSE; - return TRUE; + return !strcmpW( p, path ); } /*********************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:04:52 2013 @@ -150,7 +150,7 @@ reactos/dll/win32/olepro32 # Synced to Wine-1.7.1 reactos/dll/win32/olesvr32 # Synced to Wine-1.5.19 reactos/dll/win32/olethk32 # Synced to Wine-1.5.19 -reactos/dll/win32/pdh # Autosync +reactos/dll/win32/pdh # Synced to Wine-1.7.1 reactos/dll/win32/pidgen # Synced to Wine-1.5.19 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.5.4

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