January 2008 - Wine-commits

Alexandre Julliard : kernel32: Fail more gracefully in GetVolumeInformation for fake drive devices.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: c486d8774f9c1e9849b42d22e69d98be71596a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c486d8774f9c1e9849b42d22e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 23:17:42 2008 +0100 kernel32: Fail more gracefully in GetVolumeInformation for fake drive devices. --- dlls/kernel32/volume.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4948ef4..df9180f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -304,7 +304,10 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /* try a fixed disk, with a FAT partition */ if (SetFilePointer( handle, 0, NULL, FILE_BEGIN ) != 0 || !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL )) + { + if (GetLastError() == ERROR_BAD_DEV_TYPE) return FS_UNKNOWN; /* not a real device */ return FS_ERROR; + } if (size < SUPERBLOCK_SIZE) return FS_UNKNOWN;

1 0

Eric Pouech : gdi32: Break loop in MF_PlayMetaFile when META_EOF is found.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 47a38c3631c1d54a380573cf73cd41014fa8e744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a38c3631c1d54a380573cf7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:13:24 2008 +0100 gdi32: Break loop in MF_PlayMetaFile when META_EOF is found. --- dlls/gdi32/metafile.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 43ef06d..d04a03d 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -427,7 +427,12 @@ BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) mr->rdSize,offset,mh->mtSize*2); break; } + offset += mr->rdSize * 2; + if (mr->rdFunction == META_EOF) { + TRACE("Got META_EOF so stopping\n"); + break; + } PlayMetaFileRecord( hdc, ht, mr, mh->mtNoObjects ); }

1 0

Michael Stefaniuc : kernel32: Add missing HeapFree(). Found by Smatch.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 46f8b23eb7c7bf72f0d8468046857b1007b0cd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f8b23eb7c7bf72f0d846804… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 7 22:12:54 2008 +0100 kernel32: Add missing HeapFree(). Found by Smatch. --- dlls/kernel32/volume.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 9edcf64..4948ef4 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1475,6 +1475,7 @@ BOOL WINAPI FindNextVolumeA( HANDLE handle, LPSTR volume, DWORD len ) { if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) ret = FALSE; } + HeapFree( GetProcessHeap(), 0, buffer ); return ret; }

1 0

