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

Michael Karcher : msvcrt/file: stdio should clamp characters to 8 bits.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 5f2159e806a751aa42fcb5495556484b4aa66242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2159e806a751aa42fcb5495… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Aug 16 17:08:51 2008 +0200 msvcrt/file: stdio should clamp characters to 8 bits. --- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index cd15e40..c78e46c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2539,7 +2539,7 @@ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) return res ? res : c; } else - return c; + return c & 0xff; } else { return MSVCRT__flsbuf(c, file); } @@ -2568,7 +2568,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) unsigned char cc=c; int len; len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) return c; + if (len == 1) return c & 0xff; file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ec22d81..45ffdce 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -334,6 +334,63 @@ static void test_fgetc( void ) unlink(tempf); } +static void test_fputc( void ) +{ + char* tempf; + FILE *tempfh; + int ret; + + tempf=_tempnam(".","wne"); + tempfh = fopen(tempf,"wb"); + ret = fputc(0,tempfh); + ok(0 == ret, "fputc(0,tempfh) expected %x got %x\n", 0, ret); + ret = fputc(0xff,tempfh); + ok(0xff == ret, "fputc(0xff,tempfh) expected %x got %x\n", 0xff, ret); + ret = fputc(0xffffffff,tempfh); + ok(0xff == ret, "fputc(0xffffffff,tempfh) expected %x got %x\n", 0xff, ret); + fclose(tempfh); + + tempfh = fopen(tempf,"rb"); + ret = fputc(0,tempfh); + ok(EOF == ret, "fputc(0,tempfh) on r/o file expected %x got %x\n", EOF, ret); + fclose(tempfh); + + unlink(tempf); +} + +static void test_flsbuf( void ) +{ + char* tempf; + FILE *tempfh; + int ret; + int bufmode; + int bufmodes[] = {_IOFBF,_IONBF}; + + tempf=_tempnam(".","wne"); + for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) + { + tempfh = fopen(tempf,"wb"); + setvbuf(tempfh,NULL,bufmodes[bufmode],2048); + ret = _flsbuf(0,tempfh); + ok(0 == ret, "_flsbuf(0,tempfh) with bufmode %x expected %x got %x\n", + bufmodes[bufmode], 0, ret); + ret = _flsbuf(0xff,tempfh); + ok(0xff == ret, "_flsbuf(0xff,tempfh) with bufmode %x expected %x got %x\n", + bufmodes[bufmode], 0, ret); + ret = _flsbuf(0xffffffff,tempfh); + ok(0xff == ret, "_flsbuf(0xffffffff,tempfh) with bufmode %x expected %x got %x\n", + bufmodes[bufmode], 0, ret); + fclose(tempfh); + } + + tempfh = fopen(tempf,"rb"); + ret = _flsbuf(0,tempfh); + ok(EOF == ret, "_flsbuf(0,tempfh) on r/o file expected %x got %x\n", EOF, ret); + fclose(tempfh); + + unlink(tempf); +} + static void test_fgetwc( void ) { #define LLEN 512 @@ -1061,6 +1118,8 @@ START_TEST(file) test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_fgetc(); + test_fputc(); + test_flsbuf(); test_fgetwc(); test_ctrlz(); test_file_put_get();

1 0

James Hawkins : ole32: Test the file access and share modes of StgCreateDocFile.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 48524c9b92bf56d12627d03062e164f0c8138ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=48524c9b92bf56d12627d0306… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 22:50:52 2008 -0500 ole32: Test the file access and share modes of StgCreateDocFile. --- dlls/ole32/tests/storage32.c | 180 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 180 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7dc633c..d0b60e8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -999,6 +999,185 @@ static void test_ReadClassStm(void) ok(IsEqualCLSID(&clsid, &test_stg_cls), "clsid should have been set to CLSID_WineTest\n"); } +struct access_res +{ + BOOL gothandle; + DWORD lasterr; + BOOL todo; +}; + +struct access_res create[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_commit[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_close[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE } +}; + +static void _test_file_access(LPCSTR file, struct access_res *ares, DWORD line) +{ + DWORD access = 0, share = 0; + DWORD lasterr; + HANDLE hfile; + int i, j, idx = 0; + + for (i = 0; i < 4; i++) + { + if (i == 0) access = 0; + if (i == 1) access = GENERIC_READ; + if (i == 2) access = GENERIC_WRITE; + if (i == 3) access = GENERIC_READ | GENERIC_WRITE; + + for (j = 0; j < 4; j++) + { + if (j == 0) share = 0; + if (j == 1) share = FILE_SHARE_READ; + if (j == 2) share = FILE_SHARE_WRITE; + if (j == 3) share = FILE_SHARE_READ | FILE_SHARE_WRITE; + + SetLastError(0xdeadbeef); + hfile = CreateFileA(file, access, share, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, 0); + lasterr = GetLastError(); + if (ares[idx].todo) + { + todo_wine + { + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + } + } + else + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + + if (ares[idx].todo) + { + todo_wine + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + } + else + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + + CloseHandle(hfile); + idx++; + } + } +} + +#define test_file_access(file, ares) _test_file_access(file, ares, __LINE__) + +static void test_access(void) +{ + IStorage *stg; + HRESULT hr; + + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + + /* STGM_TRANSACTED */ + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | + STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create_commit); + + IStorage_Release(stg); + + test_file_access("winetest", create_close); + + DeleteFileA("winetest"); + + /* STGM_DIRECT */ + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | + STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_file_access("winetest", create_commit); + + IStorage_Release(stg); + + test_file_access("winetest", create_close); + + DeleteFileA("winetest"); + +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -1010,4 +1189,5 @@ START_TEST(storage32) test_streamenum(); test_transact(); test_ReadClassStm(); + test_access(); }

1 0

Michael Stefaniuc : riched20: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 9c62181a38640296d72c61650b58ecabf26ca8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c62181a38640296d72c61650… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 18 22:31:31 2008 +0200 riched20: Remove redundant NULL check before HeapFree (Smatch). --- dlls/riched20/list.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 092fde4..4ddc54a 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -123,8 +123,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { } if (item->type==diUndoSplitParagraph) { FREE_OBJ(item->member.para.pFmt); - if (item->member.para.pCell) - FREE_OBJ(item->member.para.pCell); + FREE_OBJ(item->member.para.pCell); } FREE_OBJ(item); }

