wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

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

Nikolay Sivov : gdiplus: Implemented GdipPathIterNextMarkerPath with tests.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: af4562c34d314c39c54d6d6f1b0c5c5ec563812a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4562c34d314c39c54d6d6f1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 19 11:53:22 2008 +0400 gdiplus: Implemented GdipPathIterNextMarkerPath with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 24 ++++++++++ dlls/gdiplus/tests/pathiterator.c | 84 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d3eaeb6..a00140f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -457,7 +457,7 @@ @ stdcall GdipPathIterHasCurve(ptr ptr) @ stdcall GdipPathIterIsValid(ptr ptr) @ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) -@ stub GdipPathIterNextMarkerPath +@ stdcall GdipPathIterNextMarkerPath(ptr ptr ptr) @ stub GdipPathIterNextPathType @ stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) @ stdcall GdipPathIterNextSubpathPath(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index afb4f34..d6a6850 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -153,6 +153,30 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result return Ok; } +GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator* iterator, INT* result, + GpPath* path) +{ + INT start, end; + + if(!iterator || !result) + return InvalidParameter; + + GdipPathIterNextMarker(iterator, result, &start, &end); + /* return path */ + if(((*result) > 0) && path){ + GdipResetPath(path); + + if(!lengthen_path(path, *result)) + return OutOfMemory; + + memcpy(path->pathdata.Points, &(iterator->pathdata.Points[start]), sizeof(GpPointF)*(*result)); + memcpy(path->pathdata.Types, &(iterator->pathdata.Types[start]), sizeof(BYTE)*(*result)); + path->pathdata.Count = *result; + } + + return Ok; +} + GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, INT *resultCount, INT* startIndex, INT* endIndex, BOOL* isClosed) { diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 9cbed13..6995b18 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -171,6 +171,89 @@ static void test_nextmarker(void) GdipDeletePath(path); } +static void test_nextmarkerpath(void) +{ + GpPath *path, *retpath; + GpPathIterator *iter; + GpStatus stat; + INT result, count; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL */ + stat = GdipPathIterNextMarkerPath(NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextMarkerPath(NULL, &result, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterNextMarkerPath(NULL, &result, path); + expect(InvalidParameter, stat); + + GdipAddPathRectangle(path, 5.0, 5.0, 100.0, 50.0); + + /* no markers */ + GdipCreatePath(FillModeAlternate, &retpath); + GdipCreatePathIter(&iter, path); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(4, result); + count = -1; + GdipGetPointCount(retpath, &count); + expect(4, count); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(0, result); + count = -1; + GdipGetPointCount(retpath, &count); + expect(4, count); + GdipDeletePathIter(iter); + GdipDeletePath(retpath); + + /* one marker */ + GdipSetPathMarker(path); + GdipCreatePath(FillModeAlternate, &retpath); + GdipCreatePathIter(&iter, path); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(4, result); + count = -1; + GdipGetPointCount(retpath, &count); + expect(4, count); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(0, result); + count = -1; + GdipGetPointCount(retpath, &count); + expect(4, count); + GdipDeletePathIter(iter); + GdipDeletePath(retpath); + + /* two markers */ + GdipAddPathLine(path, 0.0, 0.0, 10.0, 30.0); + GdipSetPathMarker(path); + GdipCreatePath(FillModeAlternate, &retpath); + GdipCreatePathIter(&iter, path); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(4, result); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(2, result); + result = -1; + stat = GdipPathIterNextMarkerPath(iter, &result, retpath); + expect(Ok, stat); + expect(0, result); + GdipDeletePathIter(iter); + GdipDeletePath(retpath); + + GdipDeletePath(path); +} + static void test_getsubpathcount(void) { GpPath *path; @@ -408,6 +491,7 @@ START_TEST(pathiterator) test_constructor_destructor(); test_hascurve(); test_nextmarker(); + test_nextmarkerpath(); test_getsubpathcount(); test_isvalid(); test_nextsubpathpath(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3fc7657..ed97542 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -328,6 +328,7 @@ GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*); GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*); +GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator*,INT*,GpPath*); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator*,INT*,GpPath*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*);

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

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: 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

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: 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: 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 : ddraw: Implement IDirectDraw7:: GetFourCCCodes.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: e10302d95207f5a01bf3e0a2810d1671b49eed57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10302d95207f5a01bf3e0a28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 15:55:20 2008 -0500 ddraw: Implement IDirectDraw7::GetFourCCCodes. --- dlls/ddraw/ddraw.c | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 31dfd1d..8eac776 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -879,9 +879,40 @@ IDirectDrawImpl_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); - FIXME("(%p)->(%p, %p): Stub!\n", This, NumCodes, Codes); + WINED3DFORMAT formats[] = { + WINED3DFMT_YUY2, WINED3DFMT_UYVY, + WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, + }; + DWORD count = 0, i, outsize; + HRESULT hr; + WINED3DDISPLAYMODE d3ddm; + TRACE("(%p)->(%p, %p)\n", This, NumCodes, Codes); + + IWineD3DDevice_GetDisplayMode(This->wineD3DDevice, + 0 /* swapchain 0 */, + &d3ddm); + + outsize = NumCodes && Codes ? *NumCodes : 0; - if(NumCodes) *NumCodes = 0; + for(i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + hr = IWineD3D_CheckDeviceFormat(This->wineD3D, + WINED3DADAPTER_DEFAULT, + WINED3DDEVTYPE_HAL, + d3ddm.Format /* AdapterFormat */, + 0 /* usage */, + WINED3DRTYPE_SURFACE, + formats[i]); + if(SUCCEEDED(hr)) { + if(count < outsize) { + Codes[count] = formats[i]; + } + count++; + } + } + if(NumCodes) { + TRACE("Returning %u FourCC codes\n", count); + *NumCodes = count; + } return DD_OK; }

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

← Newer
1
...
52
53
54
55
56
57
58
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2008