Roderick Colenbrander : wined3d: Unify color conversion code.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a74ecc5f2f71dac7ace45dd45fcd4495ed0e542a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74ecc5f2f71dac7ace45dd45… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jan 7 21:18:34 2008 +0100 wined3d: Unify color conversion code. --- dlls/wined3d/surface.c | 126 +++++++++++++----------------------------------- 1 files changed, 34 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2be1f89..0a7a4df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -934,14 +934,11 @@ lock_end: return IWineD3DBaseSurfaceImpl_LockRect(iface, pLockedRect, pRect, Flags); } -static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { +static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) { GLint prev_store; GLint prev_rasterpos[4]; GLint skipBytes = 0; - BOOL storechanged = FALSE, memory_allocated = FALSE; - GLint fmt, type; - BYTE *mem; - UINT bpp; + BOOL storechanged = FALSE; UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ IWineD3DDeviceImpl *myDevice = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; IWineD3DSwapChainImpl *swapchain; @@ -997,88 +994,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { read = This->resource.allocatedMemory[0]; } - switch (This->resource.format) { - /* No special care needed */ - case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_R5G6B5: - case WINED3DFMT_A1R5G5B5: - case WINED3DFMT_R8G8B8: - case WINED3DFMT_X4R4G4B4: - case WINED3DFMT_X1R5G5B5: - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - break; - - /* In the past times we used to set the X channel of X8R8G8B8 and the above formats to - * 1.0 because it happened to fix the intro movie in Pirates. However, this seems wrong. - * If the game uses an X8R8G8B8 back buffer the GL alpha channel should not make any differences, - * and the bug must be somewhere else. If we really have to set the alpha channel to 1.0 in - * this case do it by clearing it after the draw instead of fixing it up in the CPU. Blending - * is disabled via CTXUSAGE_BLIT context setup, so in the glDrawPixels call it does not - * have any effects - */ - case WINED3DFMT_X8R8G8B8: - case WINED3DFMT_A8R8G8B8: - { - glPixelStorei(GL_PACK_SWAP_BYTES, TRUE); - vcheckGLcall("glPixelStorei"); - storechanged = TRUE; - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - } - break; - - case WINED3DFMT_A2R10G10B10: - { - glPixelStorei(GL_PACK_SWAP_BYTES, TRUE); - vcheckGLcall("glPixelStorei"); - storechanged = TRUE; - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - } - break; - - case WINED3DFMT_P8: - { - int height = This->glRect.bottom - This->glRect.top; - type = GL_UNSIGNED_BYTE; - fmt = GL_RGBA; - - mem = HeapAlloc(GetProcessHeap(), 0, This->resource.size * sizeof(DWORD)); - if(!mem) { - ERR("Out of memory\n"); - goto cleanup; - } - memory_allocated = TRUE; - d3dfmt_convert_surface(This->resource.allocatedMemory, - mem, - pitch, - pitch, - height, - pitch * 4, - CONVERT_PALETTED, - This); - bpp = This->bytesPerPixel * 4; - pitch *= 4; - } - break; - - default: - FIXME("Unsupported Format %u in locking func\n", This->resource.format); - - /* Give it a try */ - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - } - if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); checkGLcall("glBindBufferARB"); @@ -1090,7 +1005,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { mem + bpp * This->lockedRect.left + pitch * This->lockedRect.top); checkGLcall("glDrawPixels"); -cleanup: if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -1110,8 +1024,6 @@ cleanup: vcheckGLcall("glPixelStorei GL_PACK_SWAP_BYTES"); } - if(memory_allocated) HeapFree(GetProcessHeap(), 0, mem); - if(!swapchain) { glDrawBuffer(myDevice->offscreenBuffer); checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); @@ -1390,7 +1302,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ p8_render_target = TRUE; } - /* Use conversion when the paletted texture extension OR fragment shaders are available. When either + /* Use conversion when the paletted texture extension OR fragment shaders are available. When either * of the two is available make sure texturing is requested as neither of the two works in * conjunction with calls like glDraw-/glReadPixels. Further also use conversion in case of color keying. * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations @@ -3832,7 +3744,37 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D if(This->Flags & SFLAG_INTEXTURE) { surface_blt_to_drawable(This, rect); } else { - flush_to_framebuffer_drawpixels(This); + d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); + + /* The width is in 'length' not in bytes */ + width = This->currentDesc.Width; + pitch = IWineD3DSurface_GetPitch(iface); + + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { + int height = This->currentDesc.Height; + + /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ + outpitch = width * bpp; + outpitch = (outpitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); + + mem = HeapAlloc(GetProcessHeap(), 0, outpitch * height); + if(!mem) { + ERR("Out of memory %d, %d!\n", outpitch, height); + return WINED3DERR_OUTOFVIDEOMEMORY; + } + d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); + + This->Flags |= SFLAG_CONVERTED; + } else { + This->Flags &= ~SFLAG_CONVERTED; + mem = This->resource.allocatedMemory; + } + + flush_to_framebuffer_drawpixels(This, format, type, bpp, mem); + + /* Don't delete PBO memory */ + if((mem != This->resource.allocatedMemory) && !(This->Flags & SFLAG_PBO)) + HeapFree(GetProcessHeap(), 0, mem); } } else /* if(flag == SFLAG_INTEXTURE) */ { d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb);

1 0

Rob Shearman : rpcrt4: Set ReservedForRuntime to NULL in NdrClientInitializeNew.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: e2e79167390c711de19c66a53cd0db3c2a04a7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e79167390c711de19c66a53… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:21:27 2008 +0000 rpcrt4: Set ReservedForRuntime to NULL in NdrClientInitializeNew. --- dlls/rpcrt4/ndr_clientserver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 8cce9d7..fc44ef7 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -57,6 +57,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pRpcMessage->ProcNum = ProcNum | RPC_FLAGS_VALID_BIT; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; pRpcMessage->RpcFlags = 0; + pRpcMessage->ReservedForRuntime = NULL; pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; pStubMsg->RpcMsg = pRpcMessage;

1 0

Lei Zhang : msxml: Fix compilation on machines without libxml2.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 672a6995c00a983ad5dcfaa4a9150b5dec919fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672a6995c00a983ad5dcfaa4a… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jan 7 11:04:50 2008 -0800 msxml: Fix compilation on machines without libxml2. --- dlls/msxml3/msxml_private.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 59b1831..fc6ffb8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -63,14 +63,6 @@ extern HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node extern xmlDocPtr parse_xml(char *ptr, int len); -#endif - -extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, - LONG line, LONG linepos, LONG filepos ); -extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); - /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode { @@ -86,4 +78,12 @@ static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); } +#endif + +extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, + LONG line, LONG linepos, LONG filepos ); +extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); + #endif /* __MSXML_PRIVATE__ */

