March 2009 - Wine-commits - list.winehq.org

Rob Shearman : include: Add declarations for RpcMgmtInqStats and RpcMgmtStatsVectorFree.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: c82efc02eee000c4cd5b293d0d8a930df257084d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82efc02eee000c4cd5b293d0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:39:32 2009 +0100 include: Add declarations for RpcMgmtInqStats and RpcMgmtStatsVectorFree. --- include/rpcdce.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index aec99a4..f7bb44c 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -394,6 +394,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtInqStats( RPC_BINDING_HANDLE Binding, RPC_STATS_VECTOR **Statistics ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -413,6 +416,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetServerStackSize( ULONG ThreadStackSize ); RPCRTAPI RPC_STATUS RPC_ENTRY +RpcMgmtStatsVectorFree( RPC_STATS_VECTOR **StatsVector ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Rob Shearman : rpcrt4: RpcServerUseProtseqEp(..., NULL, ...) should return RPC_S_OK.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 4d8057ffef2349fd1dc79a3105b9a0165527736e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8057ffef2349fd1dc79a310… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:42:20 2009 +0100 rpcrt4: RpcServerUseProtseqEp(..., NULL, ...) should return RPC_S_OK. However, on some buggy platforms it returns RPC_S_INVALID_ENDPOINT_FORMAT. Don't follow this behaviour our implementation of the API. --- dlls/rpcrt4/rpc_server.c | 6 ------ dlls/rpcrt4/tests/rpc_protseq.c | 14 +++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 4a87bd0..6e9dbe9 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -772,9 +772,6 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - if (!Endpoint) - return RPC_S_INVALID_ENDPOINT_FORMAT; - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); if (status != RPC_S_OK) return status; @@ -796,9 +793,6 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - if (!Endpoint) - return RPC_S_INVALID_ENDPOINT_FORMAT; - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); if (status != RPC_S_OK) return status; diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index 06a82ec..4837f6a 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -43,13 +43,6 @@ static void test_RpcServerUseProtseq(void) static unsigned char np[] = "ncacn_np"; static unsigned char ncalrpc[] = "ncalrpc"; - /* show that RpcServerUseProtseqEp(..., NULL, ...) isn't the same as - * RpcServerUseProtseq(...) */ - status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); - ok(status == RPC_S_INVALID_ENDPOINT_FORMAT, - "RpcServerUseProtseqEp with NULL endpoint should have failed with " - "RPC_S_INVALID_ENDPOINT_FORMAT instead of %d\n", status); - status = RpcServerInqBindings(&bindings); if (status == RPC_S_NO_BINDINGS) binding_count_before = 0; @@ -60,6 +53,13 @@ static void test_RpcServerUseProtseq(void) RpcBindingVectorFree(&bindings); } + /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as + * RpcServerUseProtseq(...) */ + status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); + ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), + "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", + status); + /* register protocol sequences without explicit endpoints */ status = RpcServerUseProtseq(np, 0, NULL); if (status == RPC_S_PROTSEQ_NOT_SUPPORTED)

1 0

