wine-devel January 2020

wine-devel@winehq.org

75 participants
595 discussions

[PATCH] testbot/Engine: Don't rename the old logs on Engine startup.
by Francois Gouget 15 Jan '20

15 Jan '20

All the logs have been renamed by now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 14 --------- testbot/lib/WineTestBot/LogUtils.pm | 44 ----------------------------- 2 files changed, 58 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index aed0e51d3..49347b559 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -103,20 +103,6 @@ sub Cleanup($;$$) { my ($Starting, $KillTasks, $KillVMs) = @_; - # FIXME Temporary: Rename the old logs so they follow the new naming scheme - # and can be identified by WineSendLog.pl and JobDetails.pl. - RenameReferenceLogs(); - foreach my $Job (@{CreateJobs()->GetItems()}) - { - foreach my $Step (@{$Job->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - RenameTaskLogs($Task->GetDir()); - } - } - } - # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. my %RunningVMs; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3124e89ea..e1a8176ac 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -29,7 +29,6 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors TagNewErrors GetLogLineCategory GetReportLineCategory - RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); use Algorithm::Diff; @@ -567,49 +566,6 @@ sub GetReportLineCategory($) # Log querying and formatting # -sub RenameReferenceLogs() -{ - if (opendir(my $dh, "$DataDir/latest")) - { - # We will be renaming files so read the directory in one go - my @Entries = readdir($dh); - close($dh); - foreach my $Entry (@Entries) - { - if ($Entry =~ /^([a-z0-9._]+)$/) - { - my $NewName = $Entry = $1; - $NewName =~ s/\.log$/.report/; - $NewName =~ s/(_[a-z0-9]+)\.err$/$1.report.err/; - $NewName =~ s/_(32|64)\.report/_exe$1.report/; - if ($Entry ne $NewName and !-f "$DataDir/latest/$NewName") - { - rename "$DataDir/latest/$Entry", "$DataDir/latest/$NewName"; - } - } - } - } -} - -sub RenameTaskLogs($) -{ - my ($Dir) = @_; - - if (-f "$Dir/err" and !-f "$Dir/log.err") - { - rename "$Dir/err", "$Dir/log.err"; - } - - if (-f "$Dir/log.old" and !-f "$Dir/old_log") - { - rename "$Dir/log.old", "$Dir/old_log"; - } - if (-f "$Dir/err.old" and !-f "$Dir/old_log.err") - { - rename "$Dir/err.old", "$Dir/old_log.err"; - } -} - =pod =over 12 -- 2.20.1

1 0

[PATCH 2/2] wininet/tests: Fix test failures on Windows XP.
by Hans Leidekker 15 Jan '20

15 Jan '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/tests/http.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8f3d02e664..e0ea78cfb4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -42,6 +42,7 @@ #define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; +static BOOL https_support = TRUE; /* Adapted from dlls/urlmon/tests/protocol.c */ @@ -6220,6 +6221,12 @@ static void test_security_flags(void) char buf[100]; BOOL res; + if (!https_support) + { + win_skip("Can't make https connections, skipping security flags test\n"); + return; + } + trace("Testing security flags...\n"); reset_events(); @@ -6556,7 +6563,7 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags; + DWORD size, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; BOOL ret; @@ -6574,11 +6581,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), - "HttpSendRequest failed: %d\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(err == ERROR_INTERNET_CANNOT_CONNECT) || + broken(err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR), "HttpSendRequest failed: %u\n", err); if (!ret) { win_skip("Cannot connect to https.\n"); + if (err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) https_support = FALSE; goto done; } @@ -7375,6 +7384,11 @@ static void test_default_service_port(void) ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + if (!ret && GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + { + win_skip("Can't make https connection\n"); + goto done; + } ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = sizeof(buffer); @@ -7402,6 +7416,7 @@ static void test_default_service_port(void) ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); +done: InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session); @@ -7529,6 +7544,7 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + test_secure_connection(); test_security_flags(); InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); @@ -7543,7 +7559,6 @@ START_TEST(http) InternetOpenUrlA_test(); HttpHeaders_test(); test_http_connection(); - test_secure_connection(); test_user_agent_header(); test_bogus_accept_types_array(); InternetReadFile_chunked_test(); -- 2.20.1

4 3

[PATCH 1/7] compobj: Manually define the IMalloc16 structure.
by Zebediah Figura 15 Jan '20

15 Jan '20