1 0

Rob Shearman : rpcrt4: Add tests for some async RPC functions.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 1da9d47f1b06feccf25d1c8da345e93924b5c415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da9d47f1b06feccf25d1c8da… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:21:02 2008 +0000 rpcrt4: Add tests for some async RPC functions. --- dlls/rpcrt4/tests/Makefile.in | 1 + dlls/rpcrt4/tests/rpc_async.c | 102 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index c497aa3..3191973 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ generated.c \ ndr_marshall.c \ rpc.c \ + rpc_async.c \ server.c @MAKE_TEST_RULES@ diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c new file mode 100644 index 0000000..0d32fd1 --- /dev/null +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -0,0 +1,102 @@ +/* + * Unit test suite for rpc functions + * + * Copyright 2008 Robert Shearman (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "wine/test.h" + +#include <rpc.h> +#include <rpcasync.h> + +RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int); +RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE); + +static void test_RpcAsyncInitializeHandle(void) +{ + char buffer[256]; + RPC_ASYNC_STATE async; + RPC_STATUS status; + int i; + + status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); + todo_wine + ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status); + + status = pRpcAsyncInitializeHandle(&async, sizeof(async) - 1); + todo_wine + ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status); + + memset(&async, 0xcc, sizeof(async)); + status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + todo_wine + ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status); + + todo_wine + ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size); + todo_wine + ok(async.Signature == 0x43595341, "async.Signature should be 0x43595341, but is 0x%x instead\n", async.Signature); + todo_wine + ok(async.Lock == 0, "async.Lock should be 0, but is %d instead\n", async.Lock); + todo_wine + ok(async.Flags == 0, "async.Flags should be 0, but is %d instead\n", async.Flags); + todo_wine + ok(async.StubInfo == NULL, "async.StubInfo should be NULL, not %p\n", async.StubInfo); + ok(async.UserInfo == (void *)0xcccccccc, "async.UserInfo should be unset, not %p\n", async.UserInfo); + todo_wine + ok(async.RuntimeInfo == NULL, "async.RuntimeInfo should be NULL, not %p\n", async.RuntimeInfo); + ok(async.Event == 0xcccccccc, "async.Event should be unset, not %d\n", async.Event); + ok(async.NotificationType == 0xcccccccc, "async.NotificationType should be unset, not %d\n", async.NotificationType); + for (i = 0; i < 4; i++) + todo_wine + ok(async.Reserved[i] == 0x0, "async.Reserved[%d] should be 0x0, not 0x%lx\n", i, async.Reserved[i]); +} + +static void test_RpcAsyncGetCallStatus(void) +{ + RPC_ASYNC_STATE async; + RPC_STATUS status; + + status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + todo_wine + ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status); + + status = pRpcAsyncGetCallStatus(&async); + todo_wine + ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %ld\n", status); + + memset(&async, 0, sizeof(async)); + status = pRpcAsyncGetCallStatus(&async); + todo_wine + ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %ld\n", status); +} + +START_TEST( rpc_async ) +{ + HMODULE hRpcRt4 = GetModuleHandle("rpcrt4.dll"); + pRpcAsyncInitializeHandle = (void *)GetProcAddress(hRpcRt4, "RpcAsyncInitializeHandle"); + pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus"); + if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus) + { + skip("asynchronous functions not available\n"); + return; + } + test_RpcAsyncInitializeHandle(); + test_RpcAsyncGetCallStatus(); +}

1 0

Rob Shearman : rpcrt4: Implement RpcAsyncInitializeHandle.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: ea44471088aba5f64b3f9831100be55967fea4f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea44471088aba5f64b3f98311… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:21:13 2008 +0000 rpcrt4: Implement RpcAsyncInitializeHandle. --- dlls/rpcrt4/rpc_async.c | 21 +++++++++++++++++++-- dlls/rpcrt4/tests/rpc_async.c | 11 ----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index c57337a..4ff86a3 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); +#define RPC_ASYNC_SIGNATURE 0x43595341 + /*********************************************************************** * RpcAsyncInitializeHandle [RPCRT4.@] * @@ -48,8 +50,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); */ RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int Size) { - FIXME("(%p, %d): stub\n", pAsync, Size); - return RPC_S_INVALID_ASYNC_HANDLE; + TRACE("(%p, %d)\n", pAsync, Size); + + if (Size != sizeof(*pAsync)) + { + ERR("invalid Size %d\n", Size); + return ERROR_INVALID_PARAMETER; + } + + pAsync->Size = sizeof(*pAsync); + pAsync->Signature = RPC_ASYNC_SIGNATURE; + pAsync->Lock = 0; + pAsync->Flags = 0; + pAsync->StubInfo = NULL; + pAsync->RuntimeInfo = NULL; + memset(&pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); + + return RPC_S_OK; } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c index 0d32fd1..0cc5557 100644 --- a/dlls/rpcrt4/tests/rpc_async.c +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -36,35 +36,25 @@ static void test_RpcAsyncInitializeHandle(void) int i; status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); - todo_wine ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status); status = pRpcAsyncInitializeHandle(&async, sizeof(async) - 1); - todo_wine ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status); memset(&async, 0xcc, sizeof(async)); status = pRpcAsyncInitializeHandle(&async, sizeof(async)); - todo_wine ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status); - todo_wine ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size); - todo_wine ok(async.Signature == 0x43595341, "async.Signature should be 0x43595341, but is 0x%x instead\n", async.Signature); - todo_wine ok(async.Lock == 0, "async.Lock should be 0, but is %d instead\n", async.Lock); - todo_wine ok(async.Flags == 0, "async.Flags should be 0, but is %d instead\n", async.Flags); - todo_wine ok(async.StubInfo == NULL, "async.StubInfo should be NULL, not %p\n", async.StubInfo); ok(async.UserInfo == (void *)0xcccccccc, "async.UserInfo should be unset, not %p\n", async.UserInfo); - todo_wine ok(async.RuntimeInfo == NULL, "async.RuntimeInfo should be NULL, not %p\n", async.RuntimeInfo); ok(async.Event == 0xcccccccc, "async.Event should be unset, not %d\n", async.Event); ok(async.NotificationType == 0xcccccccc, "async.NotificationType should be unset, not %d\n", async.NotificationType); for (i = 0; i < 4; i++) - todo_wine ok(async.Reserved[i] == 0x0, "async.Reserved[%d] should be 0x0, not 0x%lx\n", i, async.Reserved[i]); } @@ -74,7 +64,6 @@ static void test_RpcAsyncGetCallStatus(void) RPC_STATUS status; status = pRpcAsyncInitializeHandle(&async, sizeof(async)); - todo_wine ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status); status = pRpcAsyncGetCallStatus(&async);

