September 2016 - Wine-Commits

Frédéric Delanoy : French translation for release 1.9.18
by Jeremy Newman Sept. 6, 2016

Sept. 6, 2016

Module: website Branch: master Commit: e025586b3894113c6ec48b17020c1b8b5328afa2 URL: http://source.winehq.org/git/website.git/?a=commit;h=e025586b3894113c6ec48b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 3 16:55:00 2016 +0200 French translation for release 1.9.18 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016090301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/fr/2016090301.xml b/news/fr/2016090301.xml new file mode 100644 index 0000000..b89daeb --- /dev/null +++ b/news/fr/2016090301.xml @@ -0,0 +1,18 @@ +<news> +<date>3 septembre 2016</date> +<title>Sortie de Wine 1.9.18</title> +<body> +La version de développement 1.9.18 de Wine est disponible. +<a href="{$root}/announce/1.9.18">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de pilotes noyaux multiples dans un processus unique.</li> + <li>Prise en charge améliorée du lecteur WebServices.</li> + <li>Diverses améliorations dans la prise en charge des joysticks.</li> + <li>Travail supplémentaire en vue du flux de commandes Direct3D.</li> + <li>Améliorations de performances GDI.</li> + <li>Meilleure prise en charge des fenêtres IME.</li> + <li>Correctifs de compatibilité dans la prise en charge du presse-papiers.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.8.4
by Jeremy Newman Sept. 6, 2016

Sept. 6, 2016

Module: website Branch: master Commit: 1401d0206811adee42cf62f7a93a6e9f26141e41 URL: http://source.winehq.org/git/website.git/?a=commit;h=1401d0206811adee42cf62… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 3 16:54:59 2016 +0200 French translation for release 1.8.4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016082201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/fr/2016082201.xml b/news/fr/2016082201.xml new file mode 100644 index 0000000..2552907 --- /dev/null +++ b/news/fr/2016082201.xml @@ -0,0 +1,12 @@ +<news> +<date>22 août 2016</date> +<title>Sortie de Wine 1.8.4</title> +<body> + La version de maintenance 1.8.4 de Wine est disponible. + <a href="{$root}/announce/1.8.4">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> + <li>Quelques cartes supplémentaires ajoutées dans la table de description de GPU.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.4.tar.bz3">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.18
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: website Branch: master Commit: 710d09dd2764a0560b62acc006243fa0d29408b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=710d09dd2764a0560b62ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 3 01:41:55 2016 +0900 Wine release 1.9.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016090301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2016090301.xml b/news/en/2016090301.xml new file mode 100644 index 0000000..8c344b6 --- /dev/null +++ b/news/en/2016090301.xml @@ -0,0 +1,19 @@ +<news> +<date>September 3, 2016</date> +<title>Wine 1.9.18 Released</title> +<body> + The Wine development release 1.9.18 is now available. + <a href="{$root}/announce/1.9.18">What's new</a> in this release: +<ul> + <li>Support for multiple kernel drivers in a single process.</li> + <li>More WebServices reader support.</li> + <li>Various improvements in joystick support.</li> + <li>Some more work towards the Direct3D command stream.</li> + <li>GDI performance improvements.</li> + <li>Improved IME window handling.</li> + <li>Compatibility fixes in the clipboard support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.18 : Alexandre Julliard : Release 1.9.18
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: refs/tags/wine-1.9.18 Tag: b10b04584366c2baf489c0f73fc28eb72d379292 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b10b04584366c2baf489c0f73fc2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 3 01:39:28 2016 +0900 Release 1.9.18

1 0

Huw Davies : ole32/tests: Update tests to the new channel hook info structure.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: edaf60d71ad1b12315f512c65b3b8c8536e70935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edaf60d71ad1b12315f512c65… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 2 11:41:05 2016 +0100 ole32/tests: Update tests to the new channel hook info structure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 148 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 128 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edaf60d71ad1b12315f51…

1 0

Ruslan Kabatsayev : wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: c2e316a3e6afaf1eea05a9f86f9e5275cbfcf9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2e316a3e6afaf1eea05a9f86… Author: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Fri Sep 2 12:40:19 2016 +0200 wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined. This fixes a regression introduced by commit b53256b8b752855576252cc2290dfbc9cb0f1280. Signed-off-by: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4213df3..b97cd78 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6143,6 +6143,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, ALL_WGL_FUNCS #undef USE_GL_FUNC gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); + gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); } #else /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */

1 0

Sebastian Lackner : user32: Do not create IME window for HWND_MESSAGE windows.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 994b06a97d5080a5175507ff33a7477006f3e8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=994b06a97d5080a5175507ff3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 2 05:53:20 2016 +0200 user32: Do not create IME window for HWND_MESSAGE windows. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b65fdd7..a7be4a3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1613,7 +1613,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* create default IME window */ - if (imm_register_window && !is_desktop_window( hwnd ) && imm_register_window( hwnd )) + if (imm_register_window && !is_desktop_window( hwnd ) && + parent != get_hwnd_message_parent() && imm_register_window( hwnd )) { TRACE("register IME window for %p\n", hwnd); win_set_flags( hwnd, WIN_HAS_IME_WIN, 0 );

1 0

Austin English : msports: Add stub dll.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 7cfa7496c7d891ef2c39b15438b5182bd638fb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfa7496c7d891ef2c39b1543… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 31 01:46:55 2016 -0500 msports: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msports/Makefile.in | 4 ++++ dlls/msports/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msports/msports.spec | 11 +++++++++++ 5 files changed, 63 insertions(+) diff --git a/configure b/configure index 27dcd4b..5b92af9 100755 --- a/configure +++ b/configure @@ -1219,6 +1219,7 @@ enable_msisys_ocx enable_msls31 enable_msnet32 enable_mspatcha +enable_msports enable_msrle32 enable_msscript_ocx enable_mssign32 @@ -17872,6 +17873,7 @@ wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha implib +wine_fn_config_dll msports enable_msports wine_fn_config_dll msrle32 enable_msrle32 clean wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll msscript.ocx enable_msscript_ocx clean diff --git a/configure.ac b/configure.ac index d008fe8..0331c36 100644 --- a/configure.ac +++ b/configure.ac @@ -3093,6 +3093,7 @@ WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha,,[implib]) +WINE_CONFIG_DLL(msports) WINE_CONFIG_DLL(msrle32,,[clean]) WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(msscript.ocx,,[clean]) diff --git a/dlls/msports/Makefile.in b/dlls/msports/Makefile.in new file mode 100644 index 0000000..d4e8593 --- /dev/null +++ b/dlls/msports/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msports.dll + +C_SRCS = \ + main.c diff --git a/dlls/msports/main.c b/dlls/msports/main.c new file mode 100644 index 0000000..fe2c153 --- /dev/null +++ b/dlls/msports/main.c @@ -0,0 +1,45 @@ +/* + * msports.dll + * + * Copyright 2016 Austin English + * + * 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(msports); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/msports/msports.spec b/dlls/msports/msports.spec new file mode 100644 index 0000000..bb4b9c9 --- /dev/null +++ b/dlls/msports/msports.spec @@ -0,0 +1,11 @@ +@ stub ComDBClaimNextFreePort +@ stub ComDBClaimPort +@ stub ComDBClose +@ stub ComDBGetCurrentPortUsage +@ stub ComDBOpen +@ stub ComDBReleasePort +@ stub ComDBResizeDatabase +@ stub ParallelPortPropPageProvider +@ stub PortsClassInstaller +@ stub SerialDisplayAdvancedSettings +@ stub SerialPortPropPageProvider

1 0

Alexandre Julliard : user32/tests: Add some tests for synthesized clipboard formats.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: e01592e82f4967da31ec5a16cfc6b1228665c8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01592e82f4967da31ec5a16c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 2 16:20:07 2016 +0900 user32/tests: Add some tests for synthesized clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 345 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 334 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e01592e82f4967da31ec5…

1 0

Nikolay Sivov : d3dx10/tests: Basic tests for async loaders.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 53d01474f26454b54a71ac6d4b4e36a69ac1849d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d01474f26454b54a71ac6d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 19:22:36 2016 +0200 d3dx10/tests: Basic tests for async loaders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 35 +++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 10 ++--- dlls/d3dx10_43/tests/d3dx10.c | 100 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx10.h | 16 +++++++ include/d3dx10async.h | 6 +++ 5 files changed, 162 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 36110d2..f49eb92 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -67,3 +67,38 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(const WCHAR *filename, const D3D1 return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX10DataLoader **loader) +{ + FIXME("data %p, data_size %lu, loader %p stub!\n", data, data_size, loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader) +{ + FIXME("filename %s, loader %p stub!\n", debugstr_a(filename), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader) +{ + FIXME("filename %s, loader %p stub!\n", debugstr_w(filename), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader) +{ + FIXME("module %p, resource %s, loader %p stub!\n", module, debugstr_a(resource), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader) +{ + FIXME("module %p, resource %s, loader %p stub!\n", module, debugstr_w(resource), loader); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 61f16fe..49a6d3a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -9,11 +9,11 @@ @ stub D3DX10CreateAsyncCompilerProcessor(str ptr ptr str str long long ptr ptr ptr) @ stub D3DX10CreateAsyncEffectCreateProcessor(str ptr ptr str long long ptr ptr ptr ptr) @ stub D3DX10CreateAsyncEffectPoolCreateProcessor(str ptr ptr str long long ptr ptr ptr) -@ stub D3DX10CreateAsyncFileLoaderA(str ptr) -@ stub D3DX10CreateAsyncFileLoaderW(wstr ptr) -@ stub D3DX10CreateAsyncMemoryLoader(ptr long ptr) -@ stub D3DX10CreateAsyncResourceLoaderA(long str ptr) -@ stub D3DX10CreateAsyncResourceLoaderW(long wstr ptr) +@ stdcall D3DX10CreateAsyncFileLoaderA(str ptr) +@ stdcall D3DX10CreateAsyncFileLoaderW(wstr ptr) +@ stdcall D3DX10CreateAsyncMemoryLoader(ptr long ptr) +@ stdcall D3DX10CreateAsyncResourceLoaderA(long str ptr) +@ stdcall D3DX10CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d91dbdc..2eccb69 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -605,7 +605,107 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_D3DX10CreateAsyncMemoryLoader(void) +{ + ID3DX10DataLoader *loader; + SIZE_T size; + DWORD data; + HRESULT hr; + void *ptr; + + hr = D3DX10CreateAsyncMemoryLoader(NULL, 0, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncMemoryLoader(NULL, 0, &loader); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncMemoryLoader(&data, 0, &loader); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + return; + + size = 100; + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data); + ok(!size, "Got unexpected data size.\n"); + + /* Load() is no-op. */ + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data = 0; + hr = D3DX10CreateAsyncMemoryLoader(&data, sizeof(data), &loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Load() is no-op. */ + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data); + ok(size == sizeof(data), "Got unexpected data size.\n"); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); +} + +static void test_D3DX10CreateAsyncFileLoader(void) +{ + ID3DX10DataLoader *loader; + SIZE_T size; + HRESULT hr; + void *ptr; + + hr = D3DX10CreateAsyncFileLoaderA(NULL, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncFileLoaderA(NULL, &loader); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncFileLoaderA("nonexistentfilename", &loader); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + return; + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Load(loader); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); +} + +static void test_D3DX10CreateAsyncResourceLoader(void) +{ + ID3DX10DataLoader *loader; + HRESULT hr; + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, NULL, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, NULL, &loader); + todo_wine ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, "nonexistentresourcename", &loader); + todo_wine ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); + test_D3DX10CreateAsyncMemoryLoader(); + test_D3DX10CreateAsyncFileLoader(); + test_D3DX10CreateAsyncResourceLoader(); } diff --git a/include/d3dx10.h b/include/d3dx10.h index fb48723..7062d24 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -32,4 +32,20 @@ #include "d3dx10async.h" #include "d3dx10tex.h" +#define _FACDD 0x876 +#define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) + +enum _D3DX10_ERR +{ + D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER = MAKE_DDHRESULT(2900), + D3DX10_ERR_INVALID_MESH = MAKE_DDHRESULT(2901), + D3DX10_ERR_CANNOT_ATTR_SORT = MAKE_DDHRESULT(2902), + D3DX10_ERR_SKINNING_NOT_SUPPORTED = MAKE_DDHRESULT(2903), + D3DX10_ERR_TOO_MANY_INFLUENCES = MAKE_DDHRESULT(2904), + D3DX10_ERR_INVALID_DATA = MAKE_DDHRESULT(2905), + D3DX10_ERR_LOADED_MESH_HAS_NO_DATA = MAKE_DDHRESULT(2906), + D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT = MAKE_DDHRESULT(2907), + D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM = MAKE_DDHRESULT(2908) +}; + #endif diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 364ad12..6663be4 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,4 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); + #endif

1 0