From 98fa3bb8d8e3d7bfc6ac3d8f6bcbf806b3c59e68 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Tue, 30 Nov 2010 22:31:17 +0000
Subject: [PATCH] [CMAKE] Fix msvcrt and query build.

svn path=/branches/cmake-bringup/; revision=49878
---
 dll/win32/msvcrt/CMakeLists.txt              |  2 +-
 dll/win32/msvcrt/{msvcrt_stubs.c => stubs.c} | 16 ++++------------
 dll/win32/query/CMakeLists.txt               |  6 +++++-
 3 files changed, 10 insertions(+), 14 deletions(-)
 rename dll/win32/msvcrt/{msvcrt_stubs.c => stubs.c} (81%)

diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index 630ac820565..da31ce569c8 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -17,7 +17,7 @@ set_rc_compiler()
 
 list(APPEND SOURCE
      dllmain.c
-     msvcrt_stubs.c
+     stubs.c
      msvcrt.rc
      ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def)
 
diff --git a/dll/win32/msvcrt/msvcrt_stubs.c b/dll/win32/msvcrt/stubs.c
similarity index 81%
rename from dll/win32/msvcrt/msvcrt_stubs.c
rename to dll/win32/msvcrt/stubs.c
index ed661a54e49..a294a357161 100644
--- a/dll/win32/msvcrt/msvcrt_stubs.c
+++ b/dll/win32/msvcrt/stubs.c
@@ -5,15 +5,7 @@
 #include "wine/config.h"
 #include "wine/exception.h"
 
-void __wine_spec_unimplemented_stub( const char *module, const char *function )
-{
-    ULONG_PTR args[2];
-
-    args[0] = (ULONG_PTR)module;
-    args[1] = (ULONG_PTR)function;
-    RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
-}
-
+void __wine_spec_unimplemented_stub( const char *module, const char *function );
 #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__)
 
 int __get_app_type()
@@ -54,19 +46,19 @@ int _ismbbkprint(
 }
 
 
-int MSVCRT__inp( 
+int MSVCRT__inp(
    unsigned short port)
 {
     return _inp(port);
 }
 
-unsigned short MSVCRT__inpw( 
+unsigned short MSVCRT__inpw(
    unsigned short port)
 {
     return _inpw(port);
 }
 
-unsigned long MSVCRT__inpd( 
+unsigned long MSVCRT__inpd(
    unsigned short port)
 {
     return _inpd(port);
diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt
index e8c96f20874..b48e4f6b63d 100644
--- a/dll/win32/query/CMakeLists.txt
+++ b/dll/win32/query/CMakeLists.txt
@@ -4,7 +4,11 @@ add_definitions(-D__WINESRC__)
 
 spec2def(query.dll query.spec)
 
-add_library(query SHARED query_main.c ${CMAKE_CURRENT_BINARY_DIR}/query.def)
+list(APPEND SOURCE
+    query_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/query.def)
+
+add_library(query SHARED ${SOURCE})
 
 set_module_type(query win32dll)