1 0

Rob Shearman : rpcrt4: Add stubs for asynchronous functions.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: fef28ec6cb1a0573d03a67de90b59d618ecef17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef28ec6cb1a0573d03a67de9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:20:50 2008 +0000 rpcrt4: Add stubs for asynchronous functions. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/rpc_async.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 20 ++++---- 3 files changed, 142 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index abfea12..5cb090b 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ ndr_ole.c \ ndr_stubless.c \ rpc_assoc.c \ + rpc_async.c \ rpc_binding.c \ rpc_epmap.c \ rpc_message.c \ diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c new file mode 100644 index 0000000..c57337a --- /dev/null +++ b/dlls/rpcrt4/rpc_async.c @@ -0,0 +1,131 @@ +/* + * Asynchronous Call Support Functions + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "rpc.h" +#include "rpcndr.h" +#include "rpcasync.h" + +#include "wine/debug.h" + +#include "rpc_binding.h" +#include "rpc_message.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +/*********************************************************************** + * RpcAsyncInitializeHandle [RPCRT4.@] + * + * Initialises an asynchronous state so it can be used in other asynchronous + * functions and for use in asynchronous calls. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Size [I] Size of the memory pointed to by pAsync. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int Size) +{ + FIXME("(%p, %d): stub\n", pAsync, Size); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncGetCallStatus [RPCRT4.@] + * + * Retrieves the current status of the asynchronous call taking place. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * + * RETURNS + * RPC_S_OK - The call was successfully completed. + * RPC_S_INVALID_ASYNC_HANDLE - The asynchronous structure is not valid. + * RPC_S_ASYNC_CALL_PENDING - The call is still in progress and has not been completed. + * Any other error code - The call failed. + */ +RPC_STATUS WINAPI RpcAsyncGetCallStatus(PRPC_ASYNC_STATE pAsync) +{ + FIXME("(%p): stub\n", pAsync); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCompleteCall [RPCRT4.@] + * + * Completes a client or server asynchronous call. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Reply [I] The return value of the asynchronous function. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) +{ + FIXME("(%p, %p): stub\n", pAsync, Reply); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncAbortCall [RPCRT4.@] + * + * Aborts the asynchronous server call taking place. + * + * PARAMS + * pAsync [I] Asynchronous server state to abort. + * ExceptionCode [I] Exception code to return to the client in a fault packet. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) +{ + FIXME("(%p, %d/0x%x): stub\n", pAsync, ExceptionCode, ExceptionCode); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCancelCall [RPCRT4.@] + * + * Cancels the asynchronous client call taking place. + * + * PARAMS + * pAsync [I] Asynchronous client state to abort. + * fAbortCall [I] If TRUE, then send a cancel to the server, otherwise + * just wait for the call to complete. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) +{ + FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); + return RPC_S_INVALID_ASYNC_HANDLE; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 224d3a8..3dc9edc 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -362,12 +362,12 @@ @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp @ stub PerformRpcInitialization -@ stub RpcAbortAsyncCall -@ stub RpcAsyncAbortCall -@ stub RpcAsyncCancelCall -@ stub RpcAsyncCompleteCall -@ stub RpcAsyncGetCallStatus -@ stub RpcAsyncInitializeHandle +@ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall +@ stdcall RpcAsyncAbortCall(ptr long) +@ stdcall RpcAsyncCancelCall(ptr long) +@ stdcall RpcAsyncCompleteCall(ptr ptr) +@ stdcall RpcAsyncGetCallStatus(ptr) +@ stdcall RpcAsyncInitializeHandle(ptr long) @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) @@ -394,12 +394,12 @@ @ stdcall RpcBindingToStringBindingA(ptr ptr) @ stdcall RpcBindingToStringBindingW(ptr ptr) @ stdcall RpcBindingVectorFree(ptr) -@ stub RpcCancelAsyncCall +@ stdcall RpcCancelAsyncCall(ptr long) RpcAsyncCancelCall @ stdcall RpcCancelThread(ptr) @ stub RpcCancelThreadEx @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW -@ stub RpcCompleteAsyncCall +@ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall @ stdcall RpcEpRegisterA(ptr ptr ptr str) @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW @@ -416,11 +416,11 @@ @ stub RpcErrorSaveErrorInfo # wxp @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp -@ stub RpcGetAsyncCallStatus +@ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) -@ stub RpcInitializeAsyncHandle +@ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup()

