June 2008 - Wine-commits - list.winehq.org

Francois Gouget : start: Remove spaces before '\n' in resource strings.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 88d3994de2db1b3ec2a34f331765993d38ba3fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d3994de2db1b3ec2a34f331… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 10:22:33 2008 +0200 start: Remove spaces before '\n' in resource strings. --- programs/start/Cs.rc | 64 ++++++++++++------------ programs/start/De.rc | 64 ++++++++++++------------ programs/start/En.rc | 66 +++++++++++++------------- programs/start/Es.rc | 66 +++++++++++++------------- programs/start/Fr.rc | 64 ++++++++++++------------ programs/start/It.rc | 64 ++++++++++++------------ programs/start/Ko.rc | 66 +++++++++++++------------- programs/start/Nl.rc | 66 +++++++++++++------------- programs/start/No.rc | 68 +++++++++++++------------- programs/start/Pl.rc | 62 ++++++++++++------------ programs/start/Pt.rc | 128 +++++++++++++++++++++++++------------------------- programs/start/Ru.rc | 70 ++++++++++++++-------------- programs/start/Si.rc | 64 ++++++++++++------------ programs/start/Tr.rc | 64 ++++++++++++------------ 14 files changed, 488 insertions(+), 488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88d3994de2db1b3ec2a34…

1 0

Alexandre Julliard : user32/tests: Fix formatting of a trace.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 90d46e30101c463bfa81eaf42c54711396c0f433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d46e30101c463bfa81eaf42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 11:34:40 2008 +0200 user32/tests: Fix formatting of a trace. --- dlls/user32/tests/msg.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 62797e1..3c40320 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6547,17 +6547,12 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, GetClientRect(parent, &rc); trace("parent %p client size = (%d x %d)\n", parent, rc.right, rc.bottom); - - trace("ptReserved = (%d,%d)\n" - "ptMaxSize = (%d,%d)\n" - "ptMaxPosition = (%d,%d)\n" - "ptMinTrackSize = (%d,%d)\n" - "ptMaxTrackSize = (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + trace("Reserved=%d,%d MaxSize=%d,%d MaxPos=%d,%d MinTrack=%d,%d MaxTrack=%d,%d\n", + minmax->ptReserved.x, minmax->ptReserved.y, + minmax->ptMaxSize.x, minmax->ptMaxSize.y, + minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, + minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, + minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); ok(minmax->ptMaxSize.x == rc.right, "default width of maximized child %d != %d\n", minmax->ptMaxSize.x, rc.right);

1 0

Francois Gouget : advapi32/tests: Don't allow Wine to reproduce Windows' bugs.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 15ab77ad8ab0bc834f3621a2608a014f731215b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ab77ad8ab0bc834f3621a26… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 10:23:58 2008 +0200 advapi32/tests: Don't allow Wine to reproduce Windows' bugs. --- dlls/advapi32/tests/registry.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index fe3d3ff..c2ffad6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -775,7 +775,7 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ, &type, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ - ok(size == strlen(sTestpath1)+1 || size == strlen(sTestpath1)+2, + ok(size == strlen(sTestpath1)+1 || broken(size == strlen(sTestpath1)+2), "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%d\n", type); @@ -816,7 +816,7 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ - ok((size == strlen(expanded)+1) || (size == strlen(sTestpath1)+1), + ok(size == strlen(expanded)+1 || broken(size == strlen(sTestpath1)+1), "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%d\n", type); ok(!strcmp(expanded, buf), "expanded=\"%s\" buf=\"%s\"\n", expanded, buf); @@ -826,7 +826,7 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP2_EXP_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath2 length + 1 here. */ - ok((size == strlen(expanded2)+1) || (size == strlen(sTestpath2)+1), + ok(size == strlen(expanded2)+1 || broken(size == strlen(sTestpath2)+1), "strlen(expanded2)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded2), lstrlenA(sTestpath2), size); ok(type == REG_SZ, "type=%d\n", type); ok(!strcmp(expanded2, buf), "expanded2=\"%s\" buf=\"%s\"\n", expanded2, buf); @@ -844,7 +844,7 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND, NULL, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ - ok(size == strlen(sTestpath1)+1 || size == strlen(sTestpath1)+2, + ok(size == strlen(sTestpath1)+1 || broken(size == strlen(sTestpath1)+2), "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (type mismatch) */

1 0

Alexandre Julliard : kernel32/tests: Make the toolhelp test less verbose by default.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: a991afae9b49e3060d73fd3b8e250d8185ab6400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a991afae9b49e3060d73fd3b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 11:34:11 2008 +0200 kernel32/tests: Make the toolhelp test less verbose by default. --- dlls/kernel32/tests/toolhelp.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 357f82d..eb7b424 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -170,7 +170,8 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) { if (te.th32OwnerProcessID == curr_pid) curr_found++; if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; - trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); + if (winetest_debug > 1) + trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num++; } while (pThread32Next( hSnapshot, &te )); } @@ -186,7 +187,8 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) { if (te.th32OwnerProcessID == curr_pid) curr_found++; if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; - trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); + if (winetest_debug > 1) + trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num--; } while (pThread32Next( hSnapshot, &te )); }