Rob Shearman : rpcrt4: Free the memory allocated for the protseq and endpoint strings allocated in RpcServerUseProtseq* functions .
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 317edfd7dabbe4bd25fad4eb8e83f72821c205f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317edfd7dabbe4bd25fad4eb8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:42:35 2009 +0100 rpcrt4: Free the memory allocated for the protseq and endpoint strings allocated in RpcServerUseProtseq* functions. Make a copy of the protseq string in alloc_serverprotoseq to simplify memory management in higher-level functions. --- dlls/rpcrt4/rpc_server.c | 31 ++++++++++++++++++------------- dlls/rpcrt4/rpc_server.h | 2 +- dlls/rpcrt4/rpc_transport.c | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 6e9dbe9..6214965 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -566,7 +566,7 @@ static void RPCRT4_stop_listen(BOOL auto_listen) LeaveCriticalSection(&listen_cs); } -static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, LPCSTR endpoint) +static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, const char *endpoint) { RpcConnection *conn; EnterCriticalSection(&protseq->cs); @@ -579,7 +579,7 @@ static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, LPC return (conn != NULL); } -static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, LPSTR endpoint) +static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, const char *endpoint) { RPC_STATUS status; @@ -693,7 +693,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW( RPC_WSTR Protseq, UINT MaxCalls, RPC_W * * Must be called with server_cs held. */ -static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) +static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcServerProtseq **ps) { const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq); @@ -707,7 +707,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerPr if (!*ps) return RPC_S_OUT_OF_RESOURCES; (*ps)->MaxCalls = MaxCalls; - (*ps)->Protseq = Protseq; + (*ps)->Protseq = RPCRT4_strdupA(Protseq); (*ps)->ops = ops; (*ps)->MaxCalls = 0; (*ps)->conn = NULL; @@ -735,7 +735,7 @@ static void destroy_serverprotoseq(RpcServerProtseq *ps) } /* Finds a given protseq or creates a new one if one doesn't already exist */ -static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps) +static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, const char *Protseq, RpcServerProtseq **ps) { RPC_STATUS status; RpcServerProtseq *cps; @@ -764,19 +764,18 @@ static RPC_STATUS RPCRT4_get_or_create_serverprotseq(UINT MaxCalls, char *Protse RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC_CSTR Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { - char *szps = (char*)Protseq, *szep = (char*)Endpoint; RpcServerProtseq* ps; RPC_STATUS status; - TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a(szps), MaxCalls, - debugstr_a(szep), SecurityDescriptor, + TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a((const char *)Protseq), + MaxCalls, debugstr_a((const char *)Endpoint), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, (const char *)Protseq, &ps); if (status != RPC_S_OK) return status; - return RPCRT4_use_protseq(ps, szep); + return RPCRT4_use_protseq(ps, (const char *)Endpoint); } /*********************************************************************** @@ -787,13 +786,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC { RpcServerProtseq* ps; RPC_STATUS status; + LPSTR ProtseqA; LPSTR EndpointA; TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + ProtseqA = RPCRT4_strdupWtoA(Protseq); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, ProtseqA, &ps); + RPCRT4_strfree(ProtseqA); if (status != RPC_S_OK) return status; @@ -813,7 +815,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqA(RPC_CSTR Protseq, unsigned int MaxCalls, TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA((const char *)Protseq), &ps); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, (const char *)Protseq, &ps); if (status != RPC_S_OK) return status; @@ -827,10 +829,13 @@ RPC_STATUS WINAPI RpcServerUseProtseqW(RPC_WSTR Protseq, unsigned int MaxCalls, { RPC_STATUS status; RpcServerProtseq* ps; + LPSTR ProtseqA; TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_w(Protseq), MaxCalls, SecurityDescriptor); - status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + ProtseqA = RPCRT4_strdupWtoA(Protseq); + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, ProtseqA, &ps); + RPCRT4_strfree(ProtseqA); if (status != RPC_S_OK) return status; diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index 0498616..cacce79 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -56,7 +56,7 @@ struct protseq_ops * new connection was established */ int (*wait_for_new_connection)(RpcServerProtseq *protseq, unsigned int count, void *wait_array); /* opens the endpoint and optionally begins listening */ - RPC_STATUS (*open_endpoint)(RpcServerProtseq *protseq, LPSTR endpoint); + RPC_STATUS (*open_endpoint)(RpcServerProtseq *protseq, const char *endpoint); }; typedef struct _RpcServerInterface diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 39908bc..8f159e4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -255,7 +255,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) return r; } -static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; @@ -313,7 +313,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) return r; } -static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { static const char prefix[] = "\\\\."; RPC_STATUS r; @@ -869,7 +869,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) return RPC_S_SERVER_UNAVAILABLE; } -static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) +static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { RPC_STATUS status = RPC_S_CANT_CREATE_ENDPOINT; int sock;

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: a61e117781659b075506e2a42fca63ccbdb4b0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61e117781659b075506e2a42… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 30 10:43:50 2009 +0200 kernel32/tests: Fix some test failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index ab7c7fa..5120ec7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -802,6 +802,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } +static DWORD timeout = 0; + static BOOL check_file_data(LPCSTR path, LPCSTR data) { HANDLE file; @@ -809,6 +811,10 @@ static BOOL check_file_data(LPCSTR path, LPCSTR data) DWORD size; BOOL ret; + /* Sleep() is needed on Win9x and WinME */ + if (timeout) + Sleep(timeout); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return FALSE; @@ -847,6 +853,8 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + if (GetLastError() == 0xdeadbeef) + timeout = 1000; ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n"); @@ -905,7 +913,9 @@ static void test_WritePrivateProfileString(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); todo_wine { - ok(check_file_data(path, data), "File doesn't match\n"); + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); } DeleteFileA(path); @@ -913,15 +923,20 @@ static void test_WritePrivateProfileString(void) data = "[App]\r\n" "key=\r\n"; ret = WritePrivateProfileStringA("App", "key", "", path); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(check_file_data(path, data), "File doesn't match\n"); + ok(ret == TRUE || + broken(!ret), /* Win9x and WinME */ + "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); DeleteFileA(path); /* empty lpFileName */ SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA("App", "key", "string", ""); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_ACCESS_DENIED || + broken(GetLastError() == ERROR_PATH_NOT_FOUND), /* Win9x and WinME */ "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); /* The resulting file will be X:\\%WINDIR%\\win1.tmp */