1 0

Rob Shearman : rpcrt4: Add stubs for NdrCorrelationInitialize, NdrCorrelationPass and NdrCorrelationFree.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 23c9b6c1619b3d0a96b03b5748b933df65aee561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c9b6c1619b3d0a96b03b574… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 15:20:16 2008 +0000 rpcrt4: Add stubs for NdrCorrelationInitialize, NdrCorrelationPass and NdrCorrelationFree. --- dlls/rpcrt4/ndr_marshall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 6 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f8f8973..8d358cf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6370,3 +6370,56 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, return ContextHandle; } + +/*********************************************************************** + * NdrCorrelationInitialize [RPCRT4.@] + * + * Initializes correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * pMemory [I] Pointer to memory to use as a cache. + * CacheSize [I] Size of the memory pointed to by pMemory. + * Flags [I] Reserved. Set to zero. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) +{ + FIXME("(%p, %p, %d, 0x%x): stub\n", pStubMsg, pMemory, CacheSize, Flags); + pStubMsg->fHasNewCorrDesc = TRUE; +} + +/*********************************************************************** + * NdrCorrelationPass [RPCRT4.@] + * + * Performs correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} + +/*********************************************************************** + * NdrCorrelationFree [RPCRT4.@] + * + * Frees any resources used while unmarshalling parameters that need + * correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 93f6d31..8b3e502 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -201,9 +201,9 @@ @ stdcall NdrContextHandleSize(ptr ptr ptr) @ stdcall NdrConvert2(ptr ptr long) @ stdcall NdrConvert(ptr ptr) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass +@ stdcall NdrCorrelationFree(ptr) +@ stdcall NdrCorrelationInitialize(ptr ptr long long) +@ stdcall NdrCorrelationPass(ptr) @ stub NdrDcomAsyncClientCall @ stub NdrDcomAsyncStubCall @ stdcall NdrDllCanUnloadNow(ptr)

1 0