1 0

Alexandre Julliard : ntdll/tests: Fix a few tests on Vista.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: e02fa190139dcbc4c6028064732a9c03069bc740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02fa190139dcbc4c60280647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 10 11:33:51 2008 +0200 ntdll/tests: Fix a few tests on Vista. --- dlls/ntdll/tests/error.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index b00b83b..d8d06cc 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -186,7 +186,7 @@ static void run_error_tests(void) cmp(STATUS_HANDLE_NOT_CLOSABLE, ERROR_INVALID_HANDLE); cmp(STATUS_NOT_COMMITTED, ERROR_INVALID_ADDRESS); cmp(STATUS_PARTIAL_COPY, ERROR_PARTIAL_COPY); - cmp(STATUS_LPC_REPLY_LOST, ERROR_INTERNAL_ERROR); + cmp3(STATUS_LPC_REPLY_LOST, ERROR_INTERNAL_ERROR, ERROR_CONNECTION_ABORTED); cmp(STATUS_INVALID_PARAMETER, ERROR_INVALID_PARAMETER); cmp(STATUS_INVALID_PARAMETER_1, ERROR_INVALID_PARAMETER); cmp(STATUS_INVALID_PARAMETER_2, ERROR_INVALID_PARAMETER); @@ -735,8 +735,8 @@ static void run_error_tests(void) cmp(STATUS_LOGIN_WKSTA_RESTRICTION, ERROR_LOGIN_WKSTA_RESTRICTION); cmp(STATUS_LICENSE_QUOTA_EXCEEDED, ERROR_LICENSE_QUOTA_EXCEEDED); cmp(STATUS_RESOURCE_NOT_OWNED, ERROR_NOT_OWNER); - cmp(STATUS_DUPLICATE_OBJECTID, STATUS_DUPLICATE_OBJECTID); - cmp(STATUS_OBJECTID_EXISTS, STATUS_OBJECTID_EXISTS); + cmp3(STATUS_DUPLICATE_OBJECTID, STATUS_DUPLICATE_OBJECTID, ERROR_OBJECT_ALREADY_EXISTS); + cmp3(STATUS_OBJECTID_EXISTS, STATUS_OBJECTID_EXISTS, ERROR_OBJECT_ALREADY_EXISTS); cmp2(STATUS_OBJECTID_NOT_FOUND, ERROR_FILE_NOT_FOUND); cmp2(STATUS_MFT_TOO_FRAGMENTED, ERROR_DISK_TOO_FRAGMENTED); cmp(SEC_E_INSUFFICIENT_MEMORY, ERROR_NO_SYSTEM_RESOURCES);

1 0

