Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49808: [NDK] Fix syntax for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 00:10:47 2010 New Revision: 49808 URL: http://svn.reactos.org/svn/reactos?rev=49808&view=rev Log: [NDK] Fix syntax for MSVC Modified: branches/cmake-bringup/include/ndk/umfuncs.h Modified: branches/cmake-bringup/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/umfun… ============================================================================== --- branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] Sat Nov 27 00:10:47 2010 @@ -296,7 +296,7 @@ IN PVOID BaseAddress ); -typedef VOID NTAPI (*PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); +typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum(

14 years

[tkreuzer] 49807: [CMAKE] add a bunch more importlib targets

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 00:02:36 2010 New Revision: 49807 URL: http://svn.reactos.org/svn/reactos?rev=49807&view=rev Log: [CMAKE] add a bunch more importlib targets Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(avicap32.dll avicap32.spec) set_unicode() @@ -8,12 +10,9 @@ set_module_type(avicap32 win32dll) -set_export_spec(avicap32 avicap32.spec) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) - target_link_libraries(avicap32 wine) add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) add_cab_target(avicap32 1) +add_importlib_target(avicap32.spec) Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -51,3 +51,4 @@ add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(crypt32 1) +add_importlib_target(crypt32.spec) Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -31,4 +31,5 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi psdk buildno_header) -add_cab_target(dnsapi 1) +add_cab_target(dnsapi 1) +add_importlib_target(dnsapi.spec) Modified: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -21,3 +21,4 @@ add_importlibs(fmifs kernel32 ntdll) add_dependencies(fmifs psdk buildno_header) add_cab_target(fmifs 1) +add_importlib_target(fmifs.spec) Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -17,3 +17,4 @@ add_importlibs(imm32 advapi32 user32 kernel32 ntdll) add_cab_target(imm32 1) +add_importlib_target(imm32.spec) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,4 +24,5 @@ add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv psdk buildno_header) -add_cab_target(lsasrv 1) +add_cab_target(lsasrv 1) +add_importlib_target(lsasrv.spec) Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,12 +1,12 @@ + +spec2def(lz32.dll lz32.spec) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(lz32 SHARED version.rc lz32.def) - -if(NOT MSVC) - set_source_files_properties(lz32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(lz32 SHARED + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) set_entrypoint(lz32 0) @@ -14,4 +14,5 @@ add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk buildno_header) -add_cab_target(lz32 1) +add_cab_target(lz32 1) +add_importlib_target(lz32.spec) Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -23,3 +23,4 @@ add_importlibs(mpr advapi32 user32 kernel32 ntdll) add_cab_target(mpr 1) +add_importlib_target(mpr.spec) Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -25,3 +25,4 @@ add_subdirectory(msacm32.drv) add_cab_target(msacm32 1) +add_importlib_target(msacm32.spec) Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,12 +1,12 @@ + +spec2def(msimg32.dll msimg32.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(msimg32 SHARED msimg32_main.c msimg32.def) - -if(NOT MSVC) - set_source_files_properties(msimg32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(msimg32 SHARED + msimg32_main.c + ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) set_module_type(msimg32 win32dll) @@ -15,3 +15,4 @@ add_importlibs(msimg32 gdi32 kernel32 ntdll) add_cab_target(msimg32 1) +add_importlib_target(msimg32.spec) Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -20,3 +20,4 @@ add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll) add_cab_target(msvfw32 1) +add_importlib_target(msvfw32.spec) Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -26,3 +26,4 @@ add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) add_cab_target(netapi32 1) +add_importlib_target(netapi32.spec) Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -17,3 +17,4 @@ add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) add_cab_target(newdev 1) +add_importlib_target(newdev.spec) 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] Sat Nov 27 00:02:36 2010 @@ -61,3 +61,4 @@ rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) add_cab_target(oleaut32 1) +add_importlib_target(oleaut32.spec) Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,11 +1,12 @@ + +spec2def(powrprof.dll powrprof.spec) set_unicode() -add_library(powrprof SHARED powrprof.c powrprof.rc powrprof.def) - -if(NOT MSVC) - set_source_files_properties(powrprof.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(powrprof SHARED + powrprof.c + powrprof.rc + ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll) @@ -14,3 +15,4 @@ add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) add_cab_target(powrprof 1) +add_importlib_target(powrprof.spec) Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -11,3 +11,4 @@ add_importlibs(samlib advapi32 kernel32 ntdll) add_cab_target(samlib 1) +add_importlib_target(samlib.spec) Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,3 +24,4 @@ add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(secur32 1) +add_importlib_target(secur32.spec) Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(smdll.dll smdll.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) @@ -5,14 +7,11 @@ dllmain.c query.c smdll.rc - smdll.def) - -if(NOT MSVC) - set_source_files_properties(smdll.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) target_link_libraries(smdll smlib) add_importlibs(smdll ntdll) add_dependencies(smdll psdk buildno_header) -add_cab_target(smdll 1) +add_cab_target(smdll 1) +add_importlib_target(smdll.spec) Modified: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -26,3 +26,4 @@ add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(userenv 1) +add_importlib_target(userenv.spec) Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,3 +24,4 @@ add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) add_cab_target(uxtheme 1) +add_importlib_target(uxtheme.spec) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(winspool.drv winspool.spec) set_unicode() @@ -7,15 +9,15 @@ info.c stubs.c winspool_winspool.stubs.c - winspool.rc) + winspool.rc + ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) -target_link_libraries(winspool - ${CMAKE_CURRENT_SOURCE_DIR}/winspool_winspool.auto.def - wine) +target_link_libraries(winspool wine) add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_cab_target(winspool 1) +add_importlib_target(winspool.spec) Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(ws2help.dll ws2help.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) @@ -7,14 +9,11 @@ dllmain.c handle.c notify.c - ws2help.def) - -if(NOT MSVC) - set_source_files_properties(ws2help.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) add_cab_target(ws2help 1) +add_importlib_target(ws2help.spec)

