October 2006 - Wine-Commits

Hans Leidekker : advapi32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 4301816d47c45a44f27cd3ed82d44a2fafdf665a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4301816d47c45a44f27cd3e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Oct 3 15:48:41 2006 +0200 advapi32: Win64 printf format warning fixes. --- dlls/advapi32/Makefile.in | 2 + dlls/advapi32/advapi.c | 8 ++-- dlls/advapi32/crypt.c | 90 +++++++++++++++++++++++---------------------- dlls/advapi32/eventlog.c | 12 +++--- dlls/advapi32/lsa.c | 22 ++++++----- dlls/advapi32/registry.c | 56 ++++++++++++++-------------- dlls/advapi32/security.c | 88 ++++++++++++++++++++++---------------------- dlls/advapi32/service.c | 60 +++++++++++++++--------------- 8 files changed, 169 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4301816d47c45a44f27…

1 0

Robert Shearman : rpcrt4: Use I_Rpc{Allocate, Free} instead of Heap{Alloc, Free} as that
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 2324aeec33e5e7704109d8e3fcd4315c9a0fea57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2324aeec33e5e7704109d8e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Oct 3 14:40:48 2006 +0100 rpcrt4: Use I_Rpc{Allocate, Free} instead of Heap{Alloc, Free} as that the former are exported by rpcrt4 seemingly to allow callers of tower functions to free the allocated memory. --- dlls/rpcrt4/rpc_transport.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c8abb18..a627119 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -181,14 +181,14 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp /* protseq=ncalrpc: supposed to use NT LPC ports, * but we'll implement it with named pipes for now */ - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); + pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); if (Connection->server) r = rpcrt4_connect_pipe(Connection, pname); else r = rpcrt4_open_pipe(Connection, pname, TRUE); - HeapFree(GetProcessHeap(), 0, pname); + I_RpcFree(pname); return r; } @@ -205,13 +205,13 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R return RPC_S_OK; /* protseq=ncacn_np: named pipes */ - pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); + pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); if (Connection->server) r = rpcrt4_connect_pipe(Connection, pname); else r = rpcrt4_open_pipe(Connection, pname, FALSE); - HeapFree(GetProcessHeap(), 0, pname); + I_RpcFree(pname); return r; } @@ -339,7 +339,7 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_ if (endpoint) { - *endpoint = HeapAlloc(GetProcessHeap(), 0, smb_floor->count_rhs); + *endpoint = I_RpcAllocate(smb_floor->count_rhs); if (!*endpoint) return RPC_S_OUT_OF_RESOURCES; memcpy(*endpoint, tower_data, smb_floor->count_rhs); @@ -362,12 +362,12 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_ if (networkaddr) { - *networkaddr = HeapAlloc(GetProcessHeap(), 0, nb_floor->count_rhs); + *networkaddr = I_RpcAllocate(nb_floor->count_rhs); if (!*networkaddr) { if (endpoint) { - HeapFree(GetProcessHeap(), 0, *endpoint); + I_RpcFree(*endpoint); *endpoint = NULL; } return RPC_S_OUT_OF_RESOURCES; @@ -433,7 +433,7 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_t if (endpoint) { - *endpoint = HeapAlloc(GetProcessHeap(), 0, pipe_floor->count_rhs); + *endpoint = I_RpcAllocate(pipe_floor->count_rhs); if (!*endpoint) return RPC_S_OUT_OF_RESOURCES; memcpy(*endpoint, tower_data, pipe_floor->count_rhs); @@ -673,7 +673,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa if (endpoint) { - *endpoint = HeapAlloc(GetProcessHeap(), 0, 6); + *endpoint = I_RpcAllocate(6 /* sizeof("65535") + 1 */); if (!*endpoint) return RPC_S_OUT_OF_RESOURCES; sprintf(*endpoint, "%u", ntohs(tcp_floor->port)); @@ -681,12 +681,12 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa if (networkaddr) { - *networkaddr = HeapAlloc(GetProcessHeap(), 0, INET_ADDRSTRLEN); + *networkaddr = I_RpcAllocate(INET_ADDRSTRLEN); if (!*networkaddr) { if (endpoint) { - HeapFree(GetProcessHeap(), 0, *endpoint); + I_RpcFree(*endpoint); *endpoint = NULL; } return RPC_S_OUT_OF_RESOURCES; @@ -695,11 +695,11 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa if (!inet_ntop(AF_INET, &in_addr, *networkaddr, INET_ADDRSTRLEN)) { ERR("inet_ntop: %s\n", strerror(errno)); - HeapFree(GetProcessHeap(), 0, *networkaddr); + I_RpcFree(*networkaddr); *networkaddr = NULL; if (endpoint) { - HeapFree(GetProcessHeap(), 0, *endpoint); + I_RpcFree(*endpoint); *endpoint = NULL; } return EPT_S_NOT_REGISTERED; @@ -949,7 +949,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower( if ((status == RPC_S_OK) && protseq) { - *protseq = HeapAlloc(GetProcessHeap(), 0, strlen(protseq_ops->name) + 1); + *protseq = I_RpcAllocate(strlen(protseq_ops->name) + 1); strcpy(*protseq, protseq_ops->name); }

1 0

Robert Shearman : rpcrt4: RpcBindingCopy is implemented.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 7dab87e2e9f343fe8d35ea8befa1b2c7e12c21fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7dab87e2e9f343fe8d35ea8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Oct 3 14:41:04 2006 +0100 rpcrt4: RpcBindingCopy is implemented. --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 82f4334..c5498d7 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -369,7 +369,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcAsyncGetCallStatus @ stub RpcAsyncInitializeHandle @ stub RpcAsyncRegisterInfo -@ stub RpcBindingCopy +@ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) @ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr)

1 0

Robert Shearman : rpcrt4: Don' t use HEAP_ZERO_MEMORY when most of the fields will be initialised to non-zero values .
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: b9423076bafc788e643ca22e9878684c5b26c87c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9423076bafc788e643ca22… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Oct 3 14:40:57 2006 +0100 rpcrt4: Don't use HEAP_ZERO_MEMORY when most of the fields will be initialised to non-zero values. --- dlls/rpcrt4/rpc_transport.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 27b0d84..c8abb18 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -90,7 +90,14 @@ typedef struct _RpcConnection_np static RpcConnection *rpcrt4_conn_np_alloc(void) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_np)); + RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_np)); + if (npc) + { + npc->pipe = NULL; + npc->thread = NULL; + memset(&npc->ovl, 0, sizeof(npc->ovl)); + } + return &npc->common; } static RPC_STATUS rpcrt4_connect_pipe(RpcConnection *Connection, LPCSTR pname) @@ -446,8 +453,9 @@ typedef struct _RpcConnection_tcp static RpcConnection *rpcrt4_conn_tcp_alloc(void) { RpcConnection_tcp *tcpc; - tcpc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_tcp)); - tcpc->sock = -1; + tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); + if (tcpc) + tcpc->sock = -1; return &tcpc->common; } @@ -779,13 +787,17 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo return RPC_S_PROTSEQ_NOT_SUPPORTED; NewConnection = ops->alloc(); + NewConnection->Next = NULL; NewConnection->server = server; NewConnection->ops = ops; NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); NewConnection->Used = Binding; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; + memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); NewConnection->NextCallId = 1; + + memset(&NewConnection->ctx, 0, sizeof(NewConnection->ctx)); if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; list_init(&NewConnection->conn_pool_entry);

1 0

Dmitry Timoshkov : user: Increase the time during which flush_events() waits for pending events.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 64886ebc9f8201d80b03e35d8afc3f42d7db1ce0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64886ebc9f8201d80b03e35… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 3 18:15:02 2006 +0900 user: Increase the time during which flush_events() waits for pending events. --- dlls/user/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 7ad9aea..3ec79a5 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -64,7 +64,7 @@ #define COUNTOF(arr) (sizeof(arr)/sizeof static void flush_events(void) { MSG msg; - int diff = 100; + int diff = 200; DWORD time = GetTickCount() + diff; while (diff > 0)

1 0

Paul Vriens : crypt32: Remove bogus tests.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 0484cb0a5a36379a563d48a6fb426ef2f26dd90a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0484cb0a5a36379a563d48a… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Oct 3 14:37:41 2006 +0200 crypt32: Remove bogus tests. --- dlls/crypt32/tests/sip.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index afdaf1a..3b57f43 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -291,43 +291,24 @@ static void test_SIPLoad(void) "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); - /* cbSize not initialized */ - SetLastError(0xdeadbeef); - memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); - sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; - ret = CryptSIPLoad(&dummySubject, 0, &sdi); - ok ( !ret, "Expected CryptSIPLoad to fail\n"); - todo_wine - ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, - "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); - ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); - - /* cbSize not initialized, but valid subject (named unknown but registered by wintrust) */ + /* All OK */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&unknown, 0, &sdi); todo_wine { ok ( ret, "Expected CryptSIPLoad to succeed\n"); + /* This error will always be there as native searches for the function DllCanUnloadNow + * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL. + * For now there's no need to implement this is Wine. + */ ok ( GetLastError() == ERROR_PROC_NOT_FOUND, "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); } - /* All OK */ - SetLastError(0xdeadbeef); - memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); - sdi.cbSize = sizeof(SIP_DISPATCH_INFO); - sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; - ret = CryptSIPLoad(&unknown, 0, &sdi); - todo_wine - ok ( ret, "Expected CryptSIPLoad to succeed\n"); - ok ( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - todo_wine - ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); - /* The function addresses returned by CryptSIPLoad are actually the addresses of * crypt32's own functions. A function calling these addresses will end up first * calling crypt32 functions which in it's turn call the equivalent in the SIP

1 0

Francois Gouget : shell32: Microsoft' s EXP_DARWIN_LINK structure does not have a dbh
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: c22eb7e3a3b9ffa43227e10f3fbb7b4bf9cb8d1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c22eb7e3a3b9ffa43227e10… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 3 14:12:18 2006 +0200 shell32: Microsoft's EXP_DARWIN_LINK structure does not have a dbh field so cast it to DATABLOCK_HEADER to access the dwSignature field. Fixes the compilation with Visual C++ on Windows. --- dlls/shell32/tests/shelllink.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index aaf0283..174c95f 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -32,11 +32,6 @@ #include "wine/test.h" #include "shell32_test.h" -#ifndef _MSC_VER -#define DBH(x) (x).dbh -#else -#define DBH(x) (x) -#endif typedef void (WINAPI *fnILFree)(LPITEMIDLIST); typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); @@ -612,7 +607,7 @@ static void test_datalink(void) r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); ok( r == S_OK, "CopyDataBlock failed\n"); - ok( dar && DBH(*dar).dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n"); + ok( dar && ((DATABLOCK_HEADER*)dar)->dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n"); ok( dar && 0==lstrcmpW(dar->szwDarwinID, comp ), "signature wrong\n"); LocalFree( dar );

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 38520a819cdce84d72b94aa775236fdc4318c5f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38520a819cdce84d72b94aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 3 14:10:58 2006 +0200 Assorted spelling fixes. --- dlls/kernel32/thunk.c | 4 ++-- dlls/ole32/tests/storage32.c | 2 +- dlls/shlwapi/path.c | 2 +- tools/winapi/winapi_check_options.pm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index eeeb621..3bb7e5e 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -117,7 +117,7 @@ #if 0 char pszDll32[256]; /*120 */ We do it differently since all our thunk handling is done - by 32-bit code. Therefore we do not need do provide + by 32-bit code. Therefore we do not need to provide easy access to this data, especially the process target table database, for 16-bit code. #endif @@ -1542,7 +1542,7 @@ void WINAPI C16ThkSL01(CONTEXT86 *contex context->SegCs = HIWORD(context->Eax); /* Since C16ThkSL01 got called by a jmp, we need to leave the - orginal return address on the stack */ + original return address on the stack */ context->Esp -= 4; } else diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 469e53a..65df045 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -388,7 +388,7 @@ static void test_open_storage(void) DeleteFileW(filename); - /* try opening a non-existant file - it should create it */ + /* try opening a nonexistent file - it should create it */ stgm = STGM_DIRECT | STGM_SHARE_EXCLUSIVE | STGM_READWRITE; r = StgOpenStorage( filename, NULL, stgm, NULL, 0, &stg); ok(r==S_OK, "StgOpenStorage failed: 0x%08lx\n", r); diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 32e7b74..c298f35 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1112,7 +1112,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR * * NOTES * lpszPath is modified in place and must be at least MAX_PATH in length. - * If the function returns FALSE, the path is modified to its orginal state. + * If the function returns FALSE, the path is modified to its original state. * If the given path contains an extension or dwWhich is 0, executable * extensions are not checked. * diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index a748b05..23abb1f 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -104,7 +104,7 @@ my %options_long = ( "documentation-pedantic" => { default => 0, parent => "documentation", - description => "be pendantic when checking for documentation inconsistencies" + description => "be pedantic when checking for documentation inconsistencies" }, "documentation-arguments" => {

1 0

Francois Gouget : urlmon: Fix spelling of the 'origin' parameter in the *Protocol_Seek() functions.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 398245b640ce3e2425bdda36c96d7269c72b0839 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=398245b640ce3e2425bdda3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 3 14:11:42 2006 +0200 urlmon: Fix spelling of the 'origin' parameter in the *Protocol_Seek() functions. --- dlls/urlmon/file.c | 4 ++-- dlls/urlmon/ftp.c | 4 ++-- dlls/urlmon/http.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index e9f4c27..8a45bfb 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -245,10 +245,10 @@ static HRESULT WINAPI FileProtocol_Read( } static HRESULT WINAPI FileProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, - DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { FileProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 7fa0e41..4d55b8d 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -144,10 +144,10 @@ static HRESULT WINAPI FtpProtocol_Read(I } static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, - DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 0b1811e..e5fb302 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -152,10 +152,10 @@ static HRESULT WINAPI HttpProtocol_Read( } static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, - DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { HttpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; }

1 0

Francois Gouget : Add missing '\n's to ok() calls.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 17aa2c82d26c55d303f65c14b52ce0275aee7173 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17aa2c82d26c55d303f65c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 3 14:09:58 2006 +0200 Add missing '\n's to ok() calls. --- dlls/kernel32/tests/path.c | 2 +- dlls/ntdll/tests/info.c | 6 +++--- dlls/rsaenh/tests/rsaenh.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e348865..9e31ad7 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -940,7 +940,7 @@ static void test_GetLongPathNameW(void) if(pGetLongPathNameW) { ok(0==length,"GetLongPathNameW returned %ld but expected 0\n",length); - ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %lx but expected ERROR_INVALID_PARAMETER",GetLastError()); + ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %lx but expected ERROR_INVALID_PARAMETER\n",GetLastError()); SetLastError(0xdeadbeef); empty[0]=0; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2588bed..30e1500 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -773,13 +773,13 @@ static void test_readvirtualmemory(void) status = pNtReadVirtualMemory(process, teststring, buffer, 12, &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); - ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* no number of bytes */ memset(buffer, 0, 12); status = pNtReadVirtualMemory(process, teststring, buffer, 12, NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); - ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* illegal remote address */ todo_wine{ @@ -798,7 +798,7 @@ static void test_readvirtualmemory(void) status = pNtReadVirtualMemory((HANDLE)-1, teststring, buffer, 12, &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount); - ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory"); + ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n"); /* this test currently crashes wine with "wine client error:<process id>: read: Bad address" * because the reply from wine server is directly read into the buffer and that fails with EFAULT diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2162562..25467d7 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1175,7 +1175,7 @@ static void test_import_export(void) result = CryptExportKey(hPublicKey, 0, PUBLICKEYBLOB, 0, emptyKey, &dwLen); ok(result, "failed to export the fresh imported public key\n"); - ok(dwLen == 84, "Expected exported key to be 84 bytes long but got %ld bytes.",dwLen); + ok(dwLen == 84, "Expected exported key to be 84 bytes long but got %ld bytes.\n",dwLen); ok(!memcmp(emptyKey, abPlainPublicKey, dwLen), "exported key is different from the imported key\n"); }

1 0