Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60386: [SPOOLSS_WINETEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:57:52 2013 New Revision: 60386 URL: http://svn.reactos.org/svn/reactos?rev=60386&view=rev Log: [SPOOLSS_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/spoolss/CMakeLists.txt trunk/rostests/winetests/spoolss/testlist.c Modified: trunk/rostests/winetests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/CMakeLi… ============================================================================== --- trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:57:52 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(spoolss_winetest spoolss.c testlist.c) -target_link_libraries(spoolss_winetest wine) set_module_type(spoolss_winetest win32cui) -add_importlibs(spoolss_winetest msvcrt kernel32 ntdll) +add_importlibs(spoolss_winetest msvcrt kernel32) add_cd_file(TARGET spoolss_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/testlis… ============================================================================== --- trunk/rostests/winetests/spoolss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/testlist.c [iso-8859-1] Thu Sep 26 16:57:52 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_spoolss(void);

10 years, 11 months

[akhaldi] 60385: [SPOOLSS] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:57:33 2013 New Revision: 60385 URL: http://svn.reactos.org/svn/reactos?rev=60385&view=rev Log: [SPOOLSS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/spoolss/spoolss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -1,7 +1,6 @@ +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) - spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,9 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) add_library(spoolss SHARED ${SOURCE}) -allow_warnings(spoolss) set_module_type(spoolss win32dll) target_link_libraries(spoolss wine) -add_importlibs(spoolss winspool msvcrt kernel32 ntdll) - +add_importlibs(spoolss msvcrt kernel32 ntdll) add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -57,6 +57,7 @@ break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; backend_unload_all(); 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 16:57:33 2013 @@ -181,7 +181,7 @@ reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.5.19 -reactos/dll/win32/spoolss # Synced to Wine-1.5.19 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.5.4

10 years, 11 months

[akhaldi] 60384: [SNMPAPI_WINETEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:56:01 2013 New Revision: 60384 URL: http://svn.reactos.org/svn/reactos?rev=60384&view=rev Log: [SNMPAPI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/snmpapi/CMakeLists.txt trunk/rostests/winetests/snmpapi/testlist.c Modified: trunk/rostests/winetests/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:56:01 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(snmpapi_winetest util.c testlist.c) -target_link_libraries(snmpapi_winetest wine) set_module_type(snmpapi_winetest win32cui) -add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32 ntdll) +add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32) add_cd_file(TARGET snmpapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/snmpapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/testlis… ============================================================================== --- trunk/rostests/winetests/snmpapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/testlist.c [iso-8859-1] Thu Sep 26 16:56:01 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_util(void);

10 years, 11 months

[akhaldi] 60383: [SNMPAPI] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:55:40 2013 New Revision: 60383 URL: http://svn.reactos.org/svn/reactos?rev=60383&view=rev Log: [SNMPAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:55:40 2013 @@ -8,11 +8,10 @@ list(APPEND SOURCE main.c - snmpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/snmpapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) -add_library(snmpapi SHARED ${SOURCE}) +add_library(snmpapi SHARED ${SOURCE} snmpapi.rc) set_module_type(snmpapi win32dll) target_link_libraries(snmpapi wine) add_importlibs(snmpapi msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/snmpapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/main.c [iso-8859-1] Thu Sep 26 16:55:40 2013 @@ -133,8 +133,6 @@ DisableThreadLibraryCalls(hInstDLL); startTime = GetTickCount64(); 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 16:55:40 2013 @@ -179,7 +179,7 @@ reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.5.19 reactos/dll/win32/spoolss # Synced to Wine-1.5.19 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19

10 years, 11 months

[akhaldi] 60382: [SLBCSP] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:53:57 2013 New Revision: 60382 URL: http://svn.reactos.org/svn/reactos?rev=60382&view=rev Log: [SLBCSP] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/slbcsp/CMakeLists.txt trunk/reactos/dll/win32/slbcsp/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:53:57 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(slbcsp.dll slbcsp.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) add_library(slbcsp SHARED ${SOURCE}) - set_module_type(slbcsp win32dll) - target_link_libraries(slbcsp wine) - add_importlibs(slbcsp msvcrt kernel32 ntdll) - add_cd_file(TARGET slbcsp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/slbcsp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] Thu Sep 26 16:53:57 2013 @@ -39,10 +39,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - 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 16:53:57 2013 @@ -178,7 +178,7 @@ reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 -reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 reactos/dll/win32/softpub # Synced to Wine-1.5.19 reactos/dll/win32/spoolss # Synced to Wine-1.5.19

10 years, 11 months

[akhaldi] 60381: [SHLWAPI_WINETEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:52:35 2013 New Revision: 60381 URL: http://svn.reactos.org/svn/reactos?rev=60381&view=rev Log: [SHLWAPI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt trunk/rostests/winetests/shlwapi/generated.c Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:52:35 2013 @@ -1,7 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) - -remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE assoc.c @@ -18,7 +14,7 @@ testlist.c) add_executable(shlwapi_winetest ${SOURCE}) -target_link_libraries(shlwapi_winetest wine uuid) +target_link_libraries(shlwapi_winetest uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/shlwapi/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/generat… ============================================================================== --- trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] Thu Sep 26 16:52:35 2013 @@ -9,9 +9,11 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#ifndef __REACTOS__ #define WINVER 0x0501 #define _WIN32_IE 0x0501 #define _WIN32_WINNT 0x0501 +#endif #define WINE_NOWINSOCK

10 years, 11 months

[akhaldi] 60380: [SHLWAPI] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:51:42 2013 New Revision: 60380 URL: http://svn.reactos.org/svn/reactos?rev=60380&view=rev Log: [SHLWAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/shlwapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:51:42 2013 @@ -1,12 +1,9 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions( -D__WINESRC__ -D_SHLWAPI_) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -24,14 +21,12 @@ thread.c url.c wsprintf.c - shlwapi.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) -add_library(shlwapi SHARED ${SOURCE}) +add_library(shlwapi SHARED ${SOURCE} shlwapi.rc) set_module_type(shlwapi win32dll) -target_link_libraries(shlwapi wine uuid) -add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version) -add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll) +target_link_libraries(shlwapi uuid wine) +add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32 winmm version) +add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll) add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Thu Sep 26 16:51:42 2013 @@ -548,13 +548,13 @@ @ stdcall AssocCreate(double double ptr ptr) @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr) -@ stdcall AssocIsDangerous(long) -@ stdcall AssocQueryKeyA(long long str ptr ptr) -@ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr) +@ stdcall AssocIsDangerous(wstr) +@ stdcall AssocQueryKeyA(long long str str ptr) +@ stdcall AssocQueryKeyW(long long wstr wstr ptr) +@ stdcall AssocQueryStringA(long long str str ptr ptr) +@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) +@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) +@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr) @ stdcall ChrCmpIA(long long) @ stdcall ChrCmpIW(long long) @ stdcall ColorAdjustLuma(long long long) Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] Thu Sep 26 16:51:42 2013 @@ -68,6 +68,7 @@ SHLWAPI_ThreadRef_index = TlsAlloc(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index); 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 16:51:42 2013 @@ -177,7 +177,7 @@ reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to Wine-1.7.1 -reactos/dll/win32/shlwapi # Synced to Wine-1.5.26 +reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 reactos/dll/win32/softpub # Synced to Wine-1.5.19

10 years, 11 months

[akhaldi] 60379: [SHFOLDER] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:49:51 2013 New Revision: 60379 URL: http://svn.reactos.org/svn/reactos?rev=60379&view=rev Log: [SHFOLDER] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/shfolder/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shfolder/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/version… ============================================================================== --- trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] Thu Sep 26 16:49:51 2013 @@ -14,12 +14,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service" #define WINE_FILENAME_STR "shfolder.dll" #define WINE_FILEVERSION 6,00,2800,1106 #define WINE_FILEVERSION_STR "6,00,2800,1106" #define WINE_PRODUCTVERSION 6,00,2800,1106 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include <wine/wine_common_ver.rc> 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 16:49:51 2013 @@ -176,7 +176,7 @@ reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Autosync +reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.5.26 reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19

10 years, 11 months

[akhaldi] 60378: [SHDOCVW_WINETEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:48:45 2013 New Revision: 60378 URL: http://svn.reactos.org/svn/reactos?rev=60378&view=rev Log: [SHDOCVW_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:48:45 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE shdocvw.c @@ -7,11 +5,7 @@ testlist.c) add_executable(shdocvw_winetest ${SOURCE}) -target_link_libraries(shdocvw_winetest wine uuid) +target_link_libraries(shdocvw_winetest uuid) set_module_type(shdocvw_winetest win32cui) -add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(shdocvw_winetest shell32 ole32 advapi32 msvcrt kernel32) add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(shdocvw_winetest) -endif()

10 years, 11 months

[akhaldi] 60377: [SHDOCVW] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 26 16:48:23 2013 New Revision: 60377 URL: http://svn.reactos.org/svn/reactos?rev=60377&view=rev Log: [SHDOCVW] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:48:23 2013 @@ -2,8 +2,8 @@ add_definitions( -D__WINESRC__ -D_SHDOCVW_) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -17,11 +17,9 @@ add_library(shdocvw SHARED ${SOURCE} shdocvw.rc) set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) +add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(shdocvw version ole32 oleaut32 ieframe) - # shdocvw_v1.tlb needs stdole2.tlb add_dependencies(shdocvw stdole2) - add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Thu Sep 26 16:48:23 2013 @@ -149,9 +149,9 @@ case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); - if(ieframe_instance) - FreeLibrary(ieframe_instance); + if (ieframe_instance) FreeLibrary(ieframe_instance); break; } return TRUE; @@ -442,7 +442,7 @@ } len = sizeof(buffer) / sizeof(buffer[0]); - res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); + ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); 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 16:48:23 2013 @@ -174,7 +174,7 @@ reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 -reactos/dll/win32/shdocvw # Synced to Wine-1.5.26 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-1.5.26

10 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013