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

Nikolay Sivov : shell32: Added a stub for IShellDispatch2.
by Alexandre Julliard May 7, 2012

May 7, 2012

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

Józef Kucia : d3dx9: Implement the pixel format conversion in D3DXSaveSurfaceToFileW.
by Alexandre Julliard May 7, 2012

May 7, 2012

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: Implement D3DXSaveSurfaceToFileW.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: ec70b67b8d908d1ee11708d18a75774cb9a9bdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec70b67b8d908d1ee11708d18… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 4 13:01:21 2012 +0200 d3dx9: Implement D3DXSaveSurfaceToFileW. --- dlls/d3dx9_36/surface.c | 166 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ab316cf..e5d0dc6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -59,6 +59,19 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) return D3DFMT_UNKNOWN; } +static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) +{ + int i; + + for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) + { + if (wic_pixel_formats[i].d3dformat == format) + return wic_pixel_formats[i].wic_guid; + } + + return NULL; +} + /* dds_header.flags */ #define DDS_CAPS 0x1 #define DDS_HEIGHT 0x2 @@ -1387,9 +1400,154 @@ HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *dst_filename, D3DXIMAGE_FILEFO return hr; } -HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, - LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) +HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEFORMAT file_format, + IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect) { - FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); - return D3DERR_INVALIDCALL; + IWICImagingFactory *factory; + IWICBitmapEncoder *encoder = NULL; + IWICBitmapFrameEncode *frame = NULL; + IPropertyBag2 *encoder_options = NULL; + IWICStream *stream = NULL; + HRESULT hr; + HRESULT initresult; + const CLSID *encoder_clsid; + const GUID *pixel_format_guid; + WICPixelFormatGUID wic_pixel_format; + D3DFORMAT d3d_pixel_format; + D3DSURFACE_DESC src_surface_desc; + D3DLOCKED_RECT locked_rect; + int width, height; + + TRACE("(%s, %#x, %p, %p, %s)\n", + wine_dbgstr_w(dst_filename), file_format, src_surface, src_palette, wine_dbgstr_rect(src_rect)); + + if (!dst_filename || !src_surface) return D3DERR_INVALIDCALL; + + if (src_palette) + { + FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); + return D3DERR_INVALIDCALL; + } + + switch (file_format) + { + case D3DXIFF_BMP: + encoder_clsid = &CLSID_WICBmpEncoder; + break; + case D3DXIFF_PNG: + encoder_clsid = &CLSID_WICPngEncoder; + break; + case D3DXIFF_JPG: + encoder_clsid = &CLSID_WICJpegEncoder; + break; + case D3DXIFF_DDS: + case D3DXIFF_DIB: + case D3DXIFF_HDR: + case D3DXIFF_PFM: + case D3DXIFF_TGA: + case D3DXIFF_PPM: + FIXME("File format %#x is not supported yet\n", file_format); + return E_NOTIMPL; + default: + return D3DERR_INVALIDCALL; + } + + IDirect3DSurface9_GetDesc(src_surface, &src_surface_desc); + if (src_rect) + { + if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom) + return D3D_OK; + if (src_rect->left < 0 || src_rect->top < 0) + return D3DERR_INVALIDCALL; + if (src_rect->left > src_rect->right || src_rect->top > src_rect->bottom) + return D3DERR_INVALIDCALL; + if (src_rect->right > src_surface_desc.Width || src_rect->bottom > src_surface_desc.Height) + return D3DERR_INVALIDCALL; + + width = src_rect->right - src_rect->left; + height = src_rect->bottom - src_rect->top; + } + else + { + width = src_surface_desc.Width; + height = src_surface_desc.Height; + } + + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICStream_InitializeFromFilename(stream, dst_filename, GENERIC_WRITE); + if (FAILED(hr)) goto cleanup_err; + + hr = CoCreateInstance(encoder_clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + IStream_Release((IStream *)stream); + stream = NULL; + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame, &encoder_options); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapFrameEncode_Initialize(frame, encoder_options); + if (FAILED(hr)) goto cleanup_err; + + hr = IWICBitmapFrameEncode_SetSize(frame, width, height); + if (FAILED(hr)) goto cleanup_err; + + pixel_format_guid = d3dformat_to_wic_guid(src_surface_desc.Format); + if (!pixel_format_guid) + { + FIXME("Pixel format %#x is not supported yet\n", src_surface_desc.Format); + hr = E_NOTIMPL; + goto cleanup; + } + + memcpy(&wic_pixel_format, pixel_format_guid, sizeof(GUID)); + hr = IWICBitmapFrameEncode_SetPixelFormat(frame, &wic_pixel_format); + d3d_pixel_format = wic_guid_to_d3dformat(&wic_pixel_format); + if (SUCCEEDED(hr) && d3d_pixel_format != D3DFMT_UNKNOWN) + { + TRACE("Using pixel format %s %#x\n", debugstr_guid(&wic_pixel_format), d3d_pixel_format); + + if (src_surface_desc.Format == d3d_pixel_format) /* Simple copy */ + { + hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + 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 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; + +cleanup: + if (stream) IStream_Release((IStream *)stream); + + if (frame) IWICBitmapFrameEncode_Release(frame); + if (encoder_options) IPropertyBag2_Release(encoder_options); + + if (encoder) IWICBitmapEncoder_Release(encoder); + + if (SUCCEEDED(initresult)) CoUninitialize(); + + return hr; }

