wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Matteo Bruni : d3dcompiler_37: Stub dll.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 3c59b9c63189461a6ac39735a87453fd0e141ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c59b9c63189461a6ac39735a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 16:22:11 2010 +0200 d3dcompiler_37: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_37/Makefile.in | 12 ++++++++ dlls/d3dcompiler_37/d3dcompiler_37.spec | 10 ++++++ dlls/d3dcompiler_37/d3dcompiler_37_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_37/version.rc | 27 +++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index dae089b..907dbe0 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_37 enable_d3dcompiler_37 wine_fn_config_dll d3dcompiler_38 enable_d3dcompiler_38 wine_fn_config_dll d3dcompiler_39 enable_d3dcompiler_39 wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 diff --git a/configure.ac b/configure.ac index 19cb296..0f61046 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_37) WINE_CONFIG_DLL(d3dcompiler_38) WINE_CONFIG_DLL(d3dcompiler_39) WINE_CONFIG_DLL(d3dcompiler_40) diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in new file mode 100644 index 0000000..f14646f --- /dev/null +++ b/dlls/d3dcompiler_37/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_37.dll + +C_SRCS = \ + d3dcompiler_37_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_37/d3dcompiler_37.spec b/dlls/d3dcompiler_37/d3dcompiler_37.spec new file mode 100644 index 0000000..5e20e1a --- /dev/null +++ b/dlls/d3dcompiler_37/d3dcompiler_37.spec @@ -0,0 +1,10 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_37/d3dcompiler_37_main.c b/dlls/d3dcompiler_37/d3dcompiler_37_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_37/d3dcompiler_37_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_37/version.rc b/dlls/d3dcompiler_37/version.rc new file mode 100644 index 0000000..adf01c7 --- /dev/null +++ b/dlls/d3dcompiler_37/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_37.dll" +#define WINE_FILEVERSION 9,22,949,2248 +#define WINE_FILEVERSION_STR "9.22.949.2248" +#define WINE_PRODUCTVERSION 9,22,949,2248 +#define WINE_PRODUCTVERSION_STR "9.22.949.2248" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_38: Stub dll.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: fbf1e835a1bed76e4e4ea97202e01633bda574ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf1e835a1bed76e4e4ea9720… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 16:13:40 2010 +0200 d3dcompiler_38: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_38/Makefile.in | 12 ++++++++ dlls/d3dcompiler_38/d3dcompiler_38.spec | 11 +++++++ dlls/d3dcompiler_38/d3dcompiler_38_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_38/version.rc | 27 +++++++++++++++++ 6 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8c84dcc..dae089b 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_38 enable_d3dcompiler_38 wine_fn_config_dll d3dcompiler_39 enable_d3dcompiler_39 wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 diff --git a/configure.ac b/configure.ac index b789f06..19cb296 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_38) WINE_CONFIG_DLL(d3dcompiler_39) WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in new file mode 100644 index 0000000..635938d --- /dev/null +++ b/dlls/d3dcompiler_38/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_38.dll + +C_SRCS = \ + d3dcompiler_38_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_38/d3dcompiler_38.spec b/dlls/d3dcompiler_38/d3dcompiler_38.spec new file mode 100644 index 0000000..9214bc1 --- /dev/null +++ b/dlls/d3dcompiler_38/d3dcompiler_38.spec @@ -0,0 +1,11 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_38/d3dcompiler_38_main.c b/dlls/d3dcompiler_38/d3dcompiler_38_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_38/d3dcompiler_38_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_38/version.rc b/dlls/d3dcompiler_38/version.rc new file mode 100644 index 0000000..44c359d --- /dev/null +++ b/dlls/d3dcompiler_38/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_38.dll" +#define WINE_FILEVERSION 9,23,949,2378 +#define WINE_FILEVERSION_STR "9.23.949.2378" +#define WINE_PRODUCTVERSION 9,23,949,2378 +#define WINE_PRODUCTVERSION_STR "9.23.949.2378" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_39: Stub dll.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 99491464d9b1cf89c6884dbe2267195457809d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99491464d9b1cf89c6884dbe2… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 04:31:18 2010 +0200 d3dcompiler_39: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_39/Makefile.in | 12 ++++++++ dlls/d3dcompiler_39/d3dcompiler_39.spec | 11 +++++++ dlls/d3dcompiler_39/d3dcompiler_39_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_39/version.rc | 27 +++++++++++++++++ 6 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 76b6f4d..8c84dcc 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_39 enable_d3dcompiler_39 wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 diff --git a/configure.ac b/configure.ac index 6a30324..b789f06 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_39) WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in new file mode 100644 index 0000000..789c550 --- /dev/null +++ b/dlls/d3dcompiler_39/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_39.dll + +C_SRCS = \ + d3dcompiler_39_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_39/d3dcompiler_39.spec b/dlls/d3dcompiler_39/d3dcompiler_39.spec new file mode 100644 index 0000000..9214bc1 --- /dev/null +++ b/dlls/d3dcompiler_39/d3dcompiler_39.spec @@ -0,0 +1,11 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_39/d3dcompiler_39_main.c b/dlls/d3dcompiler_39/d3dcompiler_39_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_39/d3dcompiler_39_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_39/version.rc b/dlls/d3dcompiler_39/version.rc new file mode 100644 index 0000000..0a229b2 --- /dev/null +++ b/dlls/d3dcompiler_39/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_39.dll" +#define WINE_FILEVERSION 9,24,949,2307 +#define WINE_FILEVERSION_STR "9.24.949.2307" +#define WINE_PRODUCTVERSION 9,24,949,2307 +#define WINE_PRODUCTVERSION_STR "9.24.949.2307" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_40: Stub dll.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: fd4efcd0b1bbe8e0a27f17080141d6e1b7df996b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4efcd0b1bbe8e0a27f17080… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 04:09:13 2010 +0200 d3dcompiler_40: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_40/Makefile.in | 12 ++++++++ dlls/d3dcompiler_40/d3dcompiler_40.spec | 12 ++++++++ dlls/d3dcompiler_40/d3dcompiler_40_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_40/version.rc | 27 +++++++++++++++++ 6 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4549b38..76b6f4d 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler diff --git a/configure.ac b/configure.ac index 5b56bb9..6a30324 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in new file mode 100644 index 0000000..4fa8e16 --- /dev/null +++ b/dlls/d3dcompiler_40/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_40.dll + +C_SRCS = \ + d3dcompiler_40_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_40/d3dcompiler_40.spec b/dlls/d3dcompiler_40/d3dcompiler_40.spec new file mode 100644 index 0000000..858600e --- /dev/null +++ b/dlls/d3dcompiler_40/d3dcompiler_40.spec @@ -0,0 +1,12 @@ +@ stub DebugSetMute +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader diff --git a/dlls/d3dcompiler_40/d3dcompiler_40_main.c b/dlls/d3dcompiler_40/d3dcompiler_40_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_40/d3dcompiler_40_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_40/version.rc b/dlls/d3dcompiler_40/version.rc new file mode 100644 index 0000000..8ddf001 --- /dev/null +++ b/dlls/d3dcompiler_40/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_40.dll" +#define WINE_FILEVERSION 9,24,950,2656 +#define WINE_FILEVERSION_STR "9.24.950.2656" +#define WINE_PRODUCTVERSION 9,24,950,2656 +#define WINE_PRODUCTVERSION_STR "9.24.950.2656" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler: Remove useless kernel32 imports.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 8532ff60f9bde3d1959f43f4e7d9509dd808ed1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8532ff60f9bde3d1959f43f4e… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Aug 16 16:13:19 2010 +0200 d3dcompiler: Remove useless kernel32 imports. --- dlls/d3dcompiler_41/Makefile.in | 1 - dlls/d3dcompiler_42/Makefile.in | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index bbdd6af..763cbd2 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dcompiler_41.dll -IMPORTS = kernel32 C_SRCS = \ d3dcompiler_41_main.c diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 5d0a4a2..9d13198 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dcompiler_42.dll -IMPORTS = kernel32 C_SRCS = \ d3dcompiler_42_main.c

