April 2010 - Wine-Commits - list.winehq.org

Maarten Lankhorst : winmm: Remove some dead code.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Vincent Povirk : advapi32: Add test for RegDeleteValue.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Andrew Nguyen : kernel32: Improve parameter validation in OpenConsoleW.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Maarten Lankhorst : winmm: Defer loading drivers until they are requested.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Vincent Povirk : advapi32: Add tests for registry keys that have been deleted.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Andrew Nguyen : kernel32: Don't set last error on success in OpenConsoleW.
by Alexandre Julliard April 1, 2010

April 1, 2010

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

Maarten Lankhorst : winmm: Clean up MMDRV_Init.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: d368aefdbe382978d06f6fbe59b7acabda1948f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d368aefdbe382978d06f6fbe5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 31 20:33:45 2010 +0200 winmm: Clean up MMDRV_Init. --- dlls/winmm/lolvldrv.c | 27 ++++++++++++--------------- dlls/winmm/winemm.h | 4 ---- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index fd173ff..c0640a7 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); +/* Default set of drivers to be loaded */ +#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio,esd" + /* each known type of driver has an instance of this structure */ typedef struct tagWINE_LLTYPE { /* those attributes depend on the specification of the type */ @@ -535,38 +538,32 @@ static void MMDRV_Init(void) { HKEY hKey; char driver_buffer[256]; - char mapper_buffer[256]; - char midi_buffer[256]; - char* p; - DWORD type, size; - BOOL ret = FALSE; + char *p, *next; TRACE("()\n"); strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); - strcpy(mapper_buffer, WINE_DEFAULT_WINMM_MAPPER); - strcpy(midi_buffer, WINE_DEFAULT_WINMM_MIDI); /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hKey)) { - size = sizeof(driver_buffer); - if (RegQueryValueExA(hKey, "Audio", 0, &type, (LPVOID)driver_buffer, &size)) + DWORD size = sizeof(driver_buffer); + if (RegQueryValueExA(hKey, "Audio", 0, NULL, (BYTE*)driver_buffer, &size)) strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); } - p = driver_buffer; - while (p) + for (p = driver_buffer; p; p = next) { char filename[sizeof(driver_buffer)+10]; - char *next = strchr(p, ','); + next = strchr(p, ','); if (next) *next++ = 0; sprintf( filename, "wine%s.drv", p ); - if ((ret = MMDRV_Install( filename, filename, FALSE ))) break; + if (MMDRV_Install(filename, filename, FALSE)) + break; p = next; } - ret |= MMDRV_Install("wavemapper", WINE_DEFAULT_WINMM_MAPPER, TRUE); - ret |= MMDRV_Install("midimapper", WINE_DEFAULT_WINMM_MIDI, TRUE); + MMDRV_Install("wavemapper", "msacm32.drv", TRUE); + MMDRV_Install("midimapper", "midimap.dll", TRUE); } /****************************************************************** diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 45a4233..c0551d3 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -25,10 +25,6 @@ #include "winbase.h" #include "mmddk.h" -#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio,esd" -#define WINE_DEFAULT_WINMM_MAPPER "msacm32.drv" -#define WINE_DEFAULT_WINMM_MIDI "midimap.dll" - /* Who said goofy boy ? */ #define WINE_DI_MAGIC 0x900F1B01

1 0

Maarten Lankhorst : winmm: Clean up mapper code.
by Alexandre Julliard April 1, 2010

April 1, 2010

