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

[STI]

Browse source 
* Create a main header and move some inclusions to it.
* Set the default debugging channel globally through the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61814
This commit is contained in:
Amine Khaldi 2014-01-25 18:44:55 +00:00
parent bdc225df74
commit d949029f99
5 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ spec2def(sti.dll sti.spec)
list(APPEND SOURCE list(APPEND SOURCE
sti.c sti.c
sti_main.c sti_main.c
guid.c
${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)

14
reactos/dll/win32/sti/guid.c Normal file
View file

@ -0,0 +1,14 @@
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <windef.h>
#include <winbase.h>
#include <initguid.h>
#include <sti.h>
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

19
reactos/dll/win32/sti/precomp.h Normal file
View file

@ -0,0 +1,19 @@
#ifndef _STI_PCH_
#define _STI_PCH_
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <sti.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(sti);
#endif /* _STI_PCH_ */

16
reactos/dll/win32/sti/sti.c
View file

@ -17,26 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <winreg.h> #include <winreg.h>
//#include "winerror.h"
//#include "objbase.h"
#include <sti.h>
#include <wine/debug.h>
#include <wine/unicode.h> #include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(sti);
static const WCHAR registeredAppsLaunchPath[] = { static const WCHAR registeredAppsLaunchPath[] = {
'S','O','F','T','W','A','R','E','\\', 'S','O','F','T','W','A','R','E','\\',
'M','i','c','r','o','s','o','f','t','\\', 'M','i','c','r','o','s','o','f','t','\\',

21
reactos/dll/win32/sti/sti_main.c
View file

@ -17,26 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winreg.h"
//#include "winerror.h"
//#include "objbase.h"
#include <initguid.h>
//#include "wia_lh.h"
#include <sti.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(sti);
extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;