1 0

Eric Pouech : winedbg: Fix the way array derefs are done.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: fac749634521e085353fee7fe285fdbeffe1b6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac749634521e085353fee7fe… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 29 17:21:55 2009 +0200 winedbg: Fix the way array derefs are done. --- programs/winedbg/types.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index ef5469f..8d3dabc 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -310,26 +310,26 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, DWORD64 length; if (!types_get_real_type(&type, &tag)) return FALSE; + /* Contents of array share same data (addr mode, module...) */ + *result = *lvalue; switch (tag) { case SymTagArrayType: types_get_info(&type, TI_GET_COUNT, &count); if (index < 0 || index >= count) return FALSE; - /* fall through */ + break; case SymTagPointerType: - /* Contents of array share same data (addr mode, module...) */ - *result = *lvalue; - /* - * Get the base type, so we know how much to index by. - */ - types_get_info(&type, TI_GET_TYPE, &result->type.id); - types_get_info(&result->type, TI_GET_LENGTH, &length); memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset); - result->addr.Offset += index * (DWORD)length; break; default: assert(FALSE); } + /* + * Get the base type, so we know how much to index by. + */ + types_get_info(&type, TI_GET_TYPE, &result->type.id); + types_get_info(&result->type, TI_GET_LENGTH, &length); + result->addr.Offset += index * (DWORD)length; return TRUE; }

1 0