1 0

Andrew Eikum : hlink: Implement HLINKGETREF flags handling.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: cb5eb331590c96c26ab50cfe9ae96692dfcca34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5eb331590c96c26ab50cfe9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 16 13:55:14 2010 -0500 hlink: Implement HLINKGETREF flags handling. --- dlls/hlink/link.c | 101 ++++++++++++----- dlls/hlink/tests/hlink.c | 272 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 334 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb5eb331590c96c26ab50…

1 0

André Hentschel : ntdll: Add more error codes.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 40bc5f646f522e16d75c05a03293acc7535d29bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc5f646f522e16d75c05a03… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Mon Aug 16 19:46:39 2010 +0200 ntdll: Add more error codes. --- dlls/ntdll/error.c | 55 ++++++++++++----- dlls/ntdll/tests/error.c | 29 +++++++++ include/winerror.h | 151 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40bc5f646f522e16d75c0…

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 80e85cdb89a7e44c842dff30f188512bdd2b309f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e85cdb89a7e44c842dff30f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 16 21:10:00 2010 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index a5247a8..7d62eb6 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -1,7 +1,7 @@ /* * French resources for jscript * - * Copyright 2009 Frédéric Delanoy + * Copyright 2009-2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +31,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" IDS_CREATE_OBJ_ERROR "Le serveur d'automatisation ne peut créer l'objet" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" + IDS_UNSUPPORTED_ACTION "Cet objet ne supporte pas cette action" IDS_ARG_NOT_OPT "Argument non optionnel" IDS_SYNTAX_ERROR "Erreur de syntaxe" IDS_SEMICOLON "« ; » attendu"

1 0

Vincent Povirk : gdiplus: Add tests for the HDC' s we get from bitmap objects.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 728aaf2902840a3eccfb9e462e8e2a4bde7f652d URL: http://source.winehq.org/git/wine.git/?a=commit;h=728aaf2902840a3eccfb9e462… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 16 15:47:17 2010 -0500 gdiplus: Add tests for the HDC's we get from bitmap objects. --- dlls/gdiplus/tests/graphics.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 609f426..9fae06c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2157,6 +2157,8 @@ static void test_fromMemoryBitmap(void) GpGraphics *graphics = NULL; GpBitmap *bitmap = NULL; BYTE bits[48] = {0}; + HDC hdc=NULL; + COLORREF color; status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, bits, &bitmap); expect(Ok, status); @@ -2172,6 +2174,50 @@ static void test_fromMemoryBitmap(void) /* drawing writes to the memory provided */ todo_wine expect(0x68, bits[10]); + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + /* The HDC is write-only, and native fills with a solid color to figure out + * which pixels have changed. */ + todo_wine expect(0x0c0b0d, color); + + SetPixel(hdc, 0, 0, 0x797979); + SetPixel(hdc, 1, 0, 0x0c0b0d); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + todo_wine expect(0x79, bits[0]); + todo_wine expect(0x68, bits[3]); + + GdipDisposeImage((GpImage*)bitmap); + + /* We get the same kind of write-only HDC for a "normal" bitmap */ + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + todo_wine expect(0x0c0b0d, color); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); }

1 0

Vincent Povirk : gdiplus: Use the software method to draw HBITMAP-less bitmaps.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 2a345f36e3548a91611f0ed219a3024983128dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a345f36e3548a91611f0ed21… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 16 14:53:07 2010 -0500 gdiplus: Use the software method to draw HBITMAP-less bitmaps. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e748477..8850110 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2046,7 +2046,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return GenericError; } } - else if (image->type == ImageTypeBitmap && ((GpBitmap*)image)->hbitmap) + else if (image->type == ImageTypeBitmap) { GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; @@ -2060,6 +2060,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || + !((GpBitmap*)image)->hbitmap || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) use_software = 1;

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010