May 2012 - Wine-commits - list.winehq.org

Józef Kucia : d3dx9: Implement the pixel format conversion in D3DXSaveSurfaceToFileW.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: f0bb42551615f1601c318be81d04d5af6fb95806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bb42551615f1601c318be81… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:22 2012 +0200 d3dx9: Implement the pixel format conversion in D3DXSaveSurfaceToFileW. --- dlls/d3dx9_36/surface.c | 54 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index e5d0dc6..a78d8cf 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1527,15 +1527,61 @@ HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEF IWICBitmapFrameEncode_WritePixels(frame, height, locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); IDirect3DSurface9_UnlockRect(src_surface); - hr = IWICBitmapFrameEncode_Commit(frame); } } - else FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_surface_desc.Format, d3d_pixel_format); + else /* Pixel format conversion */ + { + const PixelFormatDesc *src_format_desc, *dst_format_desc; + SIZE size; + DWORD dst_pitch; + void *dst_data; + + src_format_desc = get_format_info(src_surface_desc.Format); + dst_format_desc = get_format_info(d3d_pixel_format); + if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) + { + FIXME("Unsupported pixel format conversion %#x -> %#x\n", + src_format_desc->format, dst_format_desc->format); + hr = E_NOTIMPL; + goto cleanup; + } + + if (src_format_desc->bytes_per_pixel > 4 + || dst_format_desc->bytes_per_pixel > 4 + || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 + || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) + { + hr = E_NOTIMPL; + goto cleanup; + } + + size.cx = width; + size.cy = height; + dst_pitch = width * dst_format_desc->bytes_per_pixel; + dst_data = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height); + if (!dst_data) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + copy_simple_data(locked_rect.pBits, locked_rect.Pitch, size, src_format_desc, + dst_data, dst_pitch, size, dst_format_desc, 0); + IDirect3DSurface9_UnlockRect(src_surface); + } + + IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data); + HeapFree(GetProcessHeap(), 0, dst_data); + } + + hr = IWICBitmapFrameEncode_Commit(frame); + if (SUCCEEDED(hr)) hr = IWICBitmapEncoder_Commit(encoder); } else WARN("Unsupported pixel format %#x\n", src_surface_desc.Format); - if (SUCCEEDED(hr)) hr = IWICBitmapEncoder_Commit(encoder); - cleanup_err: if (FAILED(hr)) hr = D3DERR_INVALIDCALL;

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXSaveSurfaceToFile.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 8b17b0f5c6b469758fe78228611ad7f0b9a93d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b17b0f5c6b469758fe782286… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:23 2012 +0200 d3dx9/tests: Add tests for D3DXSaveSurfaceToFile. --- dlls/d3dx9_36/tests/surface.c | 84 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 79d4bc3..2138e45 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -917,6 +917,89 @@ static void test_D3DXCreateVolumeTexture(IDirect3DDevice9 *device) } } +static void test_D3DXSaveSurfaceToFile(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DSurface9 *surface; + RECT rect; + D3DLOCKED_RECT lock_rect; + D3DXIMAGE_INFO image_info; + const BYTE pixels[] = { 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff }; + DWORD pitch = sizeof(pixels) / 2; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); + if (FAILED(hr)) { + skip("Couldn't create surface\n"); + return; + } + + SetRect(&rect, 0, 0, 2, 2); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, pixels, D3DFMT_R8G8B8, pitch, NULL, &rect, D3DX_FILTER_NONE, 0); + if (SUCCEEDED(hr)) { + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.bmp", NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); + if (FAILED(hr)) goto next_tests; + + ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); + ok(image_info.Height == 2, "Wrong height %u\n", image_info.Height); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_BMP, "Wrong file format %u\n", image_info.ImageFileFormat); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); + if (FAILED(hr)) goto next_tests; + + ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); + + IDirect3DSurface9_UnlockRect(surface); + } else skip("Couldn't fill surface\n"); + +next_tests: + hr = D3DXSaveSurfaceToFileA(NULL, D3DXIFF_BMP, surface, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* PPM and TGA are supported, even though MSDN claims they aren't */ + todo_wine { + hr = D3DXSaveSurfaceToFileA("saved_surface.ppm", D3DXIFF_PPM, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&rect, 0, 0, 4, 4); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 2, 0, 1, 4); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 0, 2, 4, 1); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, -1, -1, 2, 2); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + SetRect(&rect, 0, 0, 0, 0); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + + DeleteFileA("saved_surface.bmp"); + DeleteFileA("saved_surface.ppm"); + DeleteFileA("saved_surface.tga"); + DeleteFileA("saved_surface.dds"); + + IDirect3DSurface9_Release(surface); +} + START_TEST(surface) { HWND wnd; @@ -952,6 +1035,7 @@ START_TEST(surface) test_D3DXLoadSurface(device); test_D3DXCreateCubeTexture(device); test_D3DXCreateVolumeTexture(device); + test_D3DXSaveSurfaceToFile(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Nikolay Sivov : shell32: Added a stub for IShellDispatch2.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: cb53b7a8e164261a37ca5b04872a686ef8502a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb53b7a8e164261a37ca5b048… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 7 09:07:21 2012 +0400 shell32: Added a stub for IShellDispatch2. --- dlls/shell32/shelldispatch.c | 179 ++++++++++++++++++++++++++++------------- include/shldisp.idl | 27 ++++++- 2 files changed, 148 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb53b7a8e164261a37ca5…

1 0

Nikolay Sivov : msxml3: Make ::put_data() use passed BSTR as general WCHAR buffer.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: b80c71abe6de1a76a7a7d869ed11d06b6953755a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80c71abe6de1a76a7a7d869e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 7 15:36:03 2012 +0400 msxml3: Make ::put_data() use passed BSTR as general WCHAR buffer. --- dlls/msxml3/cdata.c | 10 +--- dlls/msxml3/comment.c | 9 +--- dlls/msxml3/pi.c | 8 +-- dlls/msxml3/tests/domdoc.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 9 +--- 5 files changed, 126 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 63265bf..b07cd84 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -552,14 +552,8 @@ static HRESULT WINAPI domcdata_put_data( BSTR data) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - VARIANT val; - - TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); - - V_VT(&val) = VT_BSTR; - V_BSTR(&val) = data; - - return IXMLDOMCDATASection_put_nodeValue( iface, val ); + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + return node_set_content(&This->node, data); } static HRESULT WINAPI domcdata_get_length( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index f1f94c6..3dab11b 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -554,13 +554,8 @@ static HRESULT WINAPI domcomment_put_data( BSTR data) { domcomment *This = impl_from_IXMLDOMComment( iface ); - VARIANT val; - - TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); - - V_VT(&val) = VT_BSTR; - V_BSTR(&val) = data; - return node_put_value(&This->node, &val); + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + return node_set_content(&This->node, data); } static HRESULT WINAPI domcomment_get_length( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index a6034bb..4d1910b 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -602,13 +602,12 @@ static HRESULT WINAPI dom_pi_put_data( BSTR data) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - VARIANT val; BSTR target; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); - /* Cannot set data to a PI node whose target is 'xml' */ + /* cannot set data to a PI node whose target is 'xml' */ hr = IXMLDOMProcessingInstruction_get_nodeName(iface, &target); if(hr == S_OK) { @@ -622,10 +621,7 @@ static HRESULT WINAPI dom_pi_put_data( SysFreeString(target); } - V_VT(&val) = VT_BSTR; - V_BSTR(&val) = data; - - return IXMLDOMProcessingInstruction_put_nodeValue( iface, val ); + return node_set_content(&This->node, data); } static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d50a22e..09165c3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11675,6 +11675,123 @@ todo_wine free_bstrs(); } +static DOMNodeType put_data_types[] = { + NODE_TEXT, + NODE_CDATA_SECTION, + NODE_PROCESSING_INSTRUCTION, + NODE_COMMENT, + NODE_INVALID +}; + +static void test_put_data(void) +{ + static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0}; + WCHAR buff[100], *data; + IXMLDOMDocument *doc; + DOMNodeType *type; + BSTR get_data; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + memcpy(&buff[2], test_data, sizeof(test_data)); + /* just a big length */ + *(DWORD*)buff = 0xf0f0; + data = &buff[2]; + + type = put_data_types; + while (*type != NODE_INVALID) + { + IXMLDOMNode *node; + VARIANT v; + + V_VT(&v) = VT_I2; + V_I2(&v) = *type; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + EXPECT_HR(hr, S_OK); + + /* put_data() is interface-specific */ + switch (*type) + { + case NODE_TEXT: + { + IXMLDOMText *text; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMText_put_data(text, data); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMText_get_data(text, &get_data); + EXPECT_HR(hr, S_OK); + + IXMLDOMText_Release(text); + break; + } + case NODE_CDATA_SECTION: + { + IXMLDOMCDATASection *cdata; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMCDATASection_put_data(cdata, data); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMCDATASection_get_data(cdata, &get_data); + EXPECT_HR(hr, S_OK); + + IXMLDOMCDATASection_Release(cdata); + break; + } + case NODE_PROCESSING_INSTRUCTION: + { + IXMLDOMProcessingInstruction *pi; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)&pi); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMProcessingInstruction_put_data(pi, data); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMProcessingInstruction_get_data(pi, &get_data); + EXPECT_HR(hr, S_OK); + + IXMLDOMProcessingInstruction_Release(pi); + break; + } + case NODE_COMMENT: + { + IXMLDOMComment *comment; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)&comment); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMComment_put_data(comment, data); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMComment_get_data(comment, &get_data); + EXPECT_HR(hr, S_OK); + + IXMLDOMComment_Release(comment); + break; + } + default: + break; + } + + /* compare */ + ok(!lstrcmpW(data, get_data), "%d: got wrong data %s, expected %s\n", *type, wine_dbgstr_w(get_data), + wine_dbgstr_w(data)); + SysFreeString(get_data); + + IXMLDOMNode_Release(node); + type++; + } + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11752,6 +11869,7 @@ START_TEST(domdoc) test_supporterrorinfo(); test_nodeValue(); test_get_namespaces(); + test_put_data(); test_xsltemplate(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 74de8e5..705afd0 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -608,13 +608,8 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - VARIANT val; - - TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); - - V_VT(&val) = VT_BSTR; - V_BSTR(&val) = data; - return node_put_value(&This->node, &val); + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + return node_set_content(&This->node, data); } static HRESULT WINAPI domtext_get_length(

1 0

Alexandre Julliard : winex11: Give XInitThreads yet another chance.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 07bc017ff13c43bc897de730715e8b07139268ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=07bc017ff13c43bc897de7307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 5 12:13:38 2012 +0200 winex11: Give XInitThreads yet another chance. --- dlls/winex11.drv/x11drv_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9e791e5..88e2114 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -539,6 +539,7 @@ static BOOL process_attach(void) /* Open display */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); if (!(display = XOpenDisplay( NULL ))) return FALSE; fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Erich Hoover : ws2_32/tests: Fix cleanup for first IOCP duplicated handle test.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: baa005638586fe0d11d77226b7ccd838c5ae0759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa005638586fe0d11d77226b… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu May 3 16:32:34 2012 -0600 ws2_32/tests: Fix cleanup for first IOCP duplicated handle test. --- dlls/ws2_32/tests/sock.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b71be34..e9814e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5585,12 +5585,34 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - closesocket(src); src = INVALID_SOCKET; closesocket(dup); dup = INVALID_SOCKET; + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + /* Test IOCP with duplicated handle (closing duplicated handle) */ if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) @@ -5618,15 +5640,12 @@ static void test_completion_port(void) key = 0xdeadbeef; num_bytes = 0xdeadbeef; olp = (WSAOVERLAPPED *)0xdeadbeef; - - bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (broken(olp->Internal == (ULONG)STATUS_PENDING) || (olp->Internal == (ULONG)STATUS_CANCELLED)), - "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Vincent Povirk : winebuild: Allow angle brackets in export names.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: ee1531ef789999e7a7766718c73e44baa75b94da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1531ef789999e7a7766718c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 14:16:01 2012 -0500 winebuild: Allow angle brackets in export names. --- tools/winebuild/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 1e23e3c..0498e75 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -45,7 +45,7 @@ static const char *separator_chars; static const char *comment_chars; /* valid characters in ordinal names */ -static const char valid_ordname_chars[] = "/$:-_@?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; +static const char valid_ordname_chars[] = "/$:-_@?<>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; static const char * const TypeNames[TYPE_NBTYPES] = {