1 0

Rob Shearman : rpcrt4: Implement RpcBindingReset.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 739d89369bf4f4dedb6daa506cfabbc765e84407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739d89369bf4f4dedb6daa506… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Aug 18 21:13:54 2008 +0100 rpcrt4: Implement RpcBindingReset. --- dlls/rpcrt4/rpc_binding.c | 17 +++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 4452d30..6a17a8c 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1013,6 +1013,23 @@ RPC_STATUS RPC_ENTRY RpcBindingCopy( } /*********************************************************************** + * RpcBindingReset (RPCRT4.@) + */ +RPC_STATUS RPC_ENTRY RpcBindingReset(RPC_BINDING_HANDLE Binding) +{ + RpcBinding *bind = Binding; + + TRACE("(%p)\n", Binding); + + RPCRT4_strfree(bind->Endpoint); + bind->Endpoint = NULL; + if (bind->Assoc) RpcAssoc_Release(bind->Assoc); + bind->Assoc = NULL; + + return RPC_S_OK; +} + +/*********************************************************************** * RpcImpersonateClient (RPCRT4.@) * * Impersonates the client connected via a binding handle so that security diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 1d33c64..e4857d2 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -350,7 +350,7 @@ @ stdcall RpcBindingInqAuthInfoW(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqObject(ptr ptr) @ stub RpcBindingInqOption -@ stub RpcBindingReset +@ stdcall RpcBindingReset(ptr) @ stub RpcBindingServerFromClient @ stdcall RpcBindingSetAuthInfoA(ptr str long long ptr long) @ stdcall RpcBindingSetAuthInfoExA(ptr str long long ptr long ptr)

1 0

Michael Stefaniuc : advapi/tests: CreateFile returns INVALID_HANDLE_VALUE on error (Smatch).
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 3b8aeb913b5995295f27d3f3bd5086ca87e44b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8aeb913b5995295f27d3f3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 18 22:31:22 2008 +0200 advapi/tests: CreateFile returns INVALID_HANDLE_VALUE on error (Smatch). --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6b0ecfa..f2bafce 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2496,7 +2496,7 @@ static void test_GetSecurityInfo(void) /* Create something. Files have lots of associated security info. */ obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (!obj) + if (obj == INVALID_HANDLE_VALUE) { skip("Couldn't create an object for GetSecurityInfo test\n"); return;

1 0

Rob Shearman : rpcrt4: Check for previous association being NULL in RPCRT4_ResolveBinding.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 6ed020d8133871e3dea67f672967fb2bac274376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed020d8133871e3dea67f672… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Aug 18 21:12:41 2008 +0100 rpcrt4: Check for previous association being NULL in RPCRT4_ResolveBinding. bind->Assoc could be NULL if the binding hasn't been resolved. --- dlls/rpcrt4/rpc_binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 15f0e87..a154c1d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -213,7 +213,7 @@ RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) RPCRT4_strfree(Binding->Endpoint); Binding->Endpoint = RPCRT4_strdupA(Endpoint); - RpcAssoc_Release(Binding->Assoc); + if (Binding->Assoc) RpcAssoc_Release(Binding->Assoc); Binding->Assoc = NULL; status = RPCRT4_GetAssociation(Binding->Protseq, Binding->NetworkAddr, Binding->Endpoint, Binding->NetworkOptions,

1 0

Rob Shearman : rpcrt4: Don' t get or create an association for bindings with incomplete endpoints.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: e98539520d1ae548f3d6c547caacc27c3567d7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98539520d1ae548f3d6c547c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Aug 18 21:13:41 2008 +0100 rpcrt4: Don't get or create an association for bindings with incomplete endpoints. It's inefficient since the association will have to be replaced before the binding can be used to connect to a server. --- dlls/rpcrt4/rpc_binding.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a154c1d..4452d30 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -157,20 +157,19 @@ static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPCSTR NetworkAdd RPCRT4_strfree(Binding->NetworkAddr); Binding->NetworkAddr = RPCRT4_strdupA(NetworkAddr); RPCRT4_strfree(Binding->Endpoint); - if (Endpoint) { - Binding->Endpoint = RPCRT4_strdupA(Endpoint); - } else { - Binding->Endpoint = RPCRT4_strdupA(""); - } + Binding->Endpoint = RPCRT4_strdupA(Endpoint); HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); Binding->NetworkOptions = RPCRT4_strdupAtoW(NetworkOptions); - if (!Binding->Endpoint) ERR("out of memory?\n"); - status = RPCRT4_GetAssociation(Binding->Protseq, Binding->NetworkAddr, - Binding->Endpoint, Binding->NetworkOptions, - &Binding->Assoc); - if (status != RPC_S_OK) - return status; + /* only attempt to get an association if the binding is complete */ + if (Endpoint && Endpoint[0] != '\0') + { + status = RPCRT4_GetAssociation(Binding->Protseq, Binding->NetworkAddr, + Binding->Endpoint, Binding->NetworkOptions, + &Binding->Assoc); + if (status != RPC_S_OK) + return status; + } return RPC_S_OK; } @@ -186,20 +185,19 @@ static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPCWSTR NetworkAd RPCRT4_strfree(Binding->NetworkAddr); Binding->NetworkAddr = RPCRT4_strdupWtoA(NetworkAddr); RPCRT4_strfree(Binding->Endpoint); - if (Endpoint) { - Binding->Endpoint = RPCRT4_strdupWtoA(Endpoint); - } else { - Binding->Endpoint = RPCRT4_strdupA(""); - } - if (!Binding->Endpoint) ERR("out of memory?\n"); + Binding->Endpoint = RPCRT4_strdupWtoA(Endpoint); HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); Binding->NetworkOptions = RPCRT4_strdupW(NetworkOptions); - status = RPCRT4_GetAssociation(Binding->Protseq, Binding->NetworkAddr, - Binding->Endpoint, Binding->NetworkOptions, - &Binding->Assoc); - if (status != RPC_S_OK) - return status; + /* only attempt to get an association if the binding is complete */ + if (Endpoint && Endpoint[0] != '\0') + { + status = RPCRT4_GetAssociation(Binding->Protseq, Binding->NetworkAddr, + Binding->Endpoint, Binding->NetworkOptions, + &Binding->Assoc); + if (status != RPC_S_OK) + return status; + } return RPC_S_OK; }

1 0

Rob Shearman : rpcrt4: Test the endpoint mapper for the ncalrpc protseq as well as the ncacn_np protseq .
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: c5dd3f079c002890d79e20efd5d0a2a2188e2252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dd3f079c002890d79e20efd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Aug 18 21:12:27 2008 +0100 rpcrt4: Test the endpoint mapper for the ncalrpc protseq as well as the ncacn_np protseq. --- dlls/rpcrt4/tests/rpc.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7d8f730..c59d7d6 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -674,50 +674,50 @@ static void test_I_RpcExceptionFilter(void) } } -static void test_endpoint_mapper(void) +static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address, + RPC_CSTR endpoint) { static unsigned char annotation[] = "Test annotation string."; - static unsigned char ncacn_ip_tcp[] = "ncacn_np"; - static unsigned char address[] = "."; - static unsigned char endpoint[] = "\\pipe\\wine_rpc_test"; RPC_STATUS status; RPC_BINDING_VECTOR *binding_vector; handle_t handle; unsigned char *binding; - status = RpcServerUseProtseqEp(ncacn_ip_tcp, 20, endpoint, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseqEp failed (%lu)\n", status); + status = RpcServerUseProtseqEp(protseq, 20, endpoint, NULL); + ok(status == RPC_S_OK, "%s: RpcServerUseProtseqEp failed (%lu)\n", protseq, status); status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); - ok(status == RPC_S_OK, "RpcServerRegisterIf failed (%lu)\n", status); + ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%lu)\n", protseq, status); status = RpcServerInqBindings(&binding_vector); - ok(status == RPC_S_OK, "RpcServerInqBindings failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcServerInqBindings failed with error %lu\n", protseq, status); status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); - ok(status == RPC_S_OK, "RpcEpRegisterA failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %lu\n", protseq, status); - status = RpcStringBindingCompose(NULL, ncacn_ip_tcp, address, + status = RpcStringBindingCompose(NULL, protseq, address, NULL, NULL, &binding); - ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status); + ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%lu)\n", protseq, status); status = RpcBindingFromStringBinding(binding, &handle); - ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", status); + ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%lu)\n", protseq, status); + + RpcStringFree(&binding); status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); - ok(status == RPC_S_OK, "RpcEpResolveBinding failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcEpResolveBinding failed with error %lu\n", protseq, status); status = RpcBindingFree(&handle); - ok(status == RPC_S_OK, "RpcBindingFree failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %lu\n", protseq, status); status = RpcServerUnregisterIf(NULL, NULL, FALSE); - ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); + ok(status == RPC_S_OK, "%s: RpcServerUnregisterIf failed (%lu)\n", protseq, status); status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); - ok(status == RPC_S_OK, "RpcEpUnregisterA failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcEpUnregisterA failed with error %lu\n", protseq, status); status = RpcBindingVectorFree(&binding_vector); - ok(status == RPC_S_OK, "RpcBindingVectorFree failed with error %lu\n", status); + ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %lu\n", protseq, status); } static void test_RpcStringBindingFromBinding(void) @@ -750,15 +750,20 @@ static void test_RpcStringBindingFromBinding(void) START_TEST( rpc ) { - trace ( " ** Uuid Conversion and Comparison Tests **\n" ); + static unsigned char ncacn_np[] = "ncacn_np"; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char np_address[] = "."; + static unsigned char np_endpoint[] = "\\pipe\\wine_rpc_test"; + static unsigned char lrpc_endpoint[] = "wine_rpc_test"; + UuidConversionAndComparison(); - trace ( " ** DceErrorInqText **\n"); TestDceErrorInqText(); test_rpc_ncacn_ip_tcp(); test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); test_I_RpcExceptionFilter(); - test_endpoint_mapper(); + test_endpoint_mapper(ncacn_np, np_address, np_endpoint); + test_endpoint_mapper(ncalrpc, NULL, lrpc_endpoint); test_RpcStringBindingFromBinding(); }

