Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60116: [COMCAT_WINETEST] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 19:00:31 2013 New Revision: 60116 URL: http://svn.reactos.org/svn/reactos?rev=60116&view=rev Log: [COMCAT_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/comcat/CMakeLists.txt trunk/rostests/winetests/comcat/comcat.c trunk/rostests/winetests/comcat/testlist.c Modified: trunk/rostests/winetests/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis… ============================================================================== --- trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] Sat Sep 14 19:00:31 2013 @@ -1,10 +1,7 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(comcat_winetest comcat.c testlist.c) -target_link_libraries(comcat_winetest wine uuid) +target_link_libraries(comcat_winetest uuid) set_module_type(comcat_winetest win32cui) -add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32) add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comcat/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.c… ============================================================================== --- trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] Sat Sep 14 19:00:31 2013 @@ -18,16 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include <stdio.h> -#include <initguid.h> -#include <windows.h> +#include <wine/test.h> -#include "objbase.h" -#include "comcat.h" - -#include "wine/test.h" +//#include <stdio.h> +//#include <initguid.h> +//#include <windows.h> +#include <winreg.h> +//#include "objbase.h" +#include <ole2.h> +#include <comcat.h> #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) Modified: trunk/rostests/winetests/comcat/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/testlist… ============================================================================== --- trunk/rostests/winetests/comcat/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/testlist.c [iso-8859-1] Sat Sep 14 19:00:31 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_comcat(void);

11 years, 3 months

[akhaldi] 60115: [COMCAT] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:59:47 2013 New Revision: 60115 URL: http://svn.reactos.org/svn/reactos?rev=60115&view=rev Log: [COMCAT] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt trunk/reactos/dll/win32/comcat/comcat_main.c trunk/reactos/dll/win32/comcat/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -1,25 +1,14 @@ add_definitions(-D__WINESRC__) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(comcat.dll comcat.spec) list(APPEND SOURCE comcat_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/comcat.def) -add_library(comcat SHARED ${SOURCE}) - +add_library(comcat SHARED ${SOURCE} version.rc) set_module_type(comcat win32dll) - -target_link_libraries(comcat uuid wine) - -add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll) - -add_dependencies(comcat psdk) +add_importlibs(comcat ole32 msvcrt kernel32) add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/comcat/comcat_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ma… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/comcat_main.c [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -22,14 +22,8 @@ //#include <stdarg.h> -#define COBJMACROS - #include <windef.h> //#include "winbase.h" -//#include "winuser.h" -//#include "winreg.h" -//#include "winerror.h" -//#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@) Modified: trunk/reactos/dll/win32/comcat/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/version.r… ============================================================================== --- trunk/reactos/dll/win32/comcat/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/version.rc [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER #define WINE_FILENAME_STR "comcat.dll" +#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] Sat Sep 14 18:59:47 2013 @@ -58,7 +58,7 @@ reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.5.4 +reactos/dll/win32/comcat # Synced to Wine-1.7.1 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.19

11 years, 3 months

[akhaldi] 60114: [CLUSAPI] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:39:19 2013 New Revision: 60114 URL: http://svn.reactos.org/svn/reactos?rev=60114&view=rev Log: [CLUSAPI] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/clusapi/clusapi.c trunk/reactos/dll/win32/clusapi/clusapi.spec trunk/reactos/include/psdk/clusapi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -28,6 +28,20 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(clusapi); + +/*********************************************************************** + * GetClusterInformation (CLUSAPI.@) + * + */ +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo) +{ + FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo); + + *lpcchClusterName = 0; + + return ERROR_SUCCESS; +} /*********************************************************************** * GetNodeClusterState (CLUSAPI.@) Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -70,7 +70,7 @@ @ stub GetClusterFromResource @ stub GetClusterGroupKey @ stub GetClusterGroupState -@ stub GetClusterInformation +@ stdcall GetClusterInformation(ptr ptr ptr ptr) @ stub GetClusterKey @ stub GetClusterNetInterface @ stub GetClusterNetInterfaceKey Modified: trunk/reactos/include/psdk/clusapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/clusapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/clusapi.h [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -26,7 +26,24 @@ typedef struct _HCLUSTER *HCLUSTER; typedef struct _HCLUSENUM *HCLUSENUM; + +typedef struct _CLUSTERVERSIONINFO +{ + DWORD dwVersionInfoSize; + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WCHAR szVendorId[64]; + WCHAR szCSDVersion[64]; + DWORD dwClusterHighestVersion; + DWORD dwClusterLowestVersion; + DWORD dwFlags; + DWORD dwReserved; +} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO; + BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -57,7 +57,7 @@ reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26 -reactos/dll/win32/clusapi # Synced to Wine-1.5.26 +reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37

