[ros-diffs] [spetreolle] 49878: [CMAKE] Fix msvcrt and query build.

Author: spetreolle
Date: Tue Nov 30 22:31:17 2010
New Revision: 49878

URL: http://svn.reactos.org/svn/reactos?rev=49878&view=rev
Log:
[CMAKE]
Fix msvcrt and query build.

Added:
    branches/cmake-bringup/dll/win32/msvcrt/stubs.c
      - copied, changed from r49877, branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c
Removed:
    branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c
Modified:
    branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt
    branches/cmake-bringup/dll/win32/query/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/C...
==============================================================================
--- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Tue Nov 30 22:31:17 2010
@@ -17,7 +17,7 @@

list(APPEND SOURCE
      dllmain.c
-     msvcrt_stubs.c
+     stubs.c
      msvcrt.rc
      ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def)

Removed: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/m...
==============================================================================
--- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c (removed)
@@ -1,95 +1,0 @@
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#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 );
-}
-
-#define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__)
-
-int __get_app_type()
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
-int _fileinfo;
-
-void *
-__p__fileinfo()
-{
-    return &_fileinfo;
-}
-
-unsigned char _mbcasemap[1];
-
-void *
-__p__mbcasemap()
-{
-    return _mbcasemap;
-}
-
-int _atodbl(
-   void * value,
-   char * str)
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
-int _ismbbkprint(
-   unsigned int c)
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
-
-int MSVCRT__inp( 
-   unsigned short port)
-{
-    return _inp(port);
-}
-
-unsigned short MSVCRT__inpw( 
-   unsigned short port)
-{
-    return _inpw(port);
-}
-
-unsigned long MSVCRT__inpd( 
-   unsigned short port)
-{
-    return _inpd(port);
-}
-
-
-int MSVCRT__outp(
-   unsigned short port,
-   int databyte)
-{
-    return _outp(port, databyte);
-}
-
-unsigned short MSVCRT__outpw(
-   unsigned short port,
-   unsigned short dataword)
-{
-    return _outpw(port, dataword);
-}
-
-unsigned long MSVCRT__outpd(
-   unsigned short port,
-   unsigned long dataword)
-{
-    return _outpd(port, dataword);
-}

Copied: branches/cmake-bringup/dll/win32/msvcrt/stubs.c (from r49877, branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c)
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/s...
==============================================================================
--- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Tue Nov 30 22:31:17 2010
@@ -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 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);

Modified: branches/cmake-bringup/dll/win32/query/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/CM...
==============================================================================
--- branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] Tue Nov 30 22:31:17 2010
@@ -4,7 +4,11 @@

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)