wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Maarten Lankhorst : winmm: Remove some dead code.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 3a96c85cfb51a9db4ff55d114498bc753002275b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a96c85cfb51a9db4ff55d114… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 31 20:19:51 2010 +0200 winmm: Remove some dead code. --- dlls/winmm/lolvldrv.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index ff65d84..fd173ff 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -119,13 +119,6 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, lpDrv = &MMDrvs[mld->mmdIndex]; part = &lpDrv->parts[mld->type]; -#if 0 - /* some sanity checks */ - if (!(part->nIDMin <= devID)) - ERR("!(part->nIDMin(%d) <= devID(%d))\n", part->nIDMin, devID); - if (!(devID < part->nIDMax)) - ERR("!(devID(%d) < part->nIDMax(%d))\n", devID, part->nIDMax); -#endif assert(part->fnMessage32);

1 0

Maarten Lankhorst : winmm: Defer loading drivers until they are requested.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 4f4dd855c47cca17d4b750ca118826614afdc20c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4dd855c47cca17d4b750ca1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 31 20:19:35 2010 +0200 winmm: Defer loading drivers until they are requested. --- dlls/winmm/lolvldrv.c | 19 ++++++++++++++----- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 4 ---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 74b9f9d..ff65d84 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -47,7 +47,7 @@ typedef struct tagWINE_LLTYPE { int nMapper; /* index to mapper */ } WINE_LLTYPE; -static int MMDrvsHi /* = 0 */; +static int drivers_loaded, MMDrvsHi; static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; #define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) @@ -66,6 +66,15 @@ static WINE_LLTYPE llTypes[MMDRV_MAX] = { }; #undef A +static void MMDRV_Init(void); + +static void MMDRV_InitSingleType(UINT type) { + if (!drivers_loaded) { + drivers_loaded = 1; + MMDRV_Init(); + } +} + /************************************************************************** * MMDRV_GetNum [internal] */ @@ -73,6 +82,7 @@ UINT MMDRV_GetNum(UINT type) { TRACE("(%04x)\n", type); assert(type < MMDRV_MAX); + MMDRV_InitSingleType(type); return llTypes[type].wMaxId; } @@ -109,7 +119,6 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, lpDrv = &MMDrvs[mld->mmdIndex]; part = &lpDrv->parts[mld->type]; - #if 0 /* some sanity checks */ if (!(part->nIDMin <= devID)) @@ -265,6 +274,7 @@ LPWINE_MLD MMDRV_Get(HANDLE _hndl, UINT type, BOOL bCanBeID) TRACE("(%p, %04x, %c)\n", _hndl, type, bCanBeID ? 'Y' : 'N'); assert(type < MMDRV_MAX); + MMDRV_InitSingleType(type); if (hndl >= llTypes[type].wMaxId && hndl != (UINT16)-1 && hndl != (UINT)-1) { @@ -528,7 +538,7 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) /************************************************************************** * MMDRV_Init */ -BOOL MMDRV_Init(void) +static void MMDRV_Init(void) { HKEY hKey; char driver_buffer[256]; @@ -564,7 +574,6 @@ BOOL MMDRV_Init(void) ret |= MMDRV_Install("wavemapper", WINE_DEFAULT_WINMM_MAPPER, TRUE); ret |= MMDRV_Install("midimapper", WINE_DEFAULT_WINMM_MIDI, TRUE); - return ret; } /****************************************************************** @@ -595,7 +604,7 @@ static BOOL MMDRV_ExitPerType(LPWINE_MM_DRIVER lpDrv, UINT type) * * */ -void MMDRV_Exit(void) +void MMDRV_Exit(void) { unsigned int i; TRACE("()\n"); diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 7920e2e..45a4233 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -137,7 +137,6 @@ BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz); LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2); void DRIVER_UnloadAll(void); -BOOL MMDRV_Init(void); void MMDRV_Exit(void); UINT MMDRV_GetNum(UINT); LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6cdf14d..1c6a13e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -155,10 +155,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - if (!MMDRV_Init()) { - WINMM_DeleteIData(); - return FALSE; - } break; case DLL_PROCESS_DETACH: /* close all opened MCI drivers */