For clarity. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/compobj.dll16/compobj.c | 43 ++++++++++++++---------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ffbd87a906..3991de4432 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -48,34 +48,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef LPSTR LPOLESTR16; typedef LPCSTR LPCOLESTR16; -#define STDMETHOD16CALLTYPE __cdecl -#define STDMETHOD16(m) HRESULT (STDMETHOD16CALLTYPE *m) -#define STDMETHOD16_(t,m) t (STDMETHOD16CALLTYPE *m) - #define CHARS_IN_GUID 39 -/*********************************************************************** - * IMalloc16 interface - */ - -typedef struct IMalloc16 *LPMALLOC16; +typedef struct +{ + SEGPTR QueryInterface; + SEGPTR AddRef; + SEGPTR Release; + SEGPTR Alloc; + SEGPTR Realloc; + SEGPTR Free; + SEGPTR GetSize; + SEGPTR DidAlloc; + SEGPTR HeapMinimize; +} IMalloc16Vtbl; -#define INTERFACE IMalloc16 -DECLARE_INTERFACE_(IMalloc16,IUnknown) +typedef struct { - /*** IUnknown methods ***/ - STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD16_(ULONG,AddRef)(THIS) PURE; - STDMETHOD16_(ULONG,Release)(THIS) PURE; - /*** IMalloc16 methods ***/ - STDMETHOD16_(LPVOID,Alloc)(THIS_ DWORD cb) PURE; - STDMETHOD16_(LPVOID,Realloc)(THIS_ LPVOID pv, DWORD cb) PURE; - STDMETHOD16_(void,Free)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(DWORD,GetSize)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(LPVOID,HeapMinimize)(THIS) PURE; -}; -#undef INTERFACE + SEGPTR lpVtbl; +} IMalloc16, *LPMALLOC16; static HTASK16 hETask = 0; static WORD Table_ETask[62]; @@ -220,7 +211,7 @@ IMalloc16_Constructor(void) This = HeapAlloc( GetProcessHeap(), 0, sizeof(IMalloc16Impl) ); if (!msegvt16) { -#define VTENT(x) vt16.x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x) +#define VTENT(x) vt16.x = (SEGPTR)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x) VTENT(QueryInterface); VTENT(AddRef); VTENT(Release); @@ -233,7 +224,7 @@ IMalloc16_Constructor(void) #undef VTENT msegvt16 = MapLS( &vt16 ); } - This->IMalloc16_iface.lpVtbl = (const IMalloc16Vtbl*)msegvt16; + This->IMalloc16_iface.lpVtbl = msegvt16; This->ref = 1; return (LPMALLOC16)MapLS( This ); } -- 2.25.0

1 6

[PATCH v4 1/2] strmbase: Detach the window from the parent before destroying it.
by Zebediah Figura 15 Jan '20

15 Jan '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> This fixes a regression introduced by 3b5198c8283d891095612c1001edb5e5788d6059. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resent with minor changes in style and wording. dlls/strmbase/window.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 07a12eca26..71bbf73ccc 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -136,9 +136,15 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { + BaseControlWindow *window = impl_from_BaseWindow(This); + if (!This->hWnd) return S_OK; + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent + * the window first. */ + IVideoWindow_put_Owner(&window->IVideoWindow_iface, (OAHWND)NULL); + SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; -- 2.25.0

1 1

[PATCH] rpcrt4/tests: Pass the default maximum call limit to RpcServerListen().
by Zebediah Figura 15 Jan '20

15 Jan '20

The tests intermittently crash on 2008 with RPC_S_SERVER_TOO_BUSY. I suspect this is due to the server spawned in run_server having a call limit of 20 but being expected to service 32 threads. Use the default parameter in an attempt to prevent this failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I can reproduce the crash reliably on a VM if I turn down the call limit to 2. dlls/rpcrt4/tests/server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index a07e2f1787f..0a76c96d589 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2049,7 +2049,7 @@ server(void) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); } test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -2146,7 +2146,7 @@ static void test_stop_wait_for_call(unsigned char *binding) RPC_STATUS status; DWORD ret; - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); @@ -2202,11 +2202,11 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_ALREADY_LISTENING, "RpcServerListen failed with status %d\n", status); status = RpcMgmtStopServerListening(NULL); @@ -2281,7 +2281,7 @@ static void run_server(HANDLE ready_event) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); -- 2.24.1

1 0