1 0

Vincent Povirk : msvcm80: Add stub dll.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 7e8ce7badc4f2c6c83214000c25bddfff7b79cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ce7badc4f2c6c83214000c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 14:15:32 2012 -0500 msvcm80: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcm80/Makefile.in | 6 + dlls/msvcm80/msvcm80.spec | 306 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcm80/msvcm80_main.c | 35 +++++ 5 files changed, 349 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8ce7badc4f2c6c83214…

1 0

Vincent Povirk : msvcm80: Add stub DoDllLanguageSupportValidation function.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 01a1a5f80992f110cd7df34e01b18f6cc7756f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a1a5f80992f110cd7df34e0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 15:11:13 2012 -0500 msvcm80: Add stub DoDllLanguageSupportValidation function. --- dlls/msvcm80/msvcm80.spec | 2 +- dlls/msvcm80/msvcm80_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index dd92996..04224cd 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -1,6 +1,6 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX(a)Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX(a)Z0@Z -@ stub ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ +@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation @ stub -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z @ stub -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index 44f7a56..29bfdc7 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -21,6 +21,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcm); + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) @@ -33,3 +37,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +/* void __cdecl <CrtImplementationDetails>::DoDllLanguageSupportValidation(void) */ +void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) +{ + FIXME("stub\n"); +}

1 0

Vincent Povirk : msvcm80: Add stub RegisterModuleUninitializer function.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: de012d0be67acc478a9e2ae0941cc4d623128181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de012d0be67acc478a9e2ae09… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 4 08:52:27 2012 -0500 msvcm80: Add stub RegisterModuleUninitializer function. --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm80/msvcm80_main.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 04224cd..5c72393 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -1,8 +1,8 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX(a)Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX(a)Z0@Z @ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation -@ stub -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z -@ stub -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z +@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer +@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z @ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index 29bfdc7..bf5d637 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -43,3 +43,9 @@ void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) { FIXME("stub\n"); } + +/* void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(System.EventHandler^) */ +void __cdecl CrtImplementationDetails_RegisterModuleUninitializer(void* handler) +{ + FIXME("%p: stub\n", handler); +}

1 0