14 years

[akhaldi] 49806: - Correct the entry point for win32dll, win32ocx and cpl module types. - Fix acledit.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 26 23:57:03 2010 New Revision: 49806 URL: http://svn.reactos.org/svn/reactos?rev=49806&view=rev Log: - Correct the entry point for win32dll, win32ocx and cpl module types. - Fix acledit. Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:57:03 2010 @@ -13,7 +13,7 @@ set_export_spec(acledit acledit.spec) -add_importlibs(acledit ntdll) +add_importlibs(acledit msvcrt kernel32 ntdll) add_cab_target(acledit 1) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 26 23:57:03 2010 @@ -135,7 +135,8 @@ target_link_libraries(${MODULE} mingw_common) endif() if(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -143,11 +144,13 @@ endif() endif() if(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") endif() if(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") endif() if(${TYPE} MATCHES kernelmodedriver)

14 years

[tkreuzer] 49805: [CMAKE] - implicitly link to msvcsup - set proper entrypoints - add linkerflags /DLL and /DRIVER

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 23:48:07 2010 New Revision: 49805 URL: http://svn.reactos.org/svn/reactos?rev=49805&view=rev Log: [CMAKE] - implicitly link to msvcsup - set proper entrypoints - add linkerflags /DLL and /DRIVER Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 26 23:48:07 2010 @@ -71,7 +71,7 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) @@ -81,7 +81,7 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken @@ -91,22 +91,27 @@ else() message(STATUS "${MODULE} has no base address") endif() - target_link_libraries(${MODULE} mingw_common mingw_dllmain) + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) + add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) + add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) + add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) endif()

14 years

[tkreuzer] 49804: [CMAKE] Add msvcsup static library for MSVC. This might be superseded by something else later.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 23:45:30 2010 New Revision: 49804 URL: http://svn.reactos.org/svn/reactos?rev=49804&view=rev Log: [CMAKE] Add msvcsup static library for MSVC. This might be superseded by something else later. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:45:30 2010 @@ -570,3 +570,13 @@ add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) add_dependencies(libcntpr psdk buildno_header asm) + +# This is a temporary solution until we have proper crt libs +list(APPEND MSVCSUP_SOURCE + misc/fltused.c + except/i386/chkstk_asm.s + math/i386/ftol2_asm.S +) + +add_library(msvcsup ${MSVCSUP_SOURCE}) +add_dependencies(msvcsup psdk buildno_header asm)

