Module: wine Branch: master Commit: 0e658d111c41da4188f393fd2a1b06b25de6a7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e658d111c41da4188f393fd2a...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Jan 28 10:10:01 2014 +0100
msvcm90: Share the source code with msvcm80.
---
dlls/msvcm80/Makefile.in | 2 +- dlls/msvcm80/{msvcm80_main.c => msvcm_main.c} | 0 dlls/msvcm90/Makefile.in | 3 +- dlls/msvcm90/msvcm90_main.c | 43 ------------------------- 4 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index bbef214..c3bf20e 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,4 +1,4 @@ MODULE = msvcm80.dll
C_SRCS = \ - msvcm80_main.c + msvcm_main.c diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm_main.c similarity index 100% rename from dlls/msvcm80/msvcm80_main.c rename to dlls/msvcm80/msvcm_main.c diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index a543df3..6b03a53 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcm90.dll +PARENTSRC = ../msvcm80
C_SRCS = \ - msvcm90_main.c + msvcm_main.c diff --git a/dlls/msvcm90/msvcm90_main.c b/dlls/msvcm90/msvcm90_main.c deleted file mode 100644 index 6019afd..0000000 --- a/dlls/msvcm90/msvcm90_main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Vincent Povirk for CodeWeavers - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcm90); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}