11 years, 3 months

[akhaldi] 60113: [AVIFIL32] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:34:12 2013 New Revision: 60113 URL: http://svn.reactos.org/svn/reactos?rev=60113&view=rev Log: [AVIFIL32] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Sat Sep 14 18:34:12 2013 @@ -227,8 +227,6 @@ DisableThreadLibraryCalls(hInstDll); AVIFILE_hModule = 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] Sat Sep 14 18:34:12 2013 @@ -53,7 +53,7 @@ reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.5.26 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.1 reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26

11 years, 3 months

[akhaldi] 60112: * Silence some debug prints.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:27:10 2013 New Revision: 60112 URL: http://svn.reactos.org/svn/reactos?rev=60112&view=rev Log: * Silence some debug prints. Modified: trunk/reactos/dll/ntdll/csr/connect.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Sat Sep 14 18:27:10 2013 @@ -233,7 +233,7 @@ if (InsideCsrProcess) { /* We're inside, so let's find csrsrv */ - DPRINT1("Next-GEN CSRSS support\n"); + DPRINT("Next-GEN CSRSS support\n"); RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); Status = LdrGetDllHandle(NULL, NULL, @@ -456,7 +456,7 @@ else { /* This is a server-to-server call. Save our CID and do a direct call. */ - DPRINT1("Next gen server-to-server call\n"); + DPRINT("Next gen server-to-server call\n"); /* We check this equality inside CsrValidateMessageBuffer */ ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId;

11 years, 3 months

[akhaldi] 60111: [ATL_WINETEST] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:23:41 2013 New Revision: 60111 URL: http://svn.reactos.org/svn/reactos?rev=60111&view=rev Log: [ATL_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/atl/atl_ax.c trunk/rostests/winetests/atl/module.c trunk/rostests/winetests/atl/registrar.c trunk/rostests/winetests/atl/testlist.c Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE atl_ax.c @@ -8,9 +6,7 @@ testlist.c) add_executable(atl_winetest ${SOURCE}) - target_link_libraries(atl_winetest wine uuid) - set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?re… ============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,22 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> #include <exdisp.h> static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); Modified: trunk/rostests/winetests/atl/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?re… ============================================================================== --- trunk/rostests/winetests/atl/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -19,22 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> struct _ATL_OBJMAP_ENTRYW; struct _AtlCreateWndData; Modified: trunk/rostests/winetests/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/registrar.c… ============================================================================== --- trunk/rostests/winetests/atl/registrar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/registrar.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,23 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> #include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> -#include <initguid.h> +#include <winreg.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> +//#include <initguid.h> #include <atliface.h> static const char textA[] = Modified: trunk/rostests/winetests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/testlist.c?… ============================================================================== --- trunk/rostests/winetests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/testlist.c [iso-8859-1] Sat Sep 14 18:23:41 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_atl_ax(void); extern void func_module(void);

11 years, 3 months