Paul Vriens : ole32/tests: Fix crash on W2K and below.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 470a0a22f414b56f16a9e9934a7be6a494028823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470a0a22f414b56f16a9e9934… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 10 10:10:18 2008 +0200 ole32/tests: Fix crash on W2K and below. --- dlls/ole32/tests/ole2.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 88b58e7..dbddd43 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -783,7 +783,8 @@ static void test_OleCreate(IStorage *pStorage) trace("OleCreate with OLERENDER_FORMAT:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_FORMAT, &formatetc, (IOleClientSite *)0xdeadbeef, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); - IOleObject_Release(pObject); + if (pObject) + IOleObject_Release(pObject); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); expected_method_list = methods_olerender_asis; @@ -839,7 +840,8 @@ static void test_OleLoad(IStorage *pStorage) trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok_ole_success(hr, "OleLoad"); - IOleObject_Release(pObject); + if (pObject) + IOleObject_Release(pObject); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); }

1 0

Paul Vriens : ole32/tests: Fix crash on NT4 and below.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: b1a5b940015ff734b314f61f220a9fd0dfc2c96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a5b940015ff734b314f61f2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 10 10:21:54 2008 +0200 ole32/tests: Fix crash on NT4 and below. --- dlls/ole32/tests/ole2.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index dbddd43..7ddbe78 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1130,11 +1130,15 @@ static void test_data_cache(void) hr = IOleCache_Uncache(pOleCache, 0xdeadbeef); ok(hr == OLE_E_NOCONNECTION, "IOleCache_Uncache with invalid value should return OLE_E_NOCONNECTION instead of 0x%x\n", hr); - hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection); - ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr); + /* Both tests crash on NT4 and below */ + if (0) + { + hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection); + ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr); - hr = IOleCache_Cache(pOleCache, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr); + hr = IOleCache_Cache(pOleCache, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr); + } for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++) {

1 0

Louis Lenders : mscoree: Add stub for CorBindToCurrentRuntime.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: c57688ee2592804db5eb038c67497cefe9a884c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57688ee2592804db5eb038c6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 8 20:03:22 2008 +0000 mscoree: Add stub for CorBindToCurrentRuntime. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 34defdc..0a75722 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -14,7 +14,7 @@ @ stub CoUninitializeCor @ stub CoUninitializeEE @ stub CollectCtrs -@ stub CorBindToCurrentRuntime +@ stdcall CorBindToCurrentRuntime(wstr ptr ptr ptr) @ stub CorBindToRuntime @ stub CorBindToRuntimeByCfg @ stub CorBindToRuntimeByPath diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 4995393..78ef1d3 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -312,6 +312,12 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD return E_NOTIMPL; } +HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s, %s, %s, %p): stub\n", debugstr_w(filename), debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%p, %p, %p): stub\n", rclsid, riid, ppv);

1 0

Rob Shearman : rpcrt4: Use RpcServerRegisterIfEx with RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH in the server test .
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: a1a5d8d02a94360f8ab183fb70232783ed051a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a5d8d02a94360f8ab183fb7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 9 22:36:43 2008 +0100 rpcrt4: Use RpcServerRegisterIfEx with RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH in the server test. This allows the test to run correctly on XP SP2 upwards instead of failing with ERROR_ACCESS_DENIED. --- dlls/rpcrt4/tests/server.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5cc9d42..5f6da37 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1240,13 +1240,24 @@ server(void) static unsigned char np[] = "ncacn_np"; static unsigned char pipe[] = PIPE; RPC_STATUS status, iptcp_status, np_status; + RPC_STATUS (RPC_ENTRY *pRpcServerRegisterIfEx)(RPC_IF_HANDLE,UUID*, + RPC_MGR_EPV*, unsigned int,unsigned int,RPC_IF_CALLBACK_FN*); iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %ld\n", iptcp_status); np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); ok(np_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %ld\n", np_status); - status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); + pRpcServerRegisterIfEx = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "RpcServerRegisterIfEx"); + if (pRpcServerRegisterIfEx) + { + trace("Using RpcServerRegisterIfEx\n"); + status = pRpcServerRegisterIfEx(s_IServer_v0_0_s_ifspec, NULL, NULL, + RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH, + RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + } + else + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %ld\n", status); status = RpcServerListen(1, 20, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %ld\n", status);

1 0

Rob Shearman : include: Add declaration for RpcSmDestroyClientContext to rpcndr.h.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: 85f3fedc4bce817c10bf49f063d7083985f52a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f3fedc4bce817c10bf49f06… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 9 22:36:27 2008 +0100 include: Add declaration for RpcSmDestroyClientContext to rpcndr.h. --- include/rpcndr.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 914f9f1..7938529 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -536,6 +536,9 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI NDR_SCONTEXT RPC_ENTRY NdrServerContextNewUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcSmDestroyClientContext( void **ContextHandle ); + RPCRTAPI void RPC_ENTRY RpcSsDestroyClientContext( void **ContextHandle );

1 0