Eric Pouech : winmm: Added support for SND_ALIAS_ID in winmm.PlaySound[AW].
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 2dbc7d5c41e03d0456feb83c731a51754e13a812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbc7d5c41e03d0456feb83c7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 29 17:22:43 2009 +0200 winmm: Added support for SND_ALIAS_ID in winmm.PlaySound[AW]. --- dlls/winmm/playsound.c | 40 +++++++++++++++++++++++++++++++++------- include/mmsystem.h | 13 +++++++++++++ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a4d21ce..143f4a9 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -193,11 +193,12 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz) /* SND_RESOURCE is 0x40004 while * SND_MEMORY is 0x00004 */ - switch (fdwSound & (SND_RESOURCE|SND_ALIAS|SND_FILENAME)) + switch (fdwSound & (SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME)) { case SND_RESOURCE: return HIWORD(psz) != 0; /* by name or by ID ? */ + case SND_ALIAS_ID: case SND_MEMORY: return FALSE; - case SND_ALIAS: /* what about ALIAS_ID ??? */ + case SND_ALIAS: case SND_FILENAME: case 0: return TRUE; default: FIXME("WTF\n"); return FALSE; @@ -309,6 +310,36 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } else if (wps->fdwSound & SND_ALIAS) { + if (wps->fdwSound & SND_ALIAS_ID) + { + static const WCHAR wszSystemAsterisk[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; + static const WCHAR wszSystemDefault[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t',0}; + static const WCHAR wszSystemExclamation[] = {'S','y','s','t','e','m','E','x','c','l','a','m','a','t','i','o','n',0}; + static const WCHAR wszSystemExit[] = {'S','y','s','t','e','m','E','x','i','t',0}; + static const WCHAR wszSystemHand[] = {'S','y','s','t','e','m','H','a','n','d',0}; + static const WCHAR wszSystemQuestion[] = {'S','y','s','t','e','m','Q','u','e','s','t','i','o','n',0}; + static const WCHAR wszSystemStart[] = {'S','y','s','t','e','m','S','t','a','r','t',0}; + static const WCHAR wszSystemWelcome[] = {'S','y','s','t','e','m','W','e','l','c','o','m','e',0}; + + wps->fdwSound &= ~(SND_ALIAS_ID ^ SND_ALIAS); + if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMASTERISK) + wps->pszSound = wszSystemAsterisk; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMDEFAULT) + wps->pszSound = wszSystemDefault; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXCLAMATION) + wps->pszSound = wszSystemExclamation; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXIT) + wps->pszSound = wszSystemExit; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMHAND) + wps->pszSound = wszSystemHand; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMQUESTION) + wps->pszSound = wszSystemQuestion; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMSTART) + wps->pszSound = wszSystemStart; + else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMWELCOME) + wps->pszSound = wszSystemWelcome; + else return FALSE; + } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); } else if (wps->fdwSound & SND_FILENAME) @@ -446,11 +477,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) return FALSE; - if ((fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { - FIXME("SND_ALIAS_ID not supported\n"); - return FALSE; - } - /* alloc internal structure, if we need to play something */ if (pszSound && !(fdwSound & SND_PURGE)) { diff --git a/include/mmsystem.h b/include/mmsystem.h index abed551..39f70a1 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -285,6 +285,19 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound); #define SND_PURGE 0x00000040L /* purge all sounds */ #define SND_APPLICATION 0x00000080L /* look for application specific association */ +#define SND_ALIAS_START 0 + +#define sndAlias(ch0, ch1) (SND_ALIAS_START + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8))) + +#define SND_ALIAS_SYSTEMASTERISK sndAlias('S', '*') +#define SND_ALIAS_SYSTEMQUESTION sndAlias('S', '?') +#define SND_ALIAS_SYSTEMHAND sndAlias('S', 'H') +#define SND_ALIAS_SYSTEMEXIT sndAlias('S', 'E') +#define SND_ALIAS_SYSTEMSTART sndAlias('S', 'S') +#define SND_ALIAS_SYSTEMWELCOME sndAlias('S', 'W') +#define SND_ALIAS_SYSTEMEXCLAMATION sndAlias('S', '!') +#define SND_ALIAS_SYSTEMDEFAULT sndAlias('S', 'D') + /* waveform audio error return values */ #define WAVERR_BADFORMAT (WAVERR_BASE + 0) /* unsupported wave format */ #define WAVERR_STILLPLAYING (WAVERR_BASE + 1) /* still something playing */

1 0

Aric Stewart : msctf: Add a file version.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: f02e4dcf272e8602979d9301f293b905e4bc0fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02e4dcf272e8602979d9301f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 27 12:22:03 2009 -0500 msctf: Add a file version. Checked by the IE8 install. --- dlls/msctf/Makefile.in | 3 +++ dlls/msctf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 5502bd6..4387913 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -14,6 +14,9 @@ C_SRCS = \ regsvr.c \ threadmgr.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msctf/version.rc b/dlls/msctf/version.rc new file mode 100644 index 0000000..8bd8ff3 --- /dev/null +++ b/dlls/msctf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 CodeWeavers, Aric Stewart + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Msctf" +#define WINE_FILENAME_STR "msctf.dll" +#define WINE_FILEVERSION 5,1,2600,3319 +#define WINE_FILEVERSION_STR " 5.1.2600.3319" +#define WINE_PRODUCTVERSION 5,1,2600,3319 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3319" + +#include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : dsound/tests: Remove duplicate version dump.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 8819156b493408c97c53fc62f7634e6abffab9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8819156b493408c97c53fc62f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 27 22:37:27 2009 +0100 dsound/tests: Remove duplicate version dump. We have the version already in the header of the winetest results. --- dlls/dsound/tests/capture.c | 1 - dlls/dsound/tests/ds3d.c | 1 - dlls/dsound/tests/ds3d8.c | 1 - dlls/dsound/tests/dsound.c | 1 - dlls/dsound/tests/dsound8.c | 34 ---------------------------------- dlls/dsound/tests/dsound_test.h | 1 - dlls/dsound/tests/duplex.c | 1 - dlls/dsound/tests/propset.c | 1 - 8 files changed, 0 insertions(+), 41 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index b2a377a..87a5a59 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -687,7 +687,6 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index db662c0..8f5b88a 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1280,7 +1280,6 @@ START_TEST(ds3d) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index ba9f2d2..1f5f28a 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1133,7 +1133,6 @@ START_TEST(ds3d8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a3fa8..114dbb6 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1083,7 +1083,6 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 2e02a92..c79a7ac 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -874,39 +874,6 @@ static void dsound8_tests(void) ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); } -const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA("dsound.dll", &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA("dsound.dll", handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -} START_TEST(dsound8) { @@ -917,7 +884,6 @@ START_TEST(dsound8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound_test.h b/dlls/dsound/tests/dsound_test.h index 23ca169..b09c98b 100644 --- a/dlls/dsound/tests/dsound_test.h +++ b/dlls/dsound/tests/dsound_test.h @@ -85,5 +85,4 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*, LPDIRECTSOUND3DLISTENER,BOOL,BOOL); extern const char * getDSBCAPS(DWORD xmask); extern int align(int length, int align); -extern const char * get_file_version(const char * file_name); extern const char * format_string(const WAVEFORMATEX* wfx); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ae816a4..11fb2a7 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -231,7 +231,6 @@ START_TEST(duplex) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, "DirectSoundFullDuplexCreate"); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fba6e06..70a8e0d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -720,7 +720,6 @@ START_TEST(propset) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA");

1 0

Detlef Riekenberg : dinput/tests: Remove duplicate version dump.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5599912e2735a0e0aaf97165acc4c6a78548cf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5599912e2735a0e0aaf97165a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 27 22:45:59 2009 +0100 dinput/tests: Remove duplicate version dump. We have the version already in the header of the winetest results. --- dlls/dinput/tests/dinput_test.h | 19 ------------------- dlls/dinput/tests/joystick.c | 3 --- dlls/dinput/tests/keyboard.c | 37 ------------------------------------- dlls/dinput/tests/mouse.c | 3 --- 4 files changed, 0 insertions(+), 62 deletions(-) diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h deleted file mode 100644 index 9a9af6c..0000000 --- a/dlls/dinput/tests/dinput_test.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2005 Robert Reif - * - * 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 - */ - -extern const char * get_file_version(const char * file_name); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 944dbb1..aad8049 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" #define numObjects(x) (sizeof(x) / sizeof(x[0])) @@ -635,8 +634,6 @@ START_TEST(joystick) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - joystick_tests(0x0700); joystick_tests(0x0500); joystick_tests(0x0300); diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index de55d32..2d4a12f 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -29,41 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" - -const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA(file_name, &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA(file_name, handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -} static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) { @@ -201,8 +166,6 @@ START_TEST(keyboard) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - keyboard_tests(0x0700); CoUninitialize(); diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 42e5982..520a867 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "dinput.h" -#include "dinput_test.h" static const HRESULT SetCoop_null_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, @@ -145,8 +144,6 @@ START_TEST(mouse) { CoInitialize(NULL); - trace("DLL Version: %s\n", get_file_version("dinput.dll")); - mouse_tests(); CoUninitialize();

1 0

Austin English : cryptui: Fix a compiler warning on PC-BSD.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: f52c7e2ad0ac6fe8c2999ec649cfa25f7a6611df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52c7e2ad0ac6fe8c2999ec64… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Mar 27 17:13:48 2009 -0500 cryptui: Fix a compiler warning on PC-BSD. --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ddbea8e..f29f1e6 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3337,7 +3337,7 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) DWORD size; RECT rc; LVCOLUMNW column; - PurposeSelection purposeSelection; + PurposeSelection purposeSelection = PurposeEnableAll; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH;

1 0