[PATCH] d3dx9_36: Fix some spec file entries (try 2)
by André Hentschel 14 Jan '20

14 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/d3dx9_24/d3dx9_24.spec | 28 ++++++++++++++-------------- dlls/d3dx9_25/d3dx9_25.spec | 28 ++++++++++++++-------------- dlls/d3dx9_26/d3dx9_26.spec | 28 ++++++++++++++-------------- dlls/d3dx9_27/d3dx9_27.spec | 28 ++++++++++++++-------------- dlls/d3dx9_28/d3dx9_28.spec | 28 ++++++++++++++-------------- dlls/d3dx9_29/d3dx9_29.spec | 28 ++++++++++++++-------------- dlls/d3dx9_30/d3dx9_30.spec | 28 ++++++++++++++-------------- dlls/d3dx9_31/d3dx9_31.spec | 28 ++++++++++++++-------------- dlls/d3dx9_32/d3dx9_32.spec | 28 ++++++++++++++-------------- dlls/d3dx9_33/d3dx9_33.spec | 28 ++++++++++++++-------------- dlls/d3dx9_34/d3dx9_34.spec | 28 ++++++++++++++-------------- dlls/d3dx9_35/d3dx9_35.spec | 28 ++++++++++++++-------------- dlls/d3dx9_36/d3dx9_36.spec | 28 ++++++++++++++-------------- dlls/d3dx9_37/d3dx9_37.spec | 28 ++++++++++++++-------------- dlls/d3dx9_38/d3dx9_38.spec | 28 ++++++++++++++-------------- dlls/d3dx9_39/d3dx9_39.spec | 28 ++++++++++++++-------------- dlls/d3dx9_40/d3dx9_40.spec | 28 ++++++++++++++-------------- dlls/d3dx9_41/d3dx9_41.spec | 28 ++++++++++++++-------------- dlls/d3dx9_42/d3dx9_42.spec | 28 ++++++++++++++-------------- dlls/d3dx9_43/d3dx9_43.spec | 28 ++++++++++++++-------------- 20 files changed, 280 insertions(+), 280 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index 7002e2bd575..fe8140d1b49 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -32,12 +32,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -103,12 +103,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -186,9 +186,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -268,12 +268,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index 301000514a0..cb40277ea04 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -32,12 +32,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -103,12 +103,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -186,9 +186,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -268,12 +268,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index fe641a7c876..bfad690a15a 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -36,12 +36,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -190,9 +190,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -272,12 +272,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index fe641a7c876..bfad690a15a 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -36,12 +36,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -190,9 +190,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -272,12 +272,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index acbcf26ebbd..60228541015 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -36,12 +36,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -190,9 +190,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -277,12 +277,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index acbcf26ebbd..60228541015 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -36,12 +36,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -190,9 +190,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -277,12 +277,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index fdf5ee43b6c..06ced20df61 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -36,12 +36,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -190,9 +190,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -277,12 +277,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index ed842cdaf14..c9aca309a35 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -106,12 +106,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -187,9 +187,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -274,12 +274,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index af5624c0592..f541f6f2ef1 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -106,12 +106,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -187,9 +187,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -279,12 +279,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index af5624c0592..f541f6f2ef1 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -106,12 +106,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -187,9 +187,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -279,12 +279,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index af5624c0592..f541f6f2ef1 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -106,12 +106,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -187,9 +187,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -279,12 +279,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index af5624c0592..f541f6f2ef1 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -106,12 +106,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -187,9 +187,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -279,12 +279,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index de8b12ce03b..e1f44261610 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -107,12 +107,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -189,9 +189,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -281,12 +281,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index c3bd9d52a2e..0851945d36b 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -105,12 +105,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -182,9 +182,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -274,12 +274,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index c3bd9d52a2e..0851945d36b 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -35,12 +35,12 @@ @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) -@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr str long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr wstr long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateCubeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) @@ -105,12 +105,12 @@ @ stdcall D3DXCreateTextureShader(ptr ptr) @ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr str ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr str long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr wstr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr wstr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) @@ -182,9 +182,9 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) @@ -274,12 +274,12 @@ @ stub D3DXSavePRTBufferToFileW(ptr ptr) @ stub D3DXSavePRTCompBufferToFileA(ptr ptr) @ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(str long ptr ptr ptr) @ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(wstr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(str long ptr ptr) @ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(wstr long ptr ptr) @ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) -- 2.17.1

4 4