14 years

[spetreolle] 49803: [CMAKE] Sync with trunk. (r49792)

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Nov 26 23:33:34 2010 New Revision: 49803 URL: http://svn.reactos.org/svn/reactos?rev=49803&view=rev Log: [CMAKE] Sync with trunk. (r49792) Added: branches/cmake-bringup/boot/armllb/hw/matrix.c - copied unchanged from r49792, trunk/reactos/boot/armllb/hw/matrix.c branches/cmake-bringup/boot/armllb/hw/omap3-beagle/ - copied from r49792, trunk/reactos/boot/armllb/hw/omap3-beagle/ branches/cmake-bringup/boot/armllb/hw/omap3-zoom2/ - copied from r49792, trunk/reactos/boot/armllb/hw/omap3-zoom2/ branches/cmake-bringup/boot/armllb/inc/omap3.h - copied unchanged from r49792, trunk/reactos/boot/armllb/inc/omap3.h branches/cmake-bringup/boot/freeldr/freeldr/freeldr_arm.lnk - copied unchanged from r49792, trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lnk branches/cmake-bringup/hal/halarm/omap3/ - copied from r49792, trunk/reactos/hal/halarm/omap3/ branches/cmake-bringup/include/psdk/specstrings.h - copied unchanged from r49792, trunk/reactos/include/psdk/specstrings.h Removed: branches/cmake-bringup/boot/armllb/hw/omap3/ Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/rapps/rapps/7zip.txt branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt branches/cmake-bringup/base/applications/rapps/rapps/mono2.txt branches/cmake-bringup/base/applications/rapps/rapps/openttd.txt branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/armllb/boot.s branches/cmake-bringup/boot/armllb/crtsupp.c branches/cmake-bringup/boot/armllb/envir.c branches/cmake-bringup/boot/armllb/fw.c branches/cmake-bringup/boot/armllb/hw/time.c branches/cmake-bringup/boot/armllb/hw/video.c branches/cmake-bringup/boot/armllb/inc/envir.h branches/cmake-bringup/boot/armllb/inc/keyboard.h branches/cmake-bringup/boot/armllb/inc/machtype.h branches/cmake-bringup/boot/armllb/inc/precomp.h branches/cmake-bringup/boot/armllb/main.c branches/cmake-bringup/boot/armllb/os/loader.c branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/boot.s branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/macharm.c branches/cmake-bringup/boot/freeldr/freeldr/include/keycodes.h branches/cmake-bringup/boot/freeldr/freeldr/mm/mm.c branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c branches/cmake-bringup/boot/freeldr/freeldr/windows/arm/wlmemory.c branches/cmake-bringup/boot/freeldr/freeldr/windows/conversion.c branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c branches/cmake-bringup/boot/freeldr/freeldr/windows/wlregistry.c branches/cmake-bringup/dll/ntdll/ldr/utils.c branches/cmake-bringup/dll/win32/gdi32/objects/coord.c branches/cmake-bringup/dll/win32/gdi32/objects/dc.c branches/cmake-bringup/dll/win32/kernel32/file/npipe.c branches/cmake-bringup/drivers/filesystems/npfs/create.c branches/cmake-bringup/drivers/filesystems/npfs/fsctrl.c branches/cmake-bringup/drivers/filesystems/npfs/npfs.c branches/cmake-bringup/drivers/filesystems/npfs/npfs.h branches/cmake-bringup/include/crt/mingw32/intrin_arm.h branches/cmake-bringup/include/crt/setjmp.h branches/cmake-bringup/include/crt/stddef.h branches/cmake-bringup/include/ddk/wdm.h branches/cmake-bringup/include/ndk/arm/ketypes.h branches/cmake-bringup/include/ndk/arm/mmtypes.h branches/cmake-bringup/include/ndk/umfuncs.h branches/cmake-bringup/include/psdk/windef.h branches/cmake-bringup/include/psdk/winnt.h branches/cmake-bringup/include/reactos/arm/armddk.h branches/cmake-bringup/include/reactos/wine/exception.h branches/cmake-bringup/lib/sdk/crt/misc/assert.c branches/cmake-bringup/ntoskrnl/fsrtl/dbcsname.c branches/cmake-bringup/ntoskrnl/fsrtl/filtrctx.c branches/cmake-bringup/ntoskrnl/fsrtl/name.c branches/cmake-bringup/ntoskrnl/include/internal/arm/kxarm.h branches/cmake-bringup/ntoskrnl/include/internal/arm/mm.h branches/cmake-bringup/ntoskrnl/include/internal/fsrtl.h branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h branches/cmake-bringup/ntoskrnl/include/internal/io.h branches/cmake-bringup/ntoskrnl/include/internal/mm.h branches/cmake-bringup/ntoskrnl/include/internal/ntoskrnl.h branches/cmake-bringup/ntoskrnl/io/iomgr/controller.c branches/cmake-bringup/ntoskrnl/io/iomgr/file.c branches/cmake-bringup/ntoskrnl/ke/arm/boot.s branches/cmake-bringup/ntoskrnl/ke/arm/cpu.c branches/cmake-bringup/ntoskrnl/ke/arm/ctxswtch.s branches/cmake-bringup/ntoskrnl/ke/arm/thrdini.c branches/cmake-bringup/ntoskrnl/ke/arm/trapc.c branches/cmake-bringup/ntoskrnl/mm/ARM3/arm/init.c branches/cmake-bringup/ntoskrnl/mm/ARM3/mdlsup.c branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c branches/cmake-bringup/ntoskrnl/mm/ARM3/pagfault.c branches/cmake-bringup/ntoskrnl/mm/ARM3/pool.c branches/cmake-bringup/ntoskrnl/mm/ARM3/procsup.c branches/cmake-bringup/ntoskrnl/mm/ARM3/section.c branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c branches/cmake-bringup/ntoskrnl/mm/amd64/init.c branches/cmake-bringup/ntoskrnl/mm/arm/page.c branches/cmake-bringup/ntoskrnl/mm/arm/stubs.c branches/cmake-bringup/ntoskrnl/mm/pagefile.c branches/cmake-bringup/ntoskrnl/ntoskrnl.spec branches/cmake-bringup/ntoskrnl/po/power.c branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h branches/cmake-bringup/subsystems/win32/win32k/include/winpos.h branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/winsta.c branches/cmake-bringup/subsystems/win32/win32k/pch.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… Modified: branches/cmake-bringup/boot/armllb/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/boot.… Modified: branches/cmake-bringup/boot/armllb/crtsupp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/crtsu… Modified: branches/cmake-bringup/boot/armllb/envir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/envir… Modified: branches/cmake-bringup/boot/armllb/fw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/fw.c?… Modified: branches/cmake-bringup/boot/armllb/hw/time.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/hw/ti… Modified: branches/cmake-bringup/boot/armllb/hw/video.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/hw/vi… Modified: branches/cmake-bringup/boot/armllb/inc/envir.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/e… Modified: branches/cmake-bringup/boot/armllb/inc/keyboard.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/k… Modified: branches/cmake-bringup/boot/armllb/inc/machtype.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/m… Modified: branches/cmake-bringup/boot/armllb/inc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/p… Modified: branches/cmake-bringup/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/main.… Modified: branches/cmake-bringup/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/os/lo… Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/keycodes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/uti… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/mingw… Modified: branches/cmake-bringup/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjm… Modified: branches/cmake-bringup/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/stdde… Modified: branches/cmake-bringup/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ddk/wdm.h… Modified: branches/cmake-bringup/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/arm/k… Modified: branches/cmake-bringup/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/arm/m… Modified: branches/cmake-bringup/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/umfun… Modified: branches/cmake-bringup/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/wind… Modified: branches/cmake-bringup/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/winn… Modified: branches/cmake-bringup/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/a… Modified: branches/cmake-bringup/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… Modified: branches/cmake-bringup/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/db… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/fi… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/na… Modified: branches/cmake-bringup/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/b… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/c… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/c… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/t… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/t… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/amd64… Modified: branches/cmake-bringup/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/arm/p… Modified: branches/cmake-bringup/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/arm/s… Modified: branches/cmake-bringup/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/pagef… Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… Modified: branches/cmake-bringup/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/po/power… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