[akhaldi] 60110: [ATL] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 18:22:37 2013 New Revision: 60110 URL: http://svn.reactos.org/svn/reactos?rev=60110&view=rev Log: [ATL] * Sync with Wine 1.7.1. Removed: trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/atl/atl_main.c trunk/reactos/dll/win32/atl/atl_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -12,13 +12,12 @@ list(APPEND SOURCE atl_main.c - registrar.c ${CMAKE_CURRENT_BINARY_DIR}/atl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/atl.def) add_library(atl SHARED ${SOURCE} rsrc.rc) set_module_type(atl win32dll) target_link_libraries(atl uuid wine) -add_importlibs(atl atl100 oleaut32 ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(atl atl100 atl80 oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(atl atl_atliface_header) add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -16,7 +16,7 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stub AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC 27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel @@ -26,26 +26,26 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) Modified: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -2,6 +2,7 @@ * Implementation of Active Template Library (atl.dll) * * Copyright 2004 Aric Stewart for CodeWeavers + * Copyright 2005 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ #include <windef.h> #include <winbase.h> -#include <objbase.h> +#include <ole2.h> #include <oleauto.h> //#include "objidl.h" @@ -40,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -DECLSPEC_HIDDEN HINSTANCE hInst; +static HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -60,7 +61,7 @@ INT i; UINT size; - //FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + TRACE("(%p %p %p)\n", pM, p, h); size = pM->cbSize; switch (size) @@ -120,57 +121,50 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { - HRESULT hRes; - OLECHAR path[MAX_PATH+8]; /* leave some space for index */ - TRACE("(%p, %s, %p, %p)\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); if (!pM) return E_INVALIDARG; - GetModuleFileNameW(pM->m_hInstTypeLib, path, MAX_PATH); - if (lpszIndex) - lstrcatW(path, lpszIndex); - - hRes = LoadTypeLib(path, ppTypeLib); - if (FAILED(hRes)) - return hRes; - - *pbstrPath = SysAllocString(path); + return AtlLoadTypeLib(pM->m_hInstTypeLib, lpszIndex, pbstrPath, ppTypeLib); +} + +HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) +{ + _ATL_TERMFUNC_ELEM *iter, *tmp; + + TRACE("(%p)\n", pM); + + if (pM->cbSize > ATLVer1Size) + { + iter = pM->m_pTermFuncs; + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } + } return S_OK; } -HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) -{ - _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; - - TRACE("(%p)\n", pM); - - while(iter) { - iter->pFunc(iter->dw); - tmp = iter; - iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); - } - - HeapFree(GetProcessHeap(), 0, pM); - - return S_OK; -} - HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) { _ATL_TERMFUNC_ELEM *termfunc_elem; TRACE("(%p %p %ld)\n", pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; - - pM->m_pTermFuncs = termfunc_elem; + if (pM->cbSize > ATLVer1Size) + { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; + + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } @@ -242,12 +236,23 @@ hRes = obj->pfnUpdateRegistry(TRUE); /* register */ if (FAILED(hRes)) return hRes; + + if(pM->cbSize > ATLVer1Size) { + const struct _ATL_CATMAP_ENTRY *catmap; + + catmap = ((const _ATL_OBJMAP_ENTRYW*)obj)->pfnGetCategoryMap(); + if(catmap) { + hRes = AtlRegisterClassCategoriesHelper(obj->pclsid, catmap, TRUE); + if(FAILED(hRes)) + return hRes; + } + } } } if (bRegTypeLib) { - hRes = AtlModuleRegisterTypeLib(pM, NULL); + hRes = AtlRegisterTypeLib(pM->m_hInstTypeLib, NULL); if (FAILED(hRes)) return hRes; } @@ -298,25 +303,12 @@ */ HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pm, LPCOLESTR lpszIndex) { - HRESULT hRes; - BSTR path; - ITypeLib *typelib; - TRACE("%p %s\n", pm, debugstr_w(lpszIndex)); if (!pm) return E_INVALIDARG; - hRes = AtlModuleLoadTypeLib(pm, lpszIndex, &path, &typelib); - - if (SUCCEEDED(hRes)) - { - hRes = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ - ITypeLib_Release(typelib); - SysFreeString(path); - } - - return hRes; + return AtlRegisterTypeLib(pm->m_hInstTypeLib, lpszIndex); } /*********************************************************************** @@ -452,23 +444,28 @@ pData->m_pThis = pvObject; pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); pData->m_pNext = pM->m_pCreateWndList; pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); } /*********************************************************************** * AtlModuleExtractCreateWndData [ATL.@] * - * NOTE: I failed to find any good description of this function. - * Tests show that this function extracts one of _AtlCreateWndData + * NOTE: Tests show that this function extracts one of _AtlCreateWndData * records from the current thread from a list * */ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) { _AtlCreateWndData **ppData; + void *ret = NULL; TRACE("(%p)\n", pM); + + EnterCriticalSection(&pM->m_csWindowCreate); for(ppData = &pM->m_pCreateWndList; *ppData!=NULL; ppData = &(*ppData)->m_pNext) { @@ -476,10 +473,172 @@ { _AtlCreateWndData *pData = *ppData; *ppData = pData->m_pNext; - return pData->m_pThis; - } - } - return NULL; + ret = pData->m_pThis; + break; + } + } + + LeaveCriticalSection(&pM->m_csWindowCreate); + return ret; +} + +/*********************************************************************** + * AtlModuleUpdateRegistryFromResourceD [ATL.@] + * + */ +HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, + BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) +{ + TRACE("(%p %s %d %p %p)\n", pM, debugstr_w(lpszRes), bRegister, pMapEntries, pReg); + + return AtlUpdateRegistryFromResourceD(pM->m_hInst, lpszRes, bRegister, pMapEntries, pReg); +} + +static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppvObject = iface; + IClassFactory_AddRef( iface ); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, + REFIID riid, void **ppv) +{ + IRegistrar *registrar; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + + hres = IRegistrar_QueryInterface(registrar, riid, ppv); + IRegistrar_Release(registrar); + return hres; +} + +static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p)->(%x)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl IRegistrarCFVtbl = { + RegistrarCF_QueryInterface, + RegistrarCF_AddRef, + RegistrarCF_Release, + RegistrarCF_CreateInstance, + RegistrarCF_LockServer +}; + +static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; + +static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, + LPCOLESTR wszId, BOOL do_register, + const struct _ATL_REGMAP_ENTRY* pMapEntries) +{ + IRegistrar *registrar; + HRESULT hres; + const struct _ATL_REGMAP_ENTRY *pMapEntry; + + static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; + static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; + + if(pRegistrar) { + registrar = pRegistrar; + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } + + IRegistrar_AddReplacement(registrar, wszModule, wszDll); + + for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) + IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); + + if(do_register) + hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); + else + hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); + + if(registrar != pRegistrar) + IRegistrar_Release(registrar); + return hres; +} + +static HRESULT do_register_server(BOOL do_register) +{ + static const WCHAR CLSID_RegistrarW[] = + {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; + static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; + + WCHAR clsid_str[40]; + const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; + + StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); + return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); +} + +/************************************************************** + * DllGetClassObject (ATL.2) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) +{ + TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&CLSID_Registrar, clsid)) + return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); + + FIXME("Not supported class %s\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (ATL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ + return do_register_server(TRUE); +} + +/*********************************************************************** + * DllUnRegisterServer (ATL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return do_register_server(FALSE); +} + +/*********************************************************************** + * DllCanUnloadNow (ATL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; } /*********************************************************************** @@ -487,5 +646,53 @@ */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return 0x0300; -} + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} Modified: trunk/reactos/dll/win32/atl/atl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -1,24 +1,44 @@ -Index: atl_main.c -=================================================================== ---- atl_main.c (revision 48273) -+++ atl_main.c (working copy) -@@ -60,7 +60,7 @@ - INT i; - UINT size; +diff -prudN e:\Wine\dlls\atl/atl_main.c e:\reactos\dll\win32\atl/atl_main.c +--- e:\Wine\dlls\atl/atl_main.c 2013-09-03 23:09:36.308717300 +0100 ++++ e:\reactos\dll\win32\atl/atl_main.c 2013-09-12 12:15:17.112785700 +0100 +@@ -547,6 +555,53 @@ static const IClassFactoryVtbl IRegistra -- FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); -+ //FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; - size = pM->cbSize; - switch (size) -Index: registrar.c -=================================================================== ---- registrar.c (revision 48273) -+++ registrar.c (revision 48273) -@@ -819,6 +819,19 @@ - return hres; - } - ++static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, ++ LPCOLESTR wszId, BOOL do_register, ++ const struct _ATL_REGMAP_ENTRY* pMapEntries) ++{ ++ IRegistrar *registrar; ++ HRESULT hres; ++ const struct _ATL_REGMAP_ENTRY *pMapEntry; ++ ++ static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; ++ static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; ++ ++ if(pRegistrar) { ++ registrar = pRegistrar; ++ }else { ++ hres = AtlCreateRegistrar(&registrar); ++ if(FAILED(hres)) ++ return hres; ++ } ++ ++ IRegistrar_AddReplacement(registrar, wszModule, wszDll); ++ ++ for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) ++ IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); ++ ++ if(do_register) ++ hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); ++ else ++ hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); ++ ++ if(registrar != pRegistrar) ++ IRegistrar_Release(registrar); ++ return hres; ++} ++ +static HRESULT do_register_server(BOOL do_register) +{ + static const WCHAR CLSID_RegistrarW[] = @@ -32,10 +52,10 @@ + return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); +} + - /*********************************************************************** - * AtlModuleUpdateRegistryFromResourceD [ATL.@] - * -@@ -849,7 +862,8 @@ + /************************************************************** + * DllGetClassObject (ATL.2) + */ +@@ -566,7 +621,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI */ HRESULT WINAPI DllRegisterServer(void) { @@ -45,7 +65,7 @@ } /*********************************************************************** -@@ -857,7 +871,7 @@ +@@ -574,7 +630,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { Removed: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c (removed) @@ -1,215 +0,0 @@ -/* - * Copyright 2005 Jacek Caban - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <objbase.h> - -//#include "oaidl.h" -//#include "rpcproxy.h" -#include <atlbase.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/************************************************************** - * ClassFactory implementation - */ - -static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) -{ - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { - *ppvObject = iface; - IClassFactory_AddRef( iface ); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) -{ - return 2; -} - -static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) -{ - return 1; -} - -static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, - REFIID riid, void **ppv) -{ - IRegistrar *registrar; - HRESULT hres; - - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - - if(pUnkOuter) { - *ppv = NULL; - return CLASS_E_NOAGGREGATION; - } - - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - - hres = IRegistrar_QueryInterface(registrar, riid, ppv); - IRegistrar_Release(registrar); - return hres; -} - -static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) -{ - TRACE("(%p)->(%x)\n", iface, lock); - return S_OK; -} - -static const IClassFactoryVtbl IRegistrarCFVtbl = { - RegistrarCF_QueryInterface, - RegistrarCF_AddRef, - RegistrarCF_Release, - RegistrarCF_CreateInstance, - RegistrarCF_LockServer -}; - -static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; - -/************************************************************** - * DllGetClassObject (ATL.2) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) -{ - TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&CLSID_Registrar, clsid)) - return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); - - FIXME("Not supported class %s\n", debugstr_guid(clsid)); - return CLASS_E_CLASSNOTAVAILABLE; -} - -extern HINSTANCE hInst; - -static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, - LPCOLESTR wszId, BOOL do_register, - const struct _ATL_REGMAP_ENTRY* pMapEntries) -{ - IRegistrar *registrar; - HRESULT hres; - const struct _ATL_REGMAP_ENTRY *pMapEntry; - - static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; - static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - - if(pRegistrar) { - registrar = pRegistrar; - }else { - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - } - - IRegistrar_AddReplacement(registrar, wszModule, wszDll); - - for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) - IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); - - if(do_register) - hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); - else - hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); - - if(registrar != pRegistrar) - IRegistrar_Release(registrar); - return hres; -} - -static HRESULT do_register_server(BOOL do_register) -{ - static const WCHAR CLSID_RegistrarW[] = - {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; - static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; - - WCHAR clsid_str[40]; - const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; - - StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); - return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); -} - -/*********************************************************************** - * AtlModuleUpdateRegistryFromResourceD [ATL.@] - * - */ -HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, - BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) -{ - HINSTANCE lhInst = pM->m_hInst; - /* everything inside this function below this point - * should go into atl71.AtlUpdateRegistryFromResourceD - */ - WCHAR module_name[MAX_PATH]; - - if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) { - FIXME("hinst %p: did not get module name\n", - lhInst); - return E_FAIL; - } - - TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), - debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - - return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); -} - -/*********************************************************************** - * DllRegisterServer (ATL.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ - return do_register_server(TRUE); -} - -/*********************************************************************** - * DllUnRegisterServer (ATL.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - return do_register_server(FALSE); -} - -/*********************************************************************** - * DllCanUnloadNow (ATL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - 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] Sat Sep 14 18:22:37 2013 @@ -50,7 +50,7 @@ reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 reactos/dll/win32/advpack # Synced to Wine-1.7.1 -reactos/dll/win32/atl # Synced to Wine-1.5.19 +reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 reactos/dll/win32/avifil32 # Synced to Wine-1.5.26

