msvcp110: Share the source code with msvcp90.

This commit is contained in:
Piotr Caban 2014-01-07 15:20:57 +01:00 committed by Alexandre Julliard
parent f8a18f9c90
commit 50e3f110d0
4 changed files with 2944 additions and 2955 deletions

View file

@ -1,3 +1,16 @@
MODULE = msvcp110.dll MODULE = msvcp110.dll
IMPORTS = msvcr110
MODCFLAGS = @BUILTINFLAG@
EXTRAINCL = -I$(top_srcdir)/include/msvcrt
EXTRADEFS = -D_MSVCP_VER=110
PARENTSRC = ../msvcp90
C_SRCS = msvcp110.c C_SRCS = \
exception.c \
ios.c \
locale.c \
math.c \
memory.c \
misc.c \
msvcp_main.c \
string.c

View file

@ -1,37 +0,0 @@
/*
* msvcp110 specific functions
*
* Copyright 2013 Stefan Leichter
*
* 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
*/
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hdll);
}
return TRUE;
}

File diff suppressed because it is too large Load diff

View file

@ -43,12 +43,25 @@ char* __cdecl _Getdays(void);
char* __cdecl _Getmonths(void); char* __cdecl _Getmonths(void);
void* __cdecl _Gettnames(void); void* __cdecl _Gettnames(void);
unsigned int __cdecl ___lc_codepage_func(void); unsigned int __cdecl ___lc_codepage_func(void);
LCID* __cdecl ___lc_handle_func(void);
const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t);
MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*,
const struct tm*, struct __lc_time_data*); const struct tm*, struct __lc_time_data*);
const locale* __cdecl locale_classic(void); const locale* __cdecl locale_classic(void);
#if _MSVCP_VER >= 110
static LCID* ___lc_handle_func(void)
{
LCID *ret;
_locale_t loc = _get_current_locale();
ret = loc->locinfo->lc_handle;
_free_locale(loc);
return ret;
}
#else
LCID* __cdecl ___lc_handle_func(void);
#endif
#if _MSVCP_VER < 100 #if _MSVCP_VER < 100
#define locale_string basic_string_char #define locale_string basic_string_char
#define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str) #define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str)