Author: akhaldi Date: Sat Sep 28 15:03:41 2013 New Revision: 60411
URL: http://svn.reactos.org/svn/reactos?rev=60411&view=rev Log: [STI] * Sync with Wine 1.7.1. CORE-7469
Removed: trunk/reactos/dll/win32/sti/sti_private.h Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/sti/sti_wia.idl trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.tx... ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( -D__WINESRC__ @@ -9,19 +6,17 @@ -DWINE_REGISTER_DLL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(sti.dll sti.spec)
list(APPEND SOURCE sti.c sti_main.c - sti.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
add_rpcproxy_files(sti_wia.idl) -add_library(sti SHARED ${SOURCE}) +add_library(sti SHARED ${SOURCE} sti.rc) set_module_type(sti win32dll) target_link_libraries(sti wine uuid ${PSEH_LIB}) add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll)
Removed: trunk/reactos/dll/win32/sti/sti_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_private.h... ============================================================================== --- trunk/reactos/dll/win32/sti/sti_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_private.h (removed) @@ -1,32 +0,0 @@ -/* - * STI private definitions - * - * Copyright 2009 Damjan Jovanovic - * - * 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 - */ - -#ifndef __STI_PRIVATE__ -#define __STI_PRIVATE__ - -typedef struct _stillimage -{ - const struct IStillImageWVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; - IUnknown *pUnkOuter; - LONG ref; -} stillimage; - -#endif /* __STI_PRIVATE__ */
Modified: trunk/reactos/dll/win32/sti/sti_wia.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?r... ============================================================================== --- trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -18,7 +18,6 @@
#include "wia_lh.idl"
-#ifdef __WIDL__ [ threading(both), uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */ @@ -30,4 +29,3 @@ uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) ] coclass StillImage { interface IStillImageW; } -#endif
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -184,7 +184,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 -reactos/dll/win32/sti # Synced to Wine-1.5.4 +reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.5.4 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.19
-
akhaldi＠svn.reactos.org