11 years, 3 months

[akhaldi] 60109: [ATL80] * Add an importlib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 17:49:35 2013 New Revision: 60109 URL: http://svn.reactos.org/svn/reactos?rev=60109&view=rev Log: [ATL80] * Add an importlib. Modified: trunk/reactos/dll/win32/atl80/CMakeLists.txt Modified: trunk/reactos/dll/win32/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/atl80/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl80/CMakeLists.txt [iso-8859-1] Sat Sep 14 17:49:35 2013 @@ -3,7 +3,7 @@ -D__WINESRC__ -D_ATL_VER=_ATL_VER_80) -spec2def(atl80.dll atl80.spec) +spec2def(atl80.dll atl80.spec ADD_IMPORTLIB) list(APPEND SOURCE atl80.c

11 years, 3 months

[akhaldi] 60108: [ATL80_WINETEST] * Import from Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 17:43:11 2013 New Revision: 60108 URL: http://svn.reactos.org/svn/reactos?rev=60108&view=rev Log: [ATL80_WINETEST] * Import from Wine 1.7.1. Added: trunk/rostests/winetests/atl80/ trunk/rostests/winetests/atl80/CMakeLists.txt (with props) trunk/rostests/winetests/atl80/atl.c (with props) trunk/rostests/winetests/atl80/testlist.c (with props) 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] Sat Sep 14 17:43:11 2013 @@ -6,6 +6,7 @@ add_subdirectory(amstream) add_subdirectory(atl) add_subdirectory(atl100) +add_subdirectory(atl80) add_subdirectory(avifil32) add_subdirectory(browseui) add_subdirectory(cabinet) Added: trunk/rostests/winetests/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/CMakeList… ============================================================================== --- trunk/rostests/winetests/atl80/CMakeLists.txt (added) +++ trunk/rostests/winetests/atl80/CMakeLists.txt [iso-8859-1] Sat Sep 14 17:43:11 2013 @@ -0,0 +1,8 @@ + +add_definitions(-D_ATL_VER=_ATL_VER_80) +list(APPEND SOURCE atl.c testlist.c) +add_executable(atl80_winetest ${SOURCE}) +target_link_libraries(atl80_winetest wine uuid) +set_module_type(atl80_winetest win32cui) +add_importlibs(atl80_winetest atl80 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET atl80_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/atl80/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl80/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/atl.c?rev… ============================================================================== --- trunk/rostests/winetests/atl80/atl.c (added) +++ trunk/rostests/winetests/atl80/atl.c [iso-8859-1] Sat Sep 14 17:43:11 2013 @@ -0,0 +1,67 @@ +/* + * Copyright 2013 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +#include <wine/atlbase.h> +#include <mshtml.h> + +#include <wine/test.h> + +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + static const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin80, &wcex); + ok(ret, "AtlAxWin80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWinLic80, &wcex); + ok(ret, "AtlAxWinLic80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); +} + +START_TEST(atl) +{ + CoInitialize(NULL); + + test_ax_win(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/atl80/atl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl80/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/testlist.… ============================================================================== --- trunk/rostests/winetests/atl80/testlist.c (added) +++ trunk/rostests/winetests/atl80/testlist.c [iso-8859-1] Sat Sep 14 17:43:11 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_atl(void); + +const struct test winetest_testlist[] = +{ + { "atl", func_atl }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/atl80/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 3 months

