June 2016 - Wine-Commits - list.winehq.org

Hugh McMaster : reg: Always output the long key name when printing strings.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: ecdd3c8e84bac9be42686b576b64ee49674ee4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdd3c8e84bac9be42686b576… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 15 02:31:05 2016 +0000 reg: Always output the long key name when printing strings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6f8a882..38861f8 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -818,7 +818,34 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } -static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) +static WCHAR *get_long_key(HKEY root, WCHAR *path) +{ + DWORD i, array_size = ARRAY_SIZE(root_rels), len; + WCHAR *long_key; + WCHAR fmt[] = {'%','s','\\','%','s',0}; + + for (i = 0; i < array_size; i++) + { + if (root == root_rels[i].key) + break; + } + + len = strlenW(root_rels[i].long_name); + + if (!path) + { + long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + strcpyW(long_key, root_rels[i].long_name); + return long_key; + } + + len += strlenW(path) + 1; /* add one for the backslash */ + long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + sprintfW(long_key, fmt, root_rels[i].long_name, path); + return long_key; +} + +static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) { if (!sane_path(key)) return FALSE; @@ -833,6 +860,8 @@ static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) *path = strchrW(key, '\\'); if (*path) (*path)++; + *long_key = get_long_key(*root, *path); + return TRUE; } @@ -924,11 +953,9 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - if (!parse_registry_key(argvW[2], &root, &path)) + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; - key_name = argvW[2]; - for (i = 3; i < argc; i++) { if (argvW[i][0] == '/' || argvW[i][0] == '-')

1 0

Michael Stefaniuc : d3dx10/tests: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 16a64e993ddf98e52e6786d5a58b8b6be8a89dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a64e993ddf98e52e6786d5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 10 09:41:08 2016 +0200 d3dx10/tests: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index b8bfa1c..44c2333 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -516,8 +516,8 @@ float4 main(float4 color : COLOR) : SV_TARGET && tmp_rect[i].top == i * 2 && tmp_rect[i].right == i + 1 && tmp_rect[i].bottom == (i + 1) * 2, - "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n", - tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i); + "Got unexpected scissor rect %s in slot %u.\n", + wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,

1 0

Matteo Bruni : d3dx9: Turn an ERR into a WARN.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: c614f0b1b4cf0ee7c9e4f52aff50bfff0ad3f60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c614f0b1b4cf0ee7c9e4f52af… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:26 2016 +0200 d3dx9: Turn an ERR into a WARN. It can potentially happen if the application passes broken effect data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 78f3bdb..68301fe 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -524,7 +524,7 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab if (cdesc[i].Class == D3DXPC_OBJECT) TRACE("Object %s, parameter %p.\n", cdesc[i].Name, inputs_param[i]); else if (!inputs_param[i]) - ERR("Could not find parameter %s in effect.\n", cdesc[i].Name); + WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); } out->input_count = desc.Constants; out->inputs = cdesc;

1 0

Andrey Gusev : include: Add d3dx11.h.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 69b4b3385c903af2da1863c4d83ea63e11bb048b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b4b3385c903af2da1863c4d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 11:56:29 2016 +0300 include: Add d3dx11.h. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7c44c40..1612a94 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -256,6 +256,7 @@ HEADER_SRCS = \ d3dx10.h \ d3dx10async.h \ d3dx10tex.h \ + d3dx11.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx11.h b/include/d3dx11.h new file mode 100644 index 0000000..52191da --- /dev/null +++ b/include/d3dx11.h @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Andrey Gusev + * + * 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 + */ + +#ifndef __D3DX11_H__ +#define __D3DX11_H__ + +#include <limits.h> +#include <float.h> + +#define D3DX11_DEFAULT (0xffffffffu) +#define D3DX11_FROM_FILE (0xfffffffdu) +#define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) + +#include "d3d11.h" + +#endif

1 0

Jacek Caban : mshtmdid.h: Fixed IHTMLDocument6 DISPIDs.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 66462b4ef83deae533360a79002d111dcd938b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66462b4ef83deae533360a790… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 14 22:02:44 2016 +0200 mshtmdid.h: Fixed IHTMLDocument6 DISPIDs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d17af33..6d66dd6 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1136,8 +1136,8 @@ #define DISPID_IHTMLDOCUMENT6_DOCUMENTMODE DISPID_OMDOCUMENT+104 #define DISPID_IHTMLDOCUMENT6_ONSTORAGE DISPID_EVPROP_ONSTORAGE #define DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT DISPID_EVPROP_ONSTORAGECOMMIT -#define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 -#define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 +#define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+107 +#define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+109 /* IHTMLDocument7 */ #define DISPID_IHTMLDOCUMENT7_DEFAULTVIEW DISPID_OMDOCUMENT+110

1 0