14 years

[fireball] 49802: - Sync up to Wine-1.3.8.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 26 23:13:42 2010 New Revision: 49802 URL: http://svn.reactos.org/svn/reactos?rev=49802&view=rev Log: - Sync up to Wine-1.3.8. Modified: branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/focus.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/painting.c branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 26 23:13:42 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48678 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861,48147,48418,48677,49173,49721 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861,48147,48418,48677,49173,49721,49800 Modified: branches/arwinss/reactos/dll/win32/user32/focus.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -163,6 +163,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -2360,6 +2360,7 @@ /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4231,11 +4232,27 @@ /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } SERVER_START_REQ( get_thread_input ) { Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -802,6 +802,7 @@ RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -@ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -1588,6 +1588,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 26 23:13:42 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48678 -/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861,48147,48418,48677,49173,49721 +/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861,48147,48418,48677,49173,49721,49800 Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -498,6 +498,7 @@ TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -79,6 +79,7 @@ static Time last_user_time; static Window user_time_window; +static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; @@ -1754,7 +1755,23 @@ */ static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { - if (!data->whole_window) return; + if (!data->whole_window) + { + if (data->embedded) + { + Window xwin = (Window)GetPropA( data->hwnd, foreign_window_prop ); + if (xwin) + { + wine_tsx11_lock(); + if (!already_destroyed) XSelectInput( display, xwin, 0 ); + XDeleteContext( display, xwin, winContext ); + wine_tsx11_unlock(); + RemovePropA( data->hwnd, foreign_window_prop ); + } + } + return; + } + TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); wine_tsx11_lock(); @@ -1895,14 +1912,7 @@ if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); - if (!data->whole_window) - { - wine_tsx11_lock(); - XDeleteContext( display, event->xdestroywindow.window, winContext ); - wine_tsx11_unlock(); - } - else destroy_whole_window( display, data, TRUE ); - + destroy_whole_window( display, data, TRUE ); if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -2154,6 +2164,7 @@ data->embedded = TRUE; data->mapped = TRUE; + SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); wine_tsx11_lock(); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -198,7 +198,7 @@ */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if (event->request_code == X_SetInputFocus && + if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */

