Module: wine Branch: master Commit: 7f2be06f931de32cc0de1db48aa77cef0aade52f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2be06f931de32cc0de1db48...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 30 09:16:24 2019 +0200
d3dx10: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx10_33/Makefile.in | 2 ++ dlls/d3dx10_33/d3dx10_33_main.c | 3 --- dlls/d3dx10_34/Makefile.in | 2 ++ dlls/d3dx10_34/d3dx10_34_main.c | 3 --- dlls/d3dx10_35/Makefile.in | 2 ++ dlls/d3dx10_35/d3dx10_35_main.c | 3 --- dlls/d3dx10_36/Makefile.in | 2 ++ dlls/d3dx10_36/d3dx10_36_main.c | 3 --- dlls/d3dx10_37/Makefile.in | 2 ++ dlls/d3dx10_37/d3dx10_37_main.c | 3 --- dlls/d3dx10_38/Makefile.in | 2 ++ dlls/d3dx10_38/d3dx10_38_main.c | 3 --- dlls/d3dx10_39/Makefile.in | 2 ++ dlls/d3dx10_39/d3dx10_39_main.c | 3 --- dlls/d3dx10_40/Makefile.in | 2 ++ dlls/d3dx10_40/d3dx10_40_main.c | 3 --- dlls/d3dx10_41/Makefile.in | 2 ++ dlls/d3dx10_41/d3dx10_41_main.c | 3 --- dlls/d3dx10_42/Makefile.in | 2 ++ dlls/d3dx10_42/d3dx10_42_main.c | 3 --- dlls/d3dx10_43/Makefile.in | 2 ++ dlls/d3dx10_43/async.c | 7 ++----- dlls/d3dx10_43/d3dx10_43_main.c | 3 --- 23 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in index 7080752..e74bb22 100644 --- a/dlls/d3dx10_33/Makefile.in +++ b/dlls/d3dx10_33/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_33.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_33_main.c
diff --git a/dlls/d3dx10_33/d3dx10_33_main.c b/dlls/d3dx10_33/d3dx10_33_main.c index 3aaf41a..68c52ff 100644 --- a/dlls/d3dx10_33/d3dx10_33_main.c +++ b/dlls/d3dx10_33/d3dx10_33_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in index ab5ac6c..2ad26f8 100644 --- a/dlls/d3dx10_34/Makefile.in +++ b/dlls/d3dx10_34/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_34.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_34_main.c
diff --git a/dlls/d3dx10_34/d3dx10_34_main.c b/dlls/d3dx10_34/d3dx10_34_main.c index 0c50efa..74224d5 100644 --- a/dlls/d3dx10_34/d3dx10_34_main.c +++ b/dlls/d3dx10_34/d3dx10_34_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 8a24ab5..c7e52a4 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_35.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_35_main.c
diff --git a/dlls/d3dx10_35/d3dx10_35_main.c b/dlls/d3dx10_35/d3dx10_35_main.c index d92c56a..9f78e22 100644 --- a/dlls/d3dx10_35/d3dx10_35_main.c +++ b/dlls/d3dx10_35/d3dx10_35_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index d6c5c31..b3be0ed 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_36.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_36_main.c
diff --git a/dlls/d3dx10_36/d3dx10_36_main.c b/dlls/d3dx10_36/d3dx10_36_main.c index 06de8c3..367755d 100644 --- a/dlls/d3dx10_36/d3dx10_36_main.c +++ b/dlls/d3dx10_36/d3dx10_36_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index 047edee..2d66b62 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_37.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_37_main.c
diff --git a/dlls/d3dx10_37/d3dx10_37_main.c b/dlls/d3dx10_37/d3dx10_37_main.c index 6b03681..6294d3b 100644 --- a/dlls/d3dx10_37/d3dx10_37_main.c +++ b/dlls/d3dx10_37/d3dx10_37_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 47005a6..7c32ea4 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_38.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_38_main.c
diff --git a/dlls/d3dx10_38/d3dx10_38_main.c b/dlls/d3dx10_38/d3dx10_38_main.c index 5a5ba23..984aa71 100644 --- a/dlls/d3dx10_38/d3dx10_38_main.c +++ b/dlls/d3dx10_38/d3dx10_38_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index cac7d28..8df5714 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_39.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_39_main.c
diff --git a/dlls/d3dx10_39/d3dx10_39_main.c b/dlls/d3dx10_39/d3dx10_39_main.c index 33daa9a..bf57729 100644 --- a/dlls/d3dx10_39/d3dx10_39_main.c +++ b/dlls/d3dx10_39/d3dx10_39_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index 7be8758..760a3ac 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_40.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_40_main.c
diff --git a/dlls/d3dx10_40/d3dx10_40_main.c b/dlls/d3dx10_40/d3dx10_40_main.c index 0725871..3a10f4d 100644 --- a/dlls/d3dx10_40/d3dx10_40_main.c +++ b/dlls/d3dx10_40/d3dx10_40_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 8335269..0199bc0 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_41.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_41_main.c
diff --git a/dlls/d3dx10_41/d3dx10_41_main.c b/dlls/d3dx10_41/d3dx10_41_main.c index e8680d8..0162032 100644 --- a/dlls/d3dx10_41/d3dx10_41_main.c +++ b/dlls/d3dx10_41/d3dx10_41_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index 1050d9b..ffdf750 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3dx10_42.dll
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dx10_42_main.c
diff --git a/dlls/d3dx10_42/d3dx10_42_main.c b/dlls/d3dx10_42/d3dx10_42_main.c index 6c11678..81c400e 100644 --- a/dlls/d3dx10_42/d3dx10_42_main.c +++ b/dlls/d3dx10_42/d3dx10_42_main.c @@ -19,9 +19,6 @@ * */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h>
#define COBJMACROS diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 5f1eccb..2d0343f 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c7d80c9..062a04d 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -16,14 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" #include "d3d10_1.h" #include "d3dx10.h" #include "d3dcompiler.h"
#include "wine/debug.h" -#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -318,13 +315,13 @@ HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLo return E_OUTOFMEMORY;
object->ID3DX10DataLoader_iface.lpVtbl = &filedataloadervtbl; - object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR)); + object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!object->u.file.path) { HeapFree(GetProcessHeap(), 0, object); return E_OUTOFMEMORY; } - strcpyW(object->u.file.path, filename); + lstrcpyW(object->u.file.path, filename); object->data = NULL; object->size = 0;
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0edb3a9..b0295cc 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -19,10 +19,7 @@ * */
-#include "config.h" -#include "wine/port.h" #include "wine/debug.h" -#include "wine/unicode.h"
#include <stdarg.h>
-
Alexandre Julliard