Matteo Bruni : d3dx11: Implement D3DX11CompileFromMemory().
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: f7a1491a5ebd7d8ae3e9db55a8b49e66a08e6be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a1491a5ebd7d8ae3e9db55a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:24 2016 +0200 d3dx11: Implement D3DX11CompileFromMemory(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/Makefile.in | 6 +++++- dlls/d3dx11_43/async.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.c | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- include/Makefile.in | 1 + include/d3dx11async.h | 37 +++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6151ef8..d1a6a68 100755 --- a/configure +++ b/configure @@ -17595,7 +17595,7 @@ wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 implib d3dx10 wine_fn_config_test dlls/d3dx10_43/tests d3dx10_43_test wine_fn_config_dll d3dx11_42 enable_d3dx11_42 -wine_fn_config_dll d3dx11_43 enable_d3dx11_43 +wine_fn_config_dll d3dx11_43 enable_d3dx11_43 implib d3dx11 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 wine_fn_config_dll d3dx9_26 enable_d3dx9_26 diff --git a/configure.ac b/configure.ac index a2b1705..7f234b2 100644 --- a/configure.ac +++ b/configure.ac @@ -2841,7 +2841,7 @@ WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10]) WINE_CONFIG_TEST(dlls/d3dx10_43/tests) WINE_CONFIG_DLL(d3dx11_42) -WINE_CONFIG_DLL(d3dx11_43) +WINE_CONFIG_DLL(d3dx11_43,,[implib],[d3dx11]) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) WINE_CONFIG_DLL(d3dx9_26) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 3fd291c..b917263 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stub D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx11_43.D3DX11CompileFromMemory @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index 8336602..1cc4911 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,5 +1,9 @@ MODULE = d3dx11_43.dll +IMPORTLIB = d3dx11 +IMPORTS = d3dcompiler -C_SRCS = d3dx11_43.c +C_SRCS = \ + async.c \ + d3dx11_43.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c new file mode 100644 index 0000000..c809f2c --- /dev/null +++ b/dlls/d3dx11_43/async.c @@ -0,0 +1,43 @@ +/* + * Copyright 2016 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 "d3dx11.h" +#include "d3dcompiler.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult) +{ + TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + "sflags %#x, eflage %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + + if (pump) + FIXME("Unimplemented ID3DX11ThreadPump handling.\n"); + + return D3DCompile(data, data_size, filename, defines, include, entry_point, target, + sflags, eflags, shader, error_messages); +} diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c index a609613..149d953 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "d3d11.h" +#include "d3dx11.h" BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 3fd291c..a2a32ff 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stub D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/include/Makefile.in b/include/Makefile.in index d981ac5..b2002a9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -258,6 +258,7 @@ HEADER_SRCS = \ d3dx10async.h \ d3dx10tex.h \ d3dx11.h \ + d3dx11async.h \ d3dx11tex.h \ d3dx9.h \ d3dx9anim.h \ diff --git a/include/d3dx11async.h b/include/d3dx11async.h new file mode 100644 index 0000000..210067b --- /dev/null +++ b/include/d3dx11async.h @@ -0,0 +1,37 @@ +/* + * Copyright 2016 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 + */ + +#ifndef __D3DX11ASYNC_H__ +#define __D3DX11ASYNC_H__ + +#include "d3dx11.h" + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Andrey Gusev : include: Add d3dx11tex.h.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 94711ead3b9c0f97164c4b26ee6d11ca53f1746f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94711ead3b9c0f97164c4b26e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 14 22:57:23 2016 +0200 include: Add d3dx11tex.h. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 1 + include/d3dx11tex.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9ffaff4..d981ac5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -258,6 +258,7 @@ HEADER_SRCS = \ d3dx10async.h \ d3dx10tex.h \ d3dx11.h \ + d3dx11tex.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx11.h b/include/d3dx11.h index 08a303d..de54034 100644 --- a/include/d3dx11.h +++ b/include/d3dx11.h @@ -28,5 +28,6 @@ #include "d3d11.h" #include "d3dx11core.h" +#include "d3dx11tex.h" #endif diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h new file mode 100644 index 0000000..54c77b7 --- /dev/null +++ b/include/d3dx11tex.h @@ -0,0 +1,96 @@ +/* + * Copyright 2016 Andrey Gusev + * + * 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 "d3dx11.h" + +#ifndef __D3DX11TEX_H__ +#define __D3DX11TEX_H__ + +typedef enum D3DX11_IMAGE_FILE_FORMAT +{ + D3DX11_IFF_BMP = 0, + D3DX11_IFF_JPG = 1, + D3DX11_IFF_PNG = 3, + D3DX11_IFF_DDS = 4, + D3DX11_IFF_TIFF = 10, + D3DX11_IFF_GIF = 11, + D3DX11_IFF_WMP = 12, + D3DX11_IFF_FORCE_DWORD = 0x7fffffff +} D3DX11_IMAGE_FILE_FORMAT; + +typedef struct D3DX11_IMAGE_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT ArraySize; + UINT MipLevels; + UINT MiscFlags; + DXGI_FORMAT Format; + D3D11_RESOURCE_DIMENSION ResourceDimension; + D3DX11_IMAGE_FILE_FORMAT ImageFileFormat; +} D3DX11_IMAGE_INFO; + +typedef struct D3DX11_IMAGE_LOAD_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT FirstMipLevel; + UINT MipLevels; + D3D11_USAGE Usage; + UINT BindFlags; + UINT CpuAccessFlags; + UINT MiscFlags; + DXGI_FORMAT Format; + UINT Filter; + UINT MipFilter; + D3DX11_IMAGE_INFO *pSrcInfo; + +#ifdef __cplusplus + D3DX11_IMAGE_LOAD_INFO() + { + Width = D3DX11_DEFAULT; + Height = D3DX11_DEFAULT; + Depth = D3DX11_DEFAULT; + FirstMipLevel = D3DX11_DEFAULT; + MipLevels = D3DX11_DEFAULT; + Usage = (D3D11_USAGE)D3DX11_DEFAULT; + BindFlags = D3DX11_DEFAULT; + CpuAccessFlags = D3DX11_DEFAULT; + MiscFlags = D3DX11_DEFAULT; + Format = DXGI_FORMAT_FROM_FILE; + Filter = D3DX11_DEFAULT; + MipFilter = D3DX11_DEFAULT; + pSrcInfo = NULL; + } +#endif +} D3DX11_IMAGE_LOAD_INFO; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, + D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Andrey Gusev : include: Add d3dx11core.idl.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 6a751578a8c357e2742deec83f5def4a9d1d4dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a751578a8c357e2742deec83… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 14 22:57:22 2016 +0200 include: Add d3dx11core.idl. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx11.h | 1 + include/d3dx11core.idl | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1612a94..9ffaff4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -42,6 +42,7 @@ IDL_SRCS = \ d3d11sdklayers.idl \ d3dcommon.idl \ d3dx10core.idl \ + d3dx11core.idl \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ diff --git a/include/d3dx11.h b/include/d3dx11.h index 52191da..08a303d 100644 --- a/include/d3dx11.h +++ b/include/d3dx11.h @@ -27,5 +27,6 @@ #define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) #include "d3d11.h" +#include "d3dx11core.h" #endif diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl new file mode 100644 index 0000000..d47463c --- /dev/null +++ b/include/d3dx11core.idl @@ -0,0 +1,65 @@ +/* + * Copyright 2016 Andrey Gusev + * + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi.idl"; +import "d3dcommon.idl"; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX11DataLoader +{ + HRESULT Load(); + HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); + HRESULT Destroy(); +}; + +[ + object, + local, + pointer_default(unique) +] +interface ID3DX11DataProcessor +{ + HRESULT Process([in] void *data, [in] SIZE_T bytes); + HRESULT CreateDeviceObject([out] void **data_object); + HRESULT Destroy(); +}; + +[ + object, + local, + pointer_default(unique), + uuid(c93fecfa-6967-478a-abbc-402d90621fcb) +] +interface ID3DX11ThreadPump : IUnknown +{ + HRESULT AddWorkItem([in] ID3DX11DataLoader *loader, [in] ID3DX11DataProcessor *processor, + [in] HRESULT *hresult, [out] void **device_object); + UINT GetWorkItemCount(); + + HRESULT WaitForAllItems(); + HRESULT ProcessDeviceWorkItems([in] UINT count); + + HRESULT PurgeAllItems(); + HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); +};

