Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STI]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60411
This commit is contained in:
Amine Khaldi 2013-09-28 15:03:41 +00:00
parent aebf7749f2
commit 716351aaa5
4 changed files with 2 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/sti/CMakeLists.txt
View file

@ -1,7 +1,4 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-DENTRY_PREFIX=STI_ -DENTRY_PREFIX=STI_
@ -9,19 +6,17 @@ add_definitions(
-DWINE_REGISTER_DLL) -DWINE_REGISTER_DLL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(sti.dll sti.spec) spec2def(sti.dll sti.spec)
list(APPEND SOURCE list(APPEND SOURCE
sti.c sti.c
sti_main.c sti_main.c
sti.rc
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c
${CMAKE_CURRENT_BINARY_DIR}/sti.def) ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
add_rpcproxy_files(sti_wia.idl) add_rpcproxy_files(sti_wia.idl)
add_library(sti SHARED ${SOURCE}) add_library(sti SHARED ${SOURCE} sti.rc)
set_module_type(sti win32dll) set_module_type(sti win32dll)
target_link_libraries(sti wine uuid ${PSEH_LIB}) target_link_libraries(sti wine uuid ${PSEH_LIB})
add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll) add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll)

32
reactos/dll/win32/sti/sti_private.h
View file

@ -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__ */

2
reactos/dll/win32/sti/sti_wia.idl
View file

@ -18,7 +18,6 @@
#include "wia_lh.idl" #include "wia_lh.idl"
#ifdef __WIDL__
[ [
threading(both), threading(both),
uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */ uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */
@ -30,4 +29,3 @@ coclass PSFactoryBuffer { interface IFactoryBuffer; }
uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c)
] ]
coclass StillImage { interface IStillImageW; } coclass StillImage { interface IStillImageW; }
#endif

2
reactos/media/doc/README.WINE
View file

@ -184,7 +184,7 @@ reactos/dll/win32/softpub # Synced to Wine-1.5.19
reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/spoolss # Synced to Wine-1.7.1
reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 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/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/sxs # Synced to Wine-1.5.4
reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/tapi32 # Autosync
reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/traffic # Synced to Wine-1.5.19