1 0

Stefan Dösinger : wined3d: Add a swapchain method to set the dest override.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 3d49e8cd5e3872c06c5b86f8d2bb0cc41d5ddfa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d49e8cd5e3872c06c5b86f8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 28 22:34:32 2008 -0500 wined3d: Add a swapchain method to set the dest override. DDraw can draw to the front buffer only, thus there's never a Present call which could pass this window. Due to that a drawing-independent method is needed. --- dlls/wined3d/swapchain.c | 73 +++++++++++++++++++++---------------- dlls/wined3d/swapchain_gdi.c | 8 ++++ include/wine/wined3d_interface.h | 2 + 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9ec296c..1a82ab8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -144,38 +144,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO /* Don't call checkGLcall, as glGetError is not applicable here */ if (hDestWindowOverride && This->win_handle != hDestWindowOverride) { - WINED3DLOCKED_RECT r; - BYTE *mem; - - TRACE("Performing dest override of swapchain %p from window %p to %p\n", This, This->win_handle, hDestWindowOverride); - if(This->context[0] == This->wineD3DDevice->contexts[0]) { - /* The primary context 'owns' all the opengl resources. Destroying and recreating that context requires downloading - * all opengl resources, deleting the gl resources, destroying all other contexts, then recreating all other contexts - * and reload the resources - */ - delete_opengl_contexts((IWineD3DDevice *) This->wineD3DDevice, iface); - This->win_handle = hDestWindowOverride; - create_primary_opengl_context((IWineD3DDevice *) This->wineD3DDevice, iface); - } else { - This->win_handle = hDestWindowOverride; - - /* The old back buffer has to be copied over to the new back buffer. A lockrect - switchcontext - unlockrect - * would suffice in theory, but it is rather nasty and may cause troubles with future changes of the locking code - * So lock read only, copy the surface out, then lock with the discard flag and write back - */ - IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_READONLY); - mem = HeapAlloc(GetProcessHeap(), 0, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); - memcpy(mem, r.pBits, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); - IWineD3DSurface_UnlockRect(This->backBuffer[0]); - - DestroyContext(This->wineD3DDevice, This->context[0]); - This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */, &This->presentParms); - - IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_DISCARD); - memcpy(r.pBits, mem, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); - HeapFree(GetProcessHeap(), 0, mem); - IWineD3DSurface_UnlockRect(This->backBuffer[0]); - } + IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); } SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */ @@ -335,6 +304,45 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO return WINED3D_OK; } +static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) { + IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + WINED3DLOCKED_RECT r; + BYTE *mem; + + if(window == This->win_handle) return WINED3D_OK; + + TRACE("Performing dest override of swapchain %p from window %p to %p\n", This, This->win_handle, window); + if(This->context[0] == This->wineD3DDevice->contexts[0]) { + /* The primary context 'owns' all the opengl resources. Destroying and recreating that context requires downloading + * all opengl resources, deleting the gl resources, destroying all other contexts, then recreating all other contexts + * and reload the resources + */ + delete_opengl_contexts((IWineD3DDevice *) This->wineD3DDevice, iface); + This->win_handle = window; + create_primary_opengl_context((IWineD3DDevice *) This->wineD3DDevice, iface); + } else { + This->win_handle = window; + + /* The old back buffer has to be copied over to the new back buffer. A lockrect - switchcontext - unlockrect + * would suffice in theory, but it is rather nasty and may cause troubles with future changes of the locking code + * So lock read only, copy the surface out, then lock with the discard flag and write back + */ + IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_READONLY); + mem = HeapAlloc(GetProcessHeap(), 0, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); + memcpy(mem, r.pBits, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); + IWineD3DSurface_UnlockRect(This->backBuffer[0]); + + DestroyContext(This->wineD3DDevice, This->context[0]); + This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */, &This->presentParms); + + IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_DISCARD); + memcpy(r.pBits, mem, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); + HeapFree(GetProcessHeap(), 0, mem); + IWineD3DSurface_UnlockRect(This->backBuffer[0]); + } + return WINED3D_OK; +} + const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = { /* IUnknown */ @@ -346,6 +354,7 @@ const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, + IWineD3DSwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus, diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 7aa81c2..d76b9b5 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -156,6 +156,13 @@ void x11_copy_to_screen(IWineD3DSwapChainImpl *This, LPRECT rc) { } } +static HRESULT WINAPI IWineGDISwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) { + IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + + This->win_handle = window; + return WINED3D_OK; +} + static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface; IWineD3DSurfaceImpl *front, *back; @@ -254,6 +261,7 @@ const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineGDISwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, + IWineGDISwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 0768b0a..d2c8a2c 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1421,6 +1421,7 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWineD3DBase) STDMETHOD_(void, Destroy)(THIS_ D3DCB_DESTROYSURFACEFN pFn) PURE; STDMETHOD(GetDevice)(THIS_ IWineD3DDevice **ppDevice) PURE; STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; + STDMETHOD(SetDestWindowOverride)(THIS_ HWND window); STDMETHOD(GetFrontBufferData)(THIS_ IWineD3DSurface *pDestSurface) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) PURE; STDMETHOD(GetRasterStatus)(THIS_ WINED3DRASTER_STATUS *pRasterStatus) PURE; @@ -1442,6 +1443,7 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWineD3DBase) #define IWineD3DSwapChain_Destroy(p,a) (p)->lpVtbl->Destroy(p,a) #define IWineD3DSwapChain_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DSwapChain_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IWineD3DSwapChain_SetDestWindowOverride(p,a) (p)->lpVtbl->SetDestWindowOverride(p,a) #define IWineD3DSwapChain_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) #define IWineD3DSwapChain_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #define IWineD3DSwapChain_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a)

