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

Alexandre Julliard : d3d8: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 4df26c56d832e94d138009bc28bb87701f1822c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26c56d832e94d138009bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:12 2014 +0200 d3d8: Remove unnecessary DllMain implementation. --- dlls/d3d8/d3d8_main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 2b6ada4..8ac704c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -56,15 +56,6 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * ValidateVertexShader (D3D8.@) *

1 0

Alexandre Julliard : dciman32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 16352f0aeeb4a5429a9b9b78f75baa20cefd564d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16352f0aeeb4a5429a9b9b78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:14 2014 +0200 dciman32: Remove unnecessary DllMain implementation. --- dlls/dciman32/dciman_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c index 2287c78..c693492 100644 --- a/dlls/dciman32/dciman_main.c +++ b/dlls/dciman32/dciman_main.c @@ -31,18 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI

1 0

Alexandre Julliard : advpack: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0289ea0e43ad099db86642e1776313c8b5ac36c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289ea0e43ad099db86642e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:03 2014 +0200 advpack: Remove unnecessary DllMain implementation. --- dlls/advpack/advpack.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 296abb5..83dda08 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -208,19 +208,6 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges.

1 0

Alexandre Julliard : msimg32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 693faf2a7d47f1886cdb005e0f7ca296a71e05c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693faf2a7d47f1886cdb005e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:20 2014 +0200 msimg32: Remove unnecessary DllMain implementation. --- dlls/msimg32/msimg32_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c index 9e859c8..34beb3c 100644 --- a/dlls/msimg32/msimg32_main.c +++ b/dlls/msimg32/msimg32_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimg32); -/*********************************************************************** - * DllInitialize (MSIMG32.@) - * - * MSIMG32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - /****************************************************************************** * vSetDdrawflag (MSIMG32.@) */

1 0

Alexandre Julliard : wintrust: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6eb922f1d461d0afcc5e3d4e547e4a4bd6e512d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb922f1d461d0afcc5e3d4e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:25 2014 +0200 wintrust: Remove unnecessary DllMain implementation. --- dlls/wintrust/wintrust_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 9b8dd85..58e3ac3 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -59,20 +59,6 @@ void WINAPI WINTRUST_Free(void *p) } /*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - -/*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert )

1 0

Stefan Dösinger : wined3d: Move get_dc palette updates to ddraw.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fd0189bbfa1ccc3832aaf01fb61a15fbc6ee9e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0189bbfa1ccc3832aaf01fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 16:13:31 2014 +0200 wined3d: Move get_dc palette updates to ddraw. --- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 19 +++++++++++++++++-- dlls/wined3d/palette.c | 6 ++++++ dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2bf8132..8cc5201 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -575,6 +575,13 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +static inline BOOL format_is_paletteindexed(const DDPIXELFORMAT *fmt) +{ + DWORD flags = DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 + | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8; + return !!(fmt->dwFlags & flags); +} + /* Used for generic dumping */ struct flag_info { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e184cfd..4f270fd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1798,10 +1798,7 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID static BOOL validate_surface_palette(struct ddraw_surface *surface) { - return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) + return !format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat) || surface->palette; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2efc98c..3f230a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -461,8 +461,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD return DDERR_INVALIDSURFACETYPE; } - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + if (!format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) return DDERR_INVALIDPIXELFORMAT; wined3d_mutex_lock(); @@ -2017,6 +2016,22 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); + + if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; + + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + } + wined3d_mutex_unlock(); switch(hr) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e103b5b..24b344c 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -83,6 +83,12 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, return WINED3D_OK; } +void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc) +{ + if (SetDIBColorTable(dc, 0, 256, palette->colors) != 256) + ERR("Failed to set DIB color table.\n"); +} + HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea27ab..023439d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1378,7 +1378,7 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) { - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); + wined3d_palette_apply_to_dc(palette, surface->hDC); x11_copy_to_screen(surface->swapchain, NULL); } } @@ -3122,31 +3122,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) surface_load_location(surface, WINED3D_LOCATION_DIB); surface_invalidate_location(surface, ~WINED3D_LOCATION_DIB); - if (surface->resource.format->id == WINED3DFMT_P8_UINT - || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) - { - /* GetDC on palettized formats is unsupported in D3D9, and the method - * is missing in D3D8, so this should only be used for DX <=7 - * surfaces (with non-device palettes). */ - const RGBQUAD *colors = NULL; - - if (surface->palette) - { - colors = surface->palette->colors; - } - else - { - struct wined3d_swapchain *swapchain = surface->resource.device->swapchains[0]; - struct wined3d_surface *dds_primary = swapchain->front_buffer; - - if (dds_primary && dds_primary->palette) - colors = dds_primary->palette->colors; - } - - if (colors) - SetDIBColorTable(surface->hDC, 0, 256, colors); - } - surface->flags |= SFLAG_DCINUSE; surface->resource.map_count++; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 41b3158..f1a45dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,6 +160,7 @@ @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db36fbf..328b595 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2261,6 +2261,7 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); +void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