1 0

Andrew Nguyen : kernel32: Don't set last error on success in OpenConsoleW.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 39208d4d6062c5e0b690b1fae706e1928ae8633a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39208d4d6062c5e0b690b1fae… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 31 18:54:07 2010 -0600 kernel32: Don't set last error on success in OpenConsoleW. --- dlls/kernel32/console.c | 1 - dlls/kernel32/tests/console.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a5a6607..f682ca1 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -307,7 +307,6 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat req->access = access; req->attributes = inherit ? OBJ_INHERIT : 0; req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - SetLastError(0); wine_server_call_err( req ); ret = wine_server_ptr_handle( reply->handle ); } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 43017c1..3d8ae93 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1062,6 +1062,25 @@ static void test_OpenConsoleW(void) "Expected GetLastError() to return %u for index %d, got %u\n", invalid_table[index].gle, index, GetLastError()); } + + /* OpenConsoleW should not touch the last error on success. */ + SetLastError(0xdeadbeef); + ret = pOpenConsoleW(coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); + ok(ret != INVALID_HANDLE_VALUE, + "Expected OpenConsoleW to return a valid handle\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected the last error to be untouched, got %u\n", GetLastError()); + if (ret != INVALID_HANDLE_VALUE) + CloseHandle(ret); + + SetLastError(0xdeadbeef); + ret = pOpenConsoleW(conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); + ok(ret != INVALID_HANDLE_VALUE, + "Expected OpenConsoleW to return a valid handle\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected the last error to be untouched, got %u\n", GetLastError()); + if (ret != INVALID_HANDLE_VALUE) + CloseHandle(ret); } START_TEST(console)

1 0