1 0

Matteo Bruni : d3dx11_42: Share the source code with d3dx11_43.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: ae8fc713203941ab99aadb586c816d9e5284f410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8fc713203941ab99aadb586… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 14 22:57:25 2016 +0200 d3dx11_42: Share the source code with d3dx11_43. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 6 +++++- dlls/d3dx11_42/d3dx11_42.c | 2 +- dlls/d3dx11_42/d3dx11_42.spec | 2 +- tools/make_specfiles | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 3b6ab39..3ed7fd3 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,5 +1,9 @@ MODULE = d3dx11_42.dll +IMPORTS = d3dcompiler +PARENTSRC = ../d3dx11_43 -C_SRCS = d3dx11_42.c +C_SRCS = \ + async.c \ + d3dx11_42.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c index ac56fbe..823ebf4 100644 --- a/dlls/d3dx11_42/d3dx11_42.c +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "d3d11.h" +#include "d3dx11.h" BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index b917263..a2a32ff 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx11_43.D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/tools/make_specfiles b/tools/make_specfiles index feb65b4..448d813 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -108,10 +108,6 @@ my @dll_groups = "d3dx10_33", ], [ - "d3dx11_43", - "d3dx11_42", - ], - [ "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46",

1 0

Iván Matellanes : msvcirt: Add stub for class ostream.
by Alexandre Julliard June 14, 2016

June 14, 2016

Module: wine Branch: master Commit: 849163b1ed5e2586ee9f391e7a8b03f054bb620f URL: http://source.winehq.org/git/wine.git/?a=commit;h=849163b1ed5e2586ee9f391e7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:15 2016 +0100 msvcirt: Add stub for class ostream. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 254 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcirt/msvcirt.spec | 100 ++++++++--------- dlls/msvcrt20/msvcrt20.spec | 92 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 92 ++++++++-------- 4 files changed, 374 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=849163b1ed5e2586ee9f3…

1 0