1 0

Nikolay Sivov : msxml3: Make ::put_data() use passed BSTR as general WCHAR buffer.
by Alexandre Julliard May 7, 2012

May 7, 2012

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

Vincent Povirk : msvcm80: Add stub RegisterModuleUninitializer function.
by Alexandre Julliard May 7, 2012

May 7, 2012

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

Erich Hoover : ws2_32/tests: Fix cleanup for first IOCP duplicated handle test.
by Alexandre Julliard May 7, 2012

May 7, 2012

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 : msvcm80: Add __setusermatherr_m stub.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: eb29d8705384c21efaee2605fa7dc2fed420dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb29d8705384c21efaee2605f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 4 10:51:57 2012 -0500 msvcm80: Add __setusermatherr_m stub. --- dlls/msvcm80/msvcm80.spec | 2 +- dlls/msvcm80/msvcm80_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 5c72393..86e50bf 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -300,7 +300,7 @@ @ stub -arch=win64 ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z @ stub ?signal@@YAP6MXH(a)ZHH@Z @ stub ?signal@@YAP6MXH(a)ZHP6MXH@Z(a)Z -@ stub __setusermatherr_m +@ cdecl __setusermatherr_m(ptr) @ stub towctrans @ stub wctrans @ stub wctype diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index bf5d637..0dd94ca 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -49,3 +49,10 @@ void __cdecl CrtImplementationDetails_RegisterModuleUninitializer(void* handler) { FIXME("%p: stub\n", handler); } + +/* handler is a "method" with signature int32 (*handler)(_exception*), but I'm + * not sure what that means */ +void __cdecl __setusermatherr_m(void *handler) +{ + FIXME("%p: stub\n", handler); +}

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 1b76949d69f8d664f2760b1ae5c899c66be43d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b76949d69f8d664f2760b1ae… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat May 5 13:04:45 2012 +0200 po: Update German translation. --- po/de.po | 73 +++++++++++++++++-------------------------------------------- 1 files changed, 21 insertions(+), 52 deletions(-) diff --git a/po/de.po b/po/de.po index 92e4321..308e734 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-28 20:12+0200\n" -"Last-Translator: André Hentschel\n" +"PO-Revision-Date: 2012-05-05 11:36+0200\n" +"Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -6649,37 +6649,6 @@ msgid "insert disk %s" msgstr "Bitte Disk %s einlegen" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6714,7 +6683,7 @@ msgstr "" "Windows Installer %s\n" "\n" "Aufruf:\n" -"msiexec Befehl {Parameter} [Zusätzliche Parameter]\n" +"msiexec Befehl {erforderliche Parameter} [zusätzliche Parameter]\n" "\n" "Produkt installieren:\n" "\t/i {Paket|Produktcode} [Eigenschaft]\n" @@ -6737,7 +6706,7 @@ msgstr "" "\t/y\n" "Registrierung des MSI Service aufheben:\n" "\t/z\n" -"Hilfe anzeigen:\n" +"Diese Hilfe anzeigen:\n" "\t/help\n" "\t/?\n" @@ -9204,11 +9173,11 @@ msgstr "Nicht genügend Speicher" #: wldap32.rc:118 msgid "Can't connect to the LDAP server" -msgstr "Kann nicht zum LDAP Server verbinden" +msgstr "Kann nicht zum LDAP-Server verbinden" #: wldap32.rc:119 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "Die Operation wird durch dieses LDAP Protokoll nicht unterstützt" +msgstr "Operation durch diese Version des LDAP-Protokoll nicht unterstützt" #: wldap32.rc:120 msgid "Specified control was not found in message" @@ -11311,7 +11280,7 @@ msgstr "Befehle zum Bearbeiten der ganzen Registry" #: regedit.rc:135 msgid "Contains commands for editing values or keys" -msgstr "Befehle zum Ändern von Schlüsseln oder Werten" +msgstr "Befehle zum Ändern von Schlüsseln oder Datenwerten" #: regedit.rc:136 msgid "Contains commands for customizing the registry window" @@ -11319,16 +11288,16 @@ msgstr "Befehle zum Anpassen des Fensters" #: regedit.rc:137 msgid "Contains commands for accessing frequently used keys" -msgstr "Befehle für die Favoriten" +msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:138 msgid "" "Contains commands for displaying help and information about registry editor" -msgstr "Befehle zum Anzeigen von Hilfe oder Informationen über das Programm" +msgstr "Befehle zum Anzeigen der Hilfe oder Informationen über das Programm" #: regedit.rc:139 msgid "Contains commands for creating new keys or values" -msgstr "Befehle zum Erstellen von neuen Schlüsseln oder Daten" +msgstr "Befehle zum Erstellen von neuen Schlüsseln oder Datenwerten" #: regedit.rc:124 msgid "Data" @@ -11364,7 +11333,7 @@ msgstr "(Wert nicht gesetzt)" #: regedit.rc:203 msgid "(cannot display value)" -msgstr "(kann Wert nicht darstellen)" +msgstr "(Wert kann nicht dargestellt werden)" #: regedit.rc:204 msgid "(unknown %d)" @@ -11380,7 +11349,7 @@ msgstr "Fügt Schlüssel zu den Favoriten hinzu" #: regedit.rc:162 msgid "Removes keys from the favorites list" -msgstr "Löscht Schlüssel von den Favoriten" +msgstr "Entfernt Schlüssel aus den Favoriten" #: regedit.rc:163 msgid "Shows or hides the status bar" @@ -11448,15 +11417,15 @@ msgstr "Druckt Teile oder die gesamte Registry aus" #: regedit.rc:155 msgid "Displays program information, version number and copyright" -msgstr "Zeigt Programmname, Version und Copyright an" +msgstr "Zeigt Programminformationen, Version und Copyright an" #: regedit.rc:178 msgid "Can't query value '%s'" -msgstr "Kann den Wert '%s' nicht lesen" +msgstr "Der Wert '%s' kann nicht gelesen werden" #: regedit.rc:179 msgid "Can't edit keys of this type (%u)" -msgstr "Kann Schlüssel von diesem Typ (%u) nicht ändern" +msgstr "Schlüssel von diesem Typ (%u) können nicht geändert werden" #: regedit.rc:180 msgid "Value is too big (%u)" @@ -11468,7 +11437,7 @@ msgstr "Bitte bestätigen" #: regedit.rc:182 msgid "Are you sure you want to delete value '%s'?" -msgstr "Wollen Sie '%s' wirklich löschen?" +msgstr "Möchten Sie den Wert '%s' wirklich löschen?" #: regedit.rc:186 msgid "Search string '%s' not found" @@ -11476,7 +11445,7 @@ msgstr "Suchfolge '%s' wurde nicht gefunden" #: regedit.rc:183 msgid "Are you sure you want to delete these values?" -msgstr "Wollen Sie diese Werte wirklich löschen?" +msgstr "Möchten Sie diese Werte wirklich löschen?" #: regedit.rc:184 msgid "New Key #%d" @@ -11488,7 +11457,7 @@ msgstr "Neuer Wert #%d" #: regedit.rc:177 msgid "Can't query key '%s'" -msgstr "Kann den Schlüssel '%s' nicht lesen" +msgstr "Der Schlüssel '%s' kann nicht gelesen werden" #: regedit.rc:149 msgid "Adds a new multi string value" @@ -11506,13 +11475,13 @@ msgid "" msgstr "" "Es konnte keine Anwendung gestartet werden, oder es ist keine Anwendung mit " "der angegebenen Datei verknüpft.\n" -"ShellExecuteEx gescheitert" +"ShellExecuteEx fehlgeschlagen" #: start.rc:43 msgid "Could not translate the specified Unix filename to a DOS filename." msgstr "" -"Der angegebene Unix Dateiname konnte nicht in einen DOS Dateinamen " -"umgewandelt werden." +"Der angegebene Unix-Dateiname konnte nicht in einen DOS-Dateinamen übersetzt " +"werden." #: taskkill.rc:27 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n"

1 0

Thomas Faber : rpcrt4/tests: Fix build with PSDK headers.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: c38ba3a41137f3e66eac34ae6da6bd070fbdfe6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38ba3a41137f3e66eac34ae6… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat May 5 16:11:04 2012 +0200 rpcrt4/tests: Fix build with PSDK headers. --- dlls/rpcrt4/tests/ndr_marshall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 549d09e..ac3bacc 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */

1 0

Vincent Povirk : winebuild: Allow angle brackets in export names.
by Alexandre Julliard May 7, 2012

May 7, 2012

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