Andrew Nguyen : kernel32: Improve parameter validation in OpenConsoleW.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: b7bf2abdffd077c9e045b875afd3b2735a26c2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bf2abdffd077c9e045b875a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Mar 31 18:53:59 2010 -0600 kernel32: Improve parameter validation in OpenConsoleW. --- dlls/kernel32/console.c | 27 +++++++++----- dlls/kernel32/tests/console.c | 77 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index eb3e21d..a5a6607 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -274,23 +274,32 @@ BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur ) */ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creation) { - HANDLE output; + HANDLE output = INVALID_HANDLE_VALUE; HANDLE ret; - if (strcmpiW(coninW, name) == 0) - output = (HANDLE) FALSE; - else if (strcmpiW(conoutW, name) == 0) - output = (HANDLE) TRUE; - else + TRACE("(%s, 0x%08x, %d, %u)\n", debugstr_w(name), access, inherit, creation); + + if (name) { - SetLastError(ERROR_INVALID_NAME); - return INVALID_HANDLE_VALUE; + if (strcmpiW(coninW, name) == 0) + output = (HANDLE) FALSE; + else if (strcmpiW(conoutW, name) == 0) + output = (HANDLE) TRUE; } - if (creation != OPEN_EXISTING) + + if (output == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } + else if (creation != OPEN_EXISTING) + { + if (!creation || creation == CREATE_NEW || creation == CREATE_ALWAYS) + SetLastError(ERROR_SHARING_VIOLATION); + else + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } SERVER_START_REQ( open_console ) { diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ace4744..43017c1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -25,6 +25,7 @@ static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD); +static HANDLE (WINAPI *pOpenConsoleW)(LPCWSTR,DWORD,BOOL,DWORD); static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR); /* DEFAULT_ATTRIB is used for all initial filling of the console. @@ -65,6 +66,7 @@ static void init_function_pointers(void) hKernel32 = GetModuleHandleA("kernel32.dll"); KERNEL32_GET_PROC(GetConsoleInputExeNameA); KERNEL32_GET_PROC(GetConsoleProcessList); + KERNEL32_GET_PROC(OpenConsoleW); KERNEL32_GET_PROC(SetConsoleInputExeNameA); #undef KERNEL32_GET_PROC @@ -988,6 +990,80 @@ static void test_GetConsoleProcessList(void) HeapFree(GetProcessHeap(), 0, list); } +static void test_OpenConsoleW(void) +{ + static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; + static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; + static const WCHAR emptyW[] = {0}; + static const WCHAR invalidW[] = {'I','N','V','A','L','I','D',0}; + + static const struct + { + LPCWSTR name; + DWORD access; + BOOL inherit; + DWORD creation; + DWORD gle; + } invalid_table[] = { + {NULL, 0, FALSE, 0, ERROR_INVALID_PARAMETER}, + {NULL, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER}, + {NULL, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER}, + {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER}, + {emptyW, 0, FALSE, 0, ERROR_INVALID_PARAMETER}, + {emptyW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER}, + {emptyW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER}, + {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER}, + {invalidW, 0, FALSE, 0, ERROR_INVALID_PARAMETER}, + {invalidW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER}, + {invalidW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER}, + {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER}, + {coninW, 0, FALSE, 0, ERROR_SHARING_VIOLATION}, + {coninW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER}, + {coninW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_SHARING_VIOLATION}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, ERROR_SHARING_VIOLATION}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, ERROR_SHARING_VIOLATION}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, ERROR_INVALID_PARAMETER}, + {conoutW, 0, FALSE, 0, ERROR_SHARING_VIOLATION}, + {conoutW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER}, + {conoutW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_SHARING_VIOLATION}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, ERROR_SHARING_VIOLATION}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, ERROR_SHARING_VIOLATION}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, ERROR_INVALID_PARAMETER}, + }; + + int index; + HANDLE ret; + + if (!pOpenConsoleW) + { + win_skip("OpenConsoleW is not available\n"); + return; + } + + for (index = 0; index < sizeof(invalid_table)/sizeof(invalid_table[0]); index++) + { + SetLastError(0xdeadbeef); + ret = pOpenConsoleW(invalid_table[index].name, invalid_table[index].access, + invalid_table[index].inherit, invalid_table[index].creation); + ok(ret == INVALID_HANDLE_VALUE, + "Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index %d, got %p\n", + index, ret); + ok(GetLastError() == invalid_table[index].gle, + "Expected GetLastError() to return %u for index %d, got %u\n", + invalid_table[index].gle, index, GetLastError()); + } +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1038,4 +1114,5 @@ START_TEST(console) test_GetSetConsoleInputExeName(); test_GetConsoleProcessList(); + test_OpenConsoleW(); }

1 0

Vincent Povirk : advapi32: Add test for RegDeleteValue.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 3db80a4b1ff5146ae4a308ee217b613d905f426e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db80a4b1ff5146ae4a308ee2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 31 17:29:56 2010 -0500 advapi32: Add test for RegDeleteValue. --- dlls/advapi32/tests/registry.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9684a2f..d0ef19e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1945,6 +1945,32 @@ static void test_deleted_key(void) setup_main_key(); } +static void test_delete_value(void) +{ + LONG res; + char longname[401]; + + res = RegSetValueExA( hkey_main, "test", 0, REG_SZ, (const BYTE*)"value", 6 ); + ok(res == ERROR_SUCCESS, "expect ERROR_SUCCESS, got %i\n", res); + + res = RegQueryValueExA( hkey_main, "test", NULL, NULL, NULL, NULL); + ok(res == ERROR_SUCCESS, "expect ERROR_SUCCESS, got %i\n", res); + + res = RegDeleteValueA( hkey_main, "test" ); + ok(res == ERROR_SUCCESS, "expect ERROR_SUCCESS, got %i\n", res); + + res = RegQueryValueExA( hkey_main, "test", NULL, NULL, NULL, NULL); + ok(res == ERROR_FILE_NOT_FOUND, "expect ERROR_FILE_NOT_FOUND, got %i\n", res); + + res = RegDeleteValueA( hkey_main, "test" ); + ok(res == ERROR_FILE_NOT_FOUND, "expect ERROR_FILE_NOT_FOUND, got %i\n", res); + + memset(longname, 'a', 400); + longname[400] = 0; + res = RegDeleteValueA( hkey_main, longname ); + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "expect ERROR_FILE_NOT_FOUND, got %i\n", res); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -1980,6 +2006,7 @@ START_TEST(registry) test_reg_delete_tree(); test_rw_order(); test_deleted_key(); + test_delete_value(); /* cleanup */ delete_key( hkey_main );