[akhaldi] 60107: [ATL80] * Import from Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 14 17:42:03 2013 New Revision: 60107 URL: http://svn.reactos.org/svn/reactos?rev=60107&view=rev Log: [ATL80] * Import from Wine 1.7.1. Added: trunk/reactos/dll/win32/atl80/ (with props) trunk/reactos/dll/win32/atl80/CMakeLists.txt (with props) trunk/reactos/dll/win32/atl80/atl80.c (with props) trunk/reactos/dll/win32/atl80/atl80.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Sep 14 17:42:03 2013 @@ -7,6 +7,7 @@ add_subdirectory(advpack) add_subdirectory(atl) add_subdirectory(atl100) +add_subdirectory(atl80) add_subdirectory(authz) add_subdirectory(avicap32) add_subdirectory(avifil32) Propchange: trunk/reactos/dll/win32/atl80/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 14 17:42:03 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/atl80/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/atl80/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/atl80/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/atl80/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/atl80/CMakeLists.txt [iso-8859-1] Sat Sep 14 17:42:03 2013 @@ -0,0 +1,17 @@ + +add_definitions( + -D__WINESRC__ + -D_ATL_VER=_ATL_VER_80) + +spec2def(atl80.dll atl80.spec) + +list(APPEND SOURCE + atl80.c + ${CMAKE_CURRENT_BINARY_DIR}/atl80_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/atl80.def) + +add_library(atl80 SHARED ${SOURCE}) +set_module_type(atl80 win32dll) +target_link_libraries(atl80 wine) +add_importlibs(atl80 atl100 oleaut32 user32 ole32 msvcrt kernel32 ntdll) +add_cd_file(TARGET atl80 DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/atl80/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/atl80/atl80.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.c?re… ============================================================================== --- trunk/reactos/dll/win32/atl80/atl80.c (added) +++ trunk/reactos/dll/win32/atl80/atl80.c [iso-8859-1] Sat Sep 14 17:42:03 2013 @@ -0,0 +1,152 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winerror.h> +#include <winuser.h> +#include <wine/atlbase.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlRegisterTypeLib [atl80.18] + */ +HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!*iter || (clsid && !IsEqualCLSID((*iter)->pclsid, clsid))) + continue; + + TRACE("Registering clsid %s\n", debugstr_guid((*iter)->pclsid)); + hres = (*iter)->pfnUpdateRegistry(TRUE); + if(FAILED(hres)) + return hres; + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, TRUE); + if(FAILED(hres)) + return hres; + } + } + + if(bRegTypeLib) { + hres = AtlRegisterTypeLib(mod->m_hInstTypeLib, NULL); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + +/*********************************************************************** + * AtlRegisterTypeLib [atl80.19] + */ +HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) +{ + ITypeLib *typelib; + BSTR path; + HRESULT hres; + + TRACE("(%p %s)\n", inst, debugstr_w(index)); + + hres = AtlLoadTypeLib(inst, index, &path, &typelib); + if(FAILED(hres)) + return hres; + + hres = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ + ITypeLib_Release(typelib); + SysFreeString(path); + return hres; +} + +/*********************************************************************** + * AtlGetVersion [atl80.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} Propchange: trunk/reactos/dll/win32/atl80/atl80.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/atl80/atl80.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.spec… ============================================================================== --- trunk/reactos/dll/win32/atl80/atl80.spec (added) +++ trunk/reactos/dll/win32/atl80/atl80.spec [iso-8859-1] Sat Sep 14 17:42:03 2013 @@ -0,0 +1,53 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +18 stdcall AtlComModuleRegisterServer(ptr long ptr) +19 stdcall AtlRegisterTypeLib(ptr wstr) +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +55 stub AtlUnRegisterTypeLib +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm Propchange: trunk/reactos/dll/win32/atl80/atl80.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 14 17:42:03 2013 @@ -52,6 +52,7 @@ reactos/dll/win32/advpack # Synced to Wine-1.7.1 reactos/dll/win32/atl # Synced to Wine-1.5.19 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 +reactos/dll/win32/atl80 # Synced to Wine-1.7.1 reactos/dll/win32/avifil32 # Synced to Wine-1.5.26 reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 reactos/dll/win32/browseui # Out of sync

11 years, 3 months

← Newer
1
...
35
36
37
38
39
40
41
...
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