[PATCH] include: Add more NTSTATUS codes.
by Zebediah Figura 14 Jan '20

14 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ntstatus.h | 5 +++++ include/winnt.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index a91ce97731..682db7a566 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -868,6 +868,10 @@ #define STATUS_DRIVER_DATABASE_ERROR ((NTSTATUS) 0xC000036D) #define STATUS_SYSTEM_HIVE_TOO_LARGE ((NTSTATUS) 0xC000036E) #define STATUS_INVALID_IMPORT_OF_NON_DLL ((NTSTATUS) 0xC000036F) +#define STATUS_NO_SECRETS ((NTSTATUS) 0xC0000371) +#define STATUS_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY ((NTSTATUS) 0xC0000372) +#define STATUS_FAILED_STACK_SWITCH ((NTSTATUS) 0xC0000373) +#define STATUS_HEAP_CORRUPTION ((NTSTATUS) 0xC0000374) #define STATUS_SMARTCARD_WRONG_PIN ((NTSTATUS) 0xC0000380) #define STATUS_SMARTCARD_CARD_BLOCKED ((NTSTATUS) 0xC0000381) #define STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED ((NTSTATUS) 0xC0000382) @@ -1411,6 +1415,7 @@ #define DBG_RIPEXCEPTION ((NTSTATUS) 0x40010007) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) +#define DBG_PRINTEXCEPTION_WIDE_C ((NTSTATUS) 0x4001000A) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) #endif /* WIN32_NO_STATUS */ diff --git a/include/winnt.h b/include/winnt.h index 56734f178d..41fb6a8289 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -607,10 +607,13 @@ typedef DWORD FLONG; #define STATUS_TIMEOUT ((DWORD) 0x00000102) #define STATUS_PENDING ((DWORD) 0x00000103) #define STATUS_SEGMENT_NOTIFICATION ((DWORD) 0x40000005) +#define STATUS_FATAL_APP_EXIT ((DWORD) 0x40000015) #define STATUS_GUARD_PAGE_VIOLATION ((DWORD) 0x80000001) #define STATUS_DATATYPE_MISALIGNMENT ((DWORD) 0x80000002) #define STATUS_BREAKPOINT ((DWORD) 0x80000003) #define STATUS_SINGLE_STEP ((DWORD) 0x80000004) +#define STATUS_LONGJUMP ((DWORD) 0x80000026) +#define STATUS_UNWIND_CONSOLIDATE ((DWORD) 0x80000029) #define STATUS_ACCESS_VIOLATION ((DWORD) 0xC0000005) #define STATUS_IN_PAGE_ERROR ((DWORD) 0xC0000006) #define STATUS_INVALID_HANDLE ((DWORD) 0xC0000008) @@ -630,10 +633,18 @@ typedef DWORD FLONG; #define STATUS_INTEGER_OVERFLOW ((DWORD) 0xC0000095) #define STATUS_PRIVILEGED_INSTRUCTION ((DWORD) 0xC0000096) #define STATUS_STACK_OVERFLOW ((DWORD) 0xC00000FD) +#define STATUS_DLL_NOT_FOUND ((DWORD) 0xC0000135) +#define STATUS_ORDINAL_NOT_FOUND ((DWORD) 0xC0000138) +#define STATUS_ENTRYPOINT_NOT_FOUND ((DWORD) 0xC0000139) #define STATUS_CONTROL_C_EXIT ((DWORD) 0xC000013A) +#define STATUS_DLL_INIT_FAILED ((DWORD) 0xC0000142) #define STATUS_FLOAT_MULTIPLE_FAULTS ((DWORD) 0xC00002B4) #define STATUS_FLOAT_MULTIPLE_TRAPS ((DWORD) 0xC00002B5) #define STATUS_REG_NAT_CONSUMPTION ((DWORD) 0xC00002C9) +#define STATUS_HEAP_CORRUPTION ((DWORD) 0xC0000374) +#define STATUS_STACK_BUFFER_OVERRUN ((DWORD) 0xC0000409) +#define STATUS_INVALID_CRUNTIME_PARAMETER ((DWORD) 0xC0000417) +#define STATUS_ASSERTION_FAILURE ((DWORD) 0xC0000420) #define STATUS_SXS_EARLY_DEACTIVATION ((DWORD) 0xC015000F) #define STATUS_SXS_INVALID_DEACTIVATION ((DWORD) 0xC0150010) @@ -647,6 +658,7 @@ typedef DWORD FLONG; #define DBG_RIPEXCEPTION ((DWORD) 0x40010007) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) +#define DBG_PRINTEXCEPTION_WIDE_C ((DWORD) 0x4001000A) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001) #endif /* WIN32_NO_STATUS */ -- 2.25.0