1 0

Vincent Povirk : advapi32: Add tests for registry keys that have been deleted.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 37235a9b46943dc4109ac0296b01ae01fb05c295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37235a9b46943dc4109ac0296… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 31 17:01:22 2010 -0500 advapi32: Add tests for registry keys that have been deleted. --- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 3a65339..9684a2f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1910,6 +1910,41 @@ static void test_redirection(void) RegCloseKey( root64 ); } +static void test_deleted_key(void) +{ + HKEY hkey, hkey2; + char value[20]; + DWORD val_count, type; + LONG res; + + /* Open the test key, then delete it while it's open */ + RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey ); + + delete_key( hkey_main ); + + val_count = 20; + type = 0; + res = RegEnumValueA( hkey, 0, value, &val_count, NULL, &type, 0, 0 ); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + + res = RegSetValueExA( hkey, "test", 0, REG_SZ, (const BYTE*)"value", 6); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + + res = RegOpenKeyA( hkey, "test", &hkey2 ); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + if (res == 0) + RegCloseKey( hkey2 ); + + res = RegCreateKeyA( hkey, "test", &hkey2 ); + ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + if (res == 0) + RegCloseKey( hkey2 ); + + RegCloseKey( hkey ); + + setup_main_key(); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -1944,6 +1979,7 @@ START_TEST(registry) test_reg_delete_tree(); test_rw_order(); + test_deleted_key(); /* cleanup */ delete_key( hkey_main );

1 0

Christian Costa : d3dx9_36: Add stub for D3DXLoadVolumeFromMemory.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 60f736af87971143887e526b0ae36bb7dd73163d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f736af87971143887e526b0… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 31 22:45:27 2010 +0200 d3dx9_36: Add stub for D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/Makefile.in | 3 ++- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/volume.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index d7f558b..e38c62a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -21,7 +21,8 @@ C_SRCS = \ sprite.c \ surface.c \ texture.c \ - util.c + util.c \ + volume.c LEX_SRCS = asmshader.l BISON_SRCS = asmshader.y diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 3e64218..a847aac 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -192,7 +192,7 @@ @ stub D3DXLoadVolumeFromFileA @ stub D3DXLoadVolumeFromFileInMemory @ stub D3DXLoadVolumeFromFileW -@ stub D3DXLoadVolumeFromMemory +@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA @ stub D3DXLoadVolumeFromResourceW @ stub D3DXLoadVolumeFromVolume diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c new file mode 100644 index 0000000..1eae9f4 --- /dev/null +++ b/dlls/d3dx9_36/volume.c @@ -0,0 +1,40 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume, + CONST PALETTEENTRY* destpalette, + CONST D3DBOX* destbox, + LPCVOID srcmemory, + D3DFORMAT srcformat, + UINT srcrowpitch, + UINT srcslicepitch, + CONST PALETTEENTRY* srcpalette, + CONST D3DBOX* srcbox, + DWORD filter, + D3DCOLOR colorkey) +{ + FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat, + srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey); + + return E_NOTIMPL; +}

1 0

André Hentschel : c2man: Replace link to documentation .sgml.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 7cb303b83f73e72aca58eb56e1872f829659c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb303b83f73e72aca58eb56e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 31 19:19:39 2010 +0200 c2man: Replace link to documentation.sgml. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 62d7e17..4fff8d7 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Generate API documentation. See documentation/documentation.sgml for details. +# Generate API documentation. See http://www.winehq.org/docs/winedev-guide/api-docs for details. # # Copyright (C) 2000 Mike McCormack # Copyright (C) 2003 Jon Griffiths

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010