Module: wine Branch: master Commit: 7d1199de7217f53f33ea91d5ba3d419b6c779806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1199de7217f53f33ea91d5b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 31 21:13:33 2010 +0200 winmm: Clean up mapper code. --- dlls/winmm/lolvldrv.c | 69 ++++++++++++++++-------------------------------- 1 files changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index c0640a7..0d10998 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -43,32 +43,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); typedef struct tagWINE_LLTYPE { /* those attributes depend on the specification of the type */ LPCSTR typestr; /* name (for debugging) */ - BOOL bSupportMapper; /* if type is allowed to support mapper */ /* those attributes reflect the loaded/current situation for the type */ UINT wMaxId; /* number of loaded devices (sum across all loaded drivers) */ LPWINE_MLD lpMlds; /* "static" mlds to access the part though device IDs */ int nMapper; /* index to mapper */ } WINE_LLTYPE; +static WINE_LLTYPE llTypes[MMDRV_MAX] = { + { "Aux", 0, 0, -1 }, + { "Mixer", 0, 0, -1 }, + { "MidiIn", 0, 0, -1 }, + { "MidiOut", 0, 0, -1 }, + { "WaveIn", 0, 0, -1 }, + { "WaveOut", 0, 0, -1 } +}; + 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])) -#define A(_x,_y) {#_y, _x, 0, NULL, -1} -/* Note: the indices of this array must match the definitions - * of the MMDRV_???? manifest constants - */ -static WINE_LLTYPE llTypes[MMDRV_MAX] = { - A(TRUE, Aux), - A(FALSE, Mixer), - A(FALSE, MidiIn), - A(TRUE, MidiOut), - A(TRUE, WaveIn), - A(TRUE, WaveOut), -}; -#undef A - static void MMDRV_Init(void); static void MMDRV_InitSingleType(UINT type) { @@ -106,11 +100,11 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, mld->dwDriverInstance, dwParam1, dwParam2); if (mld->uDeviceID == (UINT16)-1) { - if (!llType->bSupportMapper) { - WARN("uDev=-1 requested on non-mappable ll type %s\n", + if (llType->nMapper == -1) { + WARN("uDev=-1 requested on non-mapped ll type %s\n", llTypes[mld->type].typestr); return MMSYSERR_BADDEVICEID; - } + } devID = -1; } else { if (mld->uDeviceID >= llType->wMaxId) { @@ -206,26 +200,15 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwFlags) mld->dwDriverInstance = (DWORD_PTR)&dwInstance; if (mld->uDeviceID == (UINT)-1 || mld->uDeviceID == (UINT16)-1) { - TRACE("MAPPER mode requested !\n"); - /* check if mapper is supported by type */ - if (llType->bSupportMapper) { - if (llType->nMapper == -1) { - /* no driver for mapper has been loaded, try a dumb implementation */ - TRACE("No mapper loaded, doing it by hand\n"); - for (mld->uDeviceID = 0; mld->uDeviceID < llType->wMaxId; mld->uDeviceID++) { - if ((dwRet = MMDRV_Open(mld, wMsg, dwParam1, dwFlags)) == MMSYSERR_NOERROR) { - /* to share this function epilog */ - dwInstance = mld->dwDriverInstance; - break; - } - } - } else { - mld->uDeviceID = (UINT16)-1; - mld->mmdIndex = llType->lpMlds[-1].mmdIndex; - TRACE("Setting mmdIndex to %u\n", mld->mmdIndex); - dwRet = MMDRV_Message(mld, wMsg, dwParam1, dwFlags); - } - } + TRACE("MAPPER mode requested !\n"); + if (llType->nMapper == -1) { + WARN("Mapper not supported for type %s\n", llTypes[mld->type].typestr); + return MMSYSERR_BADDEVICEID; + } + mld->uDeviceID = (UINT16)-1; + mld->mmdIndex = llType->lpMlds[-1].mmdIndex; + TRACE("Setting mmdIndex to %u\n", mld->mmdIndex); + dwRet = MMDRV_Message(mld, wMsg, dwParam1, dwFlags); } else { if (mld->uDeviceID < llType->wMaxId) { mld->mmdIndex = llType->lpMlds[mld->uDeviceID].mmdIndex; @@ -399,13 +382,7 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) /* got some drivers */ if (lpDrv->bIsMapper) { - /* it seems native mappers return 0 devices :-( */ - if (llTypes[type].nMapper != -1) - ERR("Two mappers for type %s (%d, %s)\n", - llTypes[type].typestr, llTypes[type].nMapper, lpDrv->drvname); - if (count > 1) - ERR("Strange: mapper with %d > 1 devices\n", count); - llTypes[type].nMapper = MMDrvsHi; + llTypes[type].nMapper = MMDrvsHi; } else { if (count == 0) return FALSE; @@ -427,7 +404,7 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) sizeof(WINE_MLD) * (llTypes[type].wMaxId + 1)) + 1; /* re-build the translation table */ - if (llTypes[type].nMapper != -1) { + if (lpDrv->bIsMapper) { TRACE("%s:Trans[%d] -> %s\n", llTypes[type].typestr, -1, MMDrvs[llTypes[type].nMapper].drvname); llTypes[type].lpMlds[-1].uDeviceID = (UINT16)-1; llTypes[type].lpMlds[-1].type = type;

1 0