1 0

Stefan Dösinger : ddraw: Send the ddraw output to the clipper window, if any.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: c1bbab7c54618935d74b7d2b70421253018f5594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bbab7c54618935d74b7d2b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 7 14:09:19 2008 -0500 ddraw: Send the ddraw output to the clipper window, if any. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 425503f..31dfd1d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3254,12 +3254,12 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, ShowWindow(window, SW_HIDE); /* Just to be sure */ WARN("(%p) No window for the Direct3DDevice, created a hidden window. HWND=%p\n", This, window); - This->d3d_window = window; } else { TRACE("(%p) Using existing window %p for Direct3D rendering\n", This, window); } + This->d3d_window = window; /* Store the future Render Target surface */ This->d3d_target = primary; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b4129b3..664229b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2210,6 +2210,7 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); IDirectDrawClipperImpl *oldClipper = This->clipper; + HWND clipWindow; HRESULT hr; TRACE("(%p)->(%p)\n",This,Clipper); @@ -2228,6 +2229,22 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper_Release(ICOM_INTERFACE(oldClipper, IDirectDrawClipper)); hr = IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper ? This->clipper->wineD3DClipper : NULL); + + if(This->wineD3DSwapChain) { + clipWindow = NULL; + if(Clipper) { + IDirectDrawClipper_GetHWnd(Clipper, &clipWindow); + } + + if(clipWindow) { + IWineD3DSwapChain_SetDestWindowOverride(This->wineD3DSwapChain, + clipWindow); + } else { + IWineD3DSwapChain_SetDestWindowOverride(This->wineD3DSwapChain, + This->ddraw->d3d_window); + } + } + LeaveCriticalSection(&ddraw_cs); return hr; }

1 0