1 0

[PATCH] kernel32/tests: Skip instruction pointer check of the last exception in exception race tests.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)

2 1

[00/25] JobDetails performance and new failures patchset
by Francois Gouget 14 Jan '20

14 Jan '20

I'm sending this patchset here for review and to provide an overview of what's to come. It's quite large so it shouldn't be committed in one go on the TestBot production system (hence the lack of the 'PATCH' prefix and signing off, those will go with the actual submission of the final patches). The main goal of this patchset is to reduce the "new error" false positives caused by intermittent failures (bug 47998). But fixing this has a number of impacts which makes the patchset larger. Some context: the TestBot detects new failures introduced by a patch by comparing its result to that of the last WineTest run. Any failure not present in the WineTest run is considered to be caused by the patch. This breaks down when a failure is intermittent and just happens on the patch's test run. To avoid this the pathset modifies the TestBot to use all past WineTest runs as the comparison point. Only failures not present in any of them are considered new and attributed to the patch. But the TestBot does the new failures detection when generating the JobDetails page (and also when sending the emails). This means parsing the WineTest results (600KB to 1.5MB) to extract failures, the same for the test results, and diffing them, for each test configuration (typically about 20), every time the page is loaded or refreshed. This results in typical load times between 0.2 and 2 seconds on my test system (up to 5 seconds on the official TestBot) (bug 48035). Annoying but not a major issue. But these can put quite a load on the web server when a rogue spider decides to crawl the TestBot site as happened a few times in december. Using all WineTest results on record instead of just the latest would increase the average load times by a factor of 20. This would make the page load time unacceptable and put too much load on the web server. This means the JobDetails performance issues must be tackled first. Initially my idea was to just cache the errors lists. But in fact it's just as easy to also cache whether each error is new and thus do the detection only once. So the patchset introduces .errors files which contain only the errors extracted from a given task's log, whether each error is new, and its line number in the full report which allows for some future enhancements. With this change, generating the JobDetails page takes 0.01 to 0.15 seconds on my test system. The structures used to manipulate the error lists were not practical and hardly extensible. In particular there was not a single list with a flag denoting new errors, but two lists, one with all the errors and another with only the new errors (see TagNewErrors()). Furthermore the error groups and errors in each group were returned separately (see GetLogErrors()), making them annoying to pass around and even harder to extend with more information such as line numbers. So the early patches rework the way errors are stored in memory to simplify usage and make their representation more extensible. Before the patchset the WineRun* scripts would parse the test reports and store the extra validation errors in .err files (e.g. the too much output errors). But it's just as easy to store those in the .errors files, making the .err ones redundant. So they are removed on upgrade. The web server is the wrong place to generate these 'cache' .errors files, in part because it does not have write access to the jobs/ directory. It's more logical to have each WineRun* script generate those when it completes. Then the .errors files are available when WineSendLog and JobDetails need them. Because the new failures detection was performed each time JobDetails was run, it could happen long after the job completed. By that time there could be new WineTest results so simply using the latest ones would have changed the list of new failures of past jobs which would have made no sense. With the .errors files the new failures detection is performed only once when a task completes. So keeping a copy of the WineTest reference files is not really necessary anymore. But it's still useful to have them to diagnose issues. The WineRunBuild script used to copy the latest WineTest reports to each of the job's step directories when the build completed. Instead it's much more logical to have each WineRun* script capture the WineTest reports it needs when it completes its task and to store them in the task's directory. The reference WineTest results are stored in the latest/ directory so each needs a unique name. That name used to be of the form '<vmname>_<reportname>', for instance debian10_win32_fr_FR.report'. So this naming scheme was updated to allow for more than one report per test configuration. Specifically it now includes the job id since there's only one report per job for a given test configuration and this makes it easy to know where the reference report is coming from. Also underscores are allowed in both the VM names and report names which makes it hard to split the filename into its components. So the underscore was replaced by dashes. So that gives 'debian10-job63174-win32_fr_FR.report'. The Engine used to perform the renaming / upgrade operations on startup. But generating the .errors files for every single job takes several minutes which makes it inappropriate as an Engine startup task. Also in order to work on the patchset it is necessary to be able to test code both before and after files were moved around and .errors files added. So a new tool, UpdateTaskLogs was added that can rebuild all generated files from scratch and allows dealing with upgrades and downgrades. It's introduced before any changes to the way the logs are handled and updated to perform the required renames and to rebuild the generated files. This allows upgrading the content of the latest/ and jobs/ directories when needed. Also when reverting to an earlier version of the code it can mostly restore the content of these directories to their original state, thus making it possible to test the old code. And should things go wrong on the production server this will also provide a way to roll back the state of the TestBot. The TestBot engine redirects the WineRun* scripts stderr to log.err in order to capture Perl errors. This makes log.err different from all other .err files since it cannot be rebuilt from the content of the corresponding log file. So the patchset renames log and log.err to task.log and testbot.log respectively. Of course UpdateTaskLogs deals with the needed renames on upgrade. This is also the reason for the 'mostly' in the previous section: UpdateTaskLogs does not revert these renames on downgrades (but that's easy to deal with with a find -exec command). Another issue is that the WineRun* scripts obviously cannot generate the .errors file for testbot.log. So instead this file is generated by WineSendLog which is called as soon as the overall job is complete. Normally testbot.log is empty and thus ignored anyway. Also the JobDetails page needs to deal with cases where the .errors file is missing in any case. So when that happens it simply points the user to the full log. Finally, if we have two WineTest reports, one with errors A and B, and an older one with only error B, then the second report is useless as far as detecting new failures go. So one can speed up new failure detection by only keeping the useful reports. With the new/old status being stored in the .errors file this is not really crucial since it only slows down the WineRun* scripts. The patchset still includes a patch to prune the redundant WineTest reports. However it's not very effective because some tests produce errors that change with every run. Those will clearly need to be fixed. Francois Gouget (25): testbot: Standardize building the reference report filenames. testbot/LogUtils: Don't rename the old logs on Engine startup. testbot/UpdateTaskLogs: Delete, rebuild or add reference reports. testbot/LogUtils: Tag new errors instead of filtering them. testbot/LogUtils: Return the log errors as a single object. testbot/LogUtils: Add _AddLogError() and _AddLogGroup(). testbot/LogUtils: Rename the $Summary variables to $LogInfo. testbot/LogUtils: Tweak ParseTaskLog() to reduce the indentation level. testbot/LogUtils: Return the ParseWineTestReport() results as a single object. testbot/LogUtils: Add BadRef/NoRef to TagNewErrors(). testbot/LogUtils: Rename the ParseTaskLog() NoLog error field to BadLog. testbot/JobDetails: Highlight new errors in the full log too. testbot/LogUtils: Keep track of the first line of each error group. testbot/LogUtils: Store the filename in the $LogInfo structures. testbot: Share code to access the latest reference WineTest reports. testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist. testbot: Move reference logs to the task and prepare for having more than one. testbot: Separate the per-task task and testbot logs. testbot/LogUtils: Reorder the functions to get a more logical grouping. testbot: Cache the log error lists in .errors files. testbot/JobDetails: Improve the error reporting. testbot/LogUtils: Share code between _SaveLogErrors() and _DumpErrors(). testbot/LogUtils: Return the errors in the Parse*() $LogInfo structure. testbot: Take into account multiple WineTest reports. testbot/LogUtils: Deduplicate the latest WineTest reports. testbot/bin/Engine.pl | 14 - testbot/bin/Janitor.pl | 9 +- testbot/bin/UpdateTaskLogs | 559 +++++++++++++ testbot/bin/WineRunBuild.pl | 49 +- testbot/bin/WineRunReconfig.pl | 24 +- testbot/bin/WineRunTask.pl | 78 +- testbot/bin/WineRunWineTest.pl | 118 +-- testbot/bin/WineSendLog.pl | 143 ++-- testbot/lib/WineTestBot/LogUtils.pm | 1161 ++++++++++++++++++--------- testbot/lib/WineTestBot/Tasks.pm | 50 +- testbot/web/JobDetails.pl | 146 +++- testbot/web/WineTestBot.css | 2 + 12 files changed, 1700 insertions(+), 653 deletions(-) create mode 100755 testbot/bin/UpdateTaskLogs -- 2.20.1

2 33

[PATCH 6/6] jscript/tests: Use wide char strings in a few more places.
by Jacek Caban 14 Jan '20

14 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
60
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-devel January 2020