14 years

[spetreolle] 49801: [CMAKE] Add missing asm dependency.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Nov 26 23:05:46 2010 New Revision: 49801 URL: http://svn.reactos.org/svn/reactos?rev=49801&view=rev Log: [CMAKE] Add missing asm dependency. Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:05:46 2010 @@ -1,4 +1,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) -add_dependencies(win32ksys win32k_S) +add_dependencies(win32ksys win32k_S asm)

14 years

[fireball] 49800: [VENDOR/WINE] - Import Wine-1.3.8 gdi32, user32, winex11.drv, server.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 26 22:59:37 2010 New Revision: 49800 URL: http://svn.reactos.org/svn/reactos?rev=49800&view=rev Log: [VENDOR/WINE] - Import Wine-1.3.8 gdi32, user32, winex11.drv, server. Modified: vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/icm.c vendor/wine/dlls/user32/current/focus.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/painting.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/user32.spec vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/x11drv_main.c Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -1017,16 +1017,28 @@ hdc = GetDC(0); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 16; + lf.lfCharSet = ANSI_CHARSET; + + hfont = CreateFontIndirectA(&lf); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); - flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); - flags = 0; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + if (textm.tmCharSet == ANSI_CHARSET) + { + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + } + else + /* FIXME: Write tests for non-ANSI charsets. */ + skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); if(!is_font_installed("Tahoma")) { Modified: vendor/wine/dlls/gdi32/current/tests/icm.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/icm… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/icm.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/icm.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -217,7 +217,7 @@ ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); - ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); } static void test_SetICMProfileA( HDC dc ) Modified: vendor/wine/dlls/user32/current/focus.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/focus.c?… ============================================================================== --- vendor/wine/dlls/user32/current/focus.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/focus.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -160,6 +160,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… ============================================================================== --- vendor/wine/dlls/user32/current/message.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/message.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -2359,6 +2359,7 @@ /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4229,11 +4230,27 @@ /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } SERVER_START_REQ( get_thread_input ) { Modified: vendor/wine/dlls/user32/current/painting.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/painting… ============================================================================== --- vendor/wine/dlls/user32/current/painting.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/painting.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -801,6 +801,7 @@ RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… ============================================================================== --- vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -610,6 +610,22 @@ HWND hwnd[3]; BOOL ret; MSG msg; + + if (pGetGUIThreadInfo) + { + GUITHREADINFO info; + info.cbSize = sizeof(info); + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( ret || broken(!ret), /* win9x */ + "GetGUIThreadInfo failed without message queue\n" ); + SetLastError( 0xdeadbeef ); + info.cbSize = sizeof(info) + 1; + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( !ret, "GetGUIThreadInfo succeeded with wrong size\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + } PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ Modified: vendor/wine/dlls/user32/current/user32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user32.s… ============================================================================== --- vendor/wine/dlls/user32/current/user32.spec [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/user32.spec [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -# @ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… ============================================================================== --- vendor/wine/dlls/user32/current/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/win.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -1587,6 +1587,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/event.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -497,6 +497,7 @@ TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive; Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -78,6 +78,7 @@ static Time last_user_time; static Window user_time_window; +static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; @@ -1753,7 +1754,23 @@ */ static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { - if (!data->whole_window) return; + if (!data->whole_window) + { + if (data->embedded) + { + Window xwin = (Window)GetPropA( data->hwnd, foreign_window_prop ); + if (xwin) + { + wine_tsx11_lock(); + if (!already_destroyed) XSelectInput( display, xwin, 0 ); + XDeleteContext( display, xwin, winContext ); + wine_tsx11_unlock(); + RemovePropA( data->hwnd, foreign_window_prop ); + } + } + return; + } + TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); wine_tsx11_lock(); @@ -1894,14 +1911,7 @@ if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); - if (!data->whole_window) - { - wine_tsx11_lock(); - XDeleteContext( display, event->xdestroywindow.window, winContext ); - wine_tsx11_unlock(); - } - else destroy_whole_window( display, data, TRUE ); - + destroy_whole_window( display, data, TRUE ); if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -2153,6 +2163,7 @@ data->embedded = TRUE; data->mapped = TRUE; + SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); wine_tsx11_lock(); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); Modified: vendor/wine/dlls/winex11.drv/current/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/x11drv_main.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/x11drv_main.c [iso-8859-1] Fri Nov 26 22:59:37 2010 @@ -197,7 +197,7 @@ */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if (event->request_code == X_SetInputFocus && + if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */

14 years

[tkreuzer] 49799: [MINGW] Merge .CRT section into .rdata when linking to mingw lib. This silences the warnings about uninitialized constructors.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 26 22:52:46 2010 New Revision: 49799 URL: http://svn.reactos.org/svn/reactos?rev=49799&view=rev Log: [MINGW] Merge .CRT section into .rdata when linking to mingw lib. This silences the warnings about uninitialized constructors. Modified: branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] Fri Nov 26 22:52:46 2010 @@ -1,6 +1,10 @@ #include <stdio.h> #include <internal.h> #include <sect_attribs.h> + +#ifdef _MSC_VER +#pragma comment(linker, "/merge:.CRT=.rdata") +#endif _CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL }; _CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL };

14 years

← Newer
1
...
5
6
7
8
9
10
11
...
50
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 November 2010