1 0

Nikolay Sivov : xmllite/writer: Implement Flush() method.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: caeecfa223013941f44e9974a51f9bb3bd2b2a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caeecfa223013941f44e9974a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:50:31 2014 +0400 xmllite/writer: Implement Flush() method. --- dlls/xmllite/tests/writer.c | 14 +++++++------- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2fcd5f2..b6b8fe3 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -170,24 +170,24 @@ static void test_writestartdocument(void) hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); ok(hr == S_OK, "got 0x%08x\n", hr); + /* nothing written yet */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == E_NOTIMPL) - { - IStream_Release(stream); - IXmlWriter_Release(writer); - return; - } hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 745da79..0a1d361 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,6 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes + * Copyright 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -62,6 +63,7 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; + ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -223,6 +225,11 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +static inline void reset_output_buffer(xmlwriteroutput *output) +{ + output->stream_written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -243,6 +250,31 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu return hr; } +static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) +{ + struct output_buffer *buffer; + ULONG written = 0, len; + HRESULT hr; + + if (!output || !output->stream) + return S_OK; + + buffer = &output->buffer; + + len = buffer->written - output->stream_written; + if (!len) + return S_OK; + + hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + return hr; + } + + output->stream_written += written; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -295,6 +327,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { + reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -662,9 +695,9 @@ static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + return writeroutput_flush_stream(This->output); } static const struct IXmlWriterVtbl xmlwriter_vtbl = @@ -825,6 +858,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; + writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : xmllite/writer: Initial support for starting a document.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a0f67c36956dd8998a0e79e675fcc7d7151b2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f67c36956dd8998a0e79e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:49:37 2014 +0400 xmllite/writer: Initial support for starting a document. --- dlls/xmllite/reader.c | 13 ++-- dlls/xmllite/tests/writer.c | 20 ++++-- dlls/xmllite/writer.c | 154 +++++++++++++++++++++++++++++++++++++--- dlls/xmllite/xmllite_private.h | 9 +++ 4 files changed, 175 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f67c36956dd8998a0e7…

1 0

Nikolay Sivov : xmllite/writer: Initial support of output buffer creation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71ab66efa04f80ef788a485295f10dd9e0d48191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ab66efa04f80ef788a48529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:47:26 2014 +0400 xmllite/writer: Initial support of output buffer creation. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/writer.c | 83 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++ dlls/xmllite/xmllite_private.h | 3 +- 4 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8b81ea..e772a08 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -554,7 +554,7 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +HRESULT get_code_page(xml_encoding encoding, UINT *cp) { if (encoding == XmlEncoding_Unknown) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 738844f..0f86fb9 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -143,6 +143,88 @@ static void test_writeroutput(void) IUnknown_Release(output); } +static void test_writestartdocument(void) +{ + static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* output not set */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); +todo_wine + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + if (hr == E_NOTIMPL) { + IXmlWriter_Release(writer); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, fullprolog, strlen(fullprolog)), "got %s, expected %s\n", ptr, fullprolog); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -150,4 +232,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); + test_writestartdocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2432602..10d73cb 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -34,6 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +struct output_buffer +{ + char *data; + unsigned int allocated; + unsigned int written; + UINT codepage; +}; + typedef struct { IXmlWriterOutput IXmlWriterOutput_iface; @@ -42,6 +50,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + struct output_buffer buffer; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -107,6 +116,36 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static HRESULT init_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + const int initial_len = 0x2000; + HRESULT hr; + UINT cp; + + hr = get_code_page(output->encoding, &cp); + if (FAILED(hr)) return hr; + + buffer->data = writeroutput_alloc(output, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->allocated = initial_len; + buffer->written = 0; + buffer->codepage = cp; + + return S_OK; +} + +static void free_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + writeroutput_free(output, buffer->data); + buffer->data = NULL; + buffer->allocated = 0; + buffer->written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -572,6 +611,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); + free_output_buffer(This); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -627,11 +667,14 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; + HRESULT hr; TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); if (!stream || !output) return E_INVALIDARG; + *output = NULL; + if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else @@ -644,6 +687,11 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); writeroutput->stream = NULL; + hr = init_output_buffer(writeroutput); + if (FAILED(hr)) { + IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 96a78fa..642aabe 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -60,6 +60,7 @@ typedef enum XmlEncoding_Unknown } xml_encoding; -xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN; +xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; +HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */

1 0

Hans Leidekker : winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 552225632827ffe66a3a8f4045628cc8762b1a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552225632827ffe66a3a8f404… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:48 2014 +0200 winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/pac.js | 244 ----------------------- dlls/winhttp/rsrc.rc | 3 - dlls/winhttp/session.c | 484 ++++++---------------------------------------- 4 files changed, 58 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552225632827ffe66a3a8…

1 0