November 2012 - Wine-commits

Henri Verbeet : d3d9/tests: Create the d3d9ex object in create_device().
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 84da62d9933c75a4a89828ca34da6c8e8303960c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84da62d9933c75a4a89828ca3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:13 2012 +0100 d3d9/tests: Create the d3d9ex object in create_device(). --- dlls/d3d9/tests/d3d9ex.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 8b79b46..6be030c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -49,11 +49,15 @@ static HWND create_window(void) return ret; } -static IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND device_window, HWND focus_window, BOOL windowed) +static IDirect3DDevice9Ex *create_device(HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9Ex *device; D3DDISPLAYMODEEX mode, *m; + IDirect3D9Ex *d3d9; + + if (FAILED(pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) + return NULL; present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; @@ -73,16 +77,20 @@ static IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND device_window, m = windowed ? NULL : &mode; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; + + device = NULL; - return NULL; +done: + IDirect3D9Ex_Release(d3d9); + return device; } static ULONG getref(IUnknown *obj) { @@ -387,21 +395,13 @@ static void test_texture_sysmem_create(void) IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; D3DLOCKED_RECT locked_rect; - IDirect3D9Ex *d3d9; UINT refcount; HWND window; HRESULT hr; void *mem; - if (FAILED(hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) - { - skip("Failed to create IDirect3D9Ex object (hr %#x), skipping tests.\n", hr); - return; - } - window = create_window(); - device = create_device(d3d9, window, window, TRUE); - if (!device) + if (!(device = create_device(window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -428,8 +428,6 @@ static void test_texture_sysmem_create(void) done: DestroyWindow(window); - if (d3d9) - IDirect3D9Ex_Release(d3d9); } START_TEST(d3d9ex)

1 0

Henri Verbeet : d3d9/tests: Add tests for device resets in d3d9ex.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 2f307a14f0ccbf965b1022f768f3b617dedc56fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f307a14f0ccbf965b1022f76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:14 2012 +0100 d3d9/tests: Add tests for device resets in d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 480 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 480 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f307a14f0ccbf965b102…

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: d2de810df38c3c0ef4514fe5e4c07fc2df671aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2de810df38c3c0ef4514fe5e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 19 22:00:19 2012 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 620fb9b..de37706 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -607,7 +607,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; - This->pfnCreateInstance = &create_monodata; + This->pfnCreateInstance = create_monodata; This->ref = 1; This->clsid = *rclsid;

1 0

Andrew Talbot : crypt32: Remove unused variables.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 8300fd5aa8f57e2c93b2c6c74834e2db697d4ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8300fd5aa8f57e2c93b2c6c74… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 19 22:00:08 2012 +0000 crypt32: Remove unused variables. --- dlls/crypt32/oid.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4f09e7b..4c3f95f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1053,9 +1053,6 @@ static const WCHAR rc2[] = { 'r','c','2',0 }; static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; -static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; -static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; -static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 };

1 0

Austin English : include: Remove stray linefeeds.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: c540cca987ec56e4212b2a6dda1ea60f9a8c720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c540cca987ec56e4212b2a6dd… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 19 17:47:11 2012 -0600 include: Remove stray linefeeds. --- include/endpointvolume.idl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/endpointvolume.idl b/include/endpointvolume.idl index f58450a..eaf4f8a 100644 --- a/include/endpointvolume.idl +++ b/include/endpointvolume.idl @@ -30,9 +30,9 @@ typedef struct AUDIO_VOLUME_NOTIFICATION_DATA cpp_quote("typedef struct AUDIO_VOLUME_NOTIFICATION_DATA *PAUDIO_VOLUME_NOTIFICATION_DATA;") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_VOLUME 0x1\n") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_MUTE 0x2\n") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_METER 0x4\n") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_VOLUME 0x1") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_MUTE 0x2") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_METER 0x4") interface IAudioEndpointVolumeCallback; interface IAudioEndpointVolume;

1 0

Jason Edmeades : cmd: Add support for tokens= (for /f).
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 47b35d5545cd9794c299acb0417ab9f2de538fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b35d5545cd9794c299acb04… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 8 21:53:08 2012 +0000 cmd: Add support for tokens= (for /f). --- programs/cmd/builtins.c | 200 +++++++++++++++++++++++++++--- programs/cmd/tests/test_builtins.cmd | 31 +++++ programs/cmd/tests/test_builtins.cmd.exp | 21 +++ 3 files changed, 237 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47b35d5545cd9794c299a…

1 0

Jason Edmeades : cmd: Prevent external env vars causing tests to fail.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 2e92853091262fee67f651dfc6a0188e349ba0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e92853091262fee67f651dfc… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 8 22:06:21 2012 +0000 cmd: Prevent external env vars causing tests to fail. --- programs/cmd/tests/test_builtins.cmd | 683 +++++++++++++++--------------- programs/cmd/tests/test_builtins.cmd.exp | 36 +- 2 files changed, 362 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e92853091262fee67f65…

1 0

Jason Edmeades : cmd: Add support for NUL in copy.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: d16f4e700bc16e174bfff8c430cfa93b1f9076fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16f4e700bc16e174bfff8c43… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Nov 9 22:36:30 2012 +0000 cmd: Add support for NUL in copy. --- programs/cmd/builtins.c | 52 ++++++++++++++++++++++-------- programs/cmd/tests/test_builtins.cmd | 17 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++- 3 files changed, 61 insertions(+), 16 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2e7fdd9..8715c51 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -47,6 +47,7 @@ const WCHAR slashW[] = {'\\','\0'}; const WCHAR equalW[] = {'=','\0'}; const WCHAR wildcardsW[] = {'*','?','\0'}; const WCHAR slashstarW[] = {'\\','*','\0'}; +const WCHAR deviceW[] = {'\\','\\','.','\\','\0'}; const WCHAR inbuilt[][10] = { {'C','A','L','L','\0'}, {'C','D','\0'}, @@ -414,7 +415,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app BOOL ok; DWORD bytesread, byteswritten; - WINE_TRACE("ASCII Copying %s to %s (append?%d)\n", + WINE_TRACE("Manual Copying %s to %s (append?%d)\n", wine_dbgstr_w(srcname), wine_dbgstr_w(dstname), append); in = CreateFileW(srcname, GENERIC_READ, 0, NULL, @@ -502,7 +503,7 @@ void WCMD_copy(WCHAR * args) { int argno = 0; WCHAR *rawarg; WIN32_FIND_DATAW fd; - HANDLE hff; + HANDLE hff = INVALID_HANDLE_VALUE; int binarymode = -1; /* -1 means use the default, 1 is binary, 0 ascii */ BOOL concatnextfilename = FALSE; /* True if we have just processed a + */ BOOL anyconcats = FALSE; /* Have we found any + options */ @@ -514,6 +515,7 @@ void WCMD_copy(WCHAR * args) { BOOL status; WCHAR copycmd[4]; DWORD len; + BOOL dstisdevice = FALSE; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; typedef struct _COPY_FILES @@ -785,6 +787,12 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Resolved destination is '%s' (calc later %d)\n", wine_dbgstr_w(destname), appendfirstsource); + /* Remember if the destination is a device */ + if (strncmpW(destination->name, deviceW, strlenW(deviceW)) == 0) { + WINE_TRACE("Destination is a device\n"); + dstisdevice = TRUE; + } + /* Now we need to walk the set of sources, and process each name we come to. If anyconcats is true, we are writing to one file, otherwise we are using the source name each time. @@ -800,8 +808,10 @@ void WCMD_copy(WCHAR * args) { while (thiscopy != NULL) { WCHAR srcpath[MAX_PATH]; + const WCHAR *srcname; WCHAR *filenamepart; DWORD attributes; + BOOL srcisdevice = FALSE; /* If it was not explicit, we now know whether we are concatenating or not and hence whether to copy as binary or ascii */ @@ -836,29 +846,41 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Copy source (calculated): path: '%s' (Concats: %d)\n", wine_dbgstr_w(srcpath), anyconcats); - /* Loop through all source files */ - WINE_TRACE("Searching for: '%s'\n", wine_dbgstr_w(srcpath)); - hff = FindFirstFileW(srcpath, &fd); - if (hff != INVALID_HANDLE_VALUE) { + /* If the source is a device, just use it, otherwise search */ + if (strncmpW(srcpath, deviceW, strlenW(deviceW)) == 0) { + WINE_TRACE("Source is a device\n"); + srcisdevice = TRUE; + srcname = &srcpath[4]; /* After the \\.\ prefix */ + } else { + + /* Loop through all source files */ + WINE_TRACE("Searching for: '%s'\n", wine_dbgstr_w(srcpath)); + hff = FindFirstFileW(srcpath, &fd); + if (hff != INVALID_HANDLE_VALUE) { + srcname = fd.cFileName; + } + } + + if (srcisdevice || hff != INVALID_HANDLE_VALUE) { do { WCHAR outname[MAX_PATH]; BOOL overwrite; /* Skip . and .., and directories */ - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (!srcisdevice && fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { WINE_TRACE("Skipping directories\n"); } else { /* Build final destination name */ strcpyW(outname, destination->name); - if (destisdirectory || appendfirstsource) strcatW(outname, fd.cFileName); + if (destisdirectory || appendfirstsource) strcatW(outname, srcname); /* Build source name */ - strcpyW(filenamepart, fd.cFileName); + if (!srcisdevice) strcpyW(filenamepart, srcname); - /* Do we just overwrite */ + /* Do we just overwrite (we do if we are writing to a device) */ overwrite = !prompt; - if (anyconcats && writtenoneconcat) { + if (dstisdevice || (anyconcats && writtenoneconcat)) { overwrite = TRUE; } @@ -879,7 +901,7 @@ void WCMD_copy(WCHAR * args) { else overwrite = TRUE; } - /* If we needed tyo save away the first filename, do it */ + /* If we needed to save away the first filename, do it */ if (appendfirstsource && overwrite) { heap_free(destination->name); destination->name = heap_strdupW(outname); @@ -898,6 +920,8 @@ void WCMD_copy(WCHAR * args) { } } else if (!thiscopy->binarycopy) { status = WCMD_ManualCopy(srcpath, outname, TRUE, FALSE); + } else if (srcisdevice) { + status = WCMD_ManualCopy(srcpath, outname, FALSE, FALSE); } else { status = CopyFileW(srcpath, outname, FALSE); } @@ -921,8 +945,8 @@ void WCMD_copy(WCHAR * args) { } } } - } while (FindNextFileW(hff, &fd) != 0); - FindClose (hff); + } while (!srcisdevice && FindNextFileW(hff, &fd) != 0); + if (!srcisdevice) FindClose (hff); } else { /* Error if the first file was not found */ if (!anyconcats || (anyconcats && !writtenoneconcat)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 93ef7e2..eb9b888 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -607,7 +607,22 @@ if exist foo ( ) else ( echo *** ) -cd .. & rd foobar +echo 1234 >a.a +copy a.a+NUL b.b >nul +call :CheckFileSize a.a 7 b.b 8 +copy NUL+a.a b.b >nul +call :CheckFileSize a.a 7 b.b 8 +mkdir subdir +copy a.a+NUL subdir\ >nul +call :CheckFileSize a.a 7 subdir\a.a 8 +del subdir\a.a +cd subdir +copy ..\a.a NUL >nul +if exist a.a echo Failed +cd .. +rd subdir /s /q +del a.a b.b +cd .. & rd foobar /s /q echo ------------ Testing if/else ------------ echo --- if/else should work with blocks diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 218db9c..e7300b4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -415,7 +415,13 @@ bar bar bar NUL -(a)todo_wine@foo created +foo created +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on b.b [8]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on b.b [8]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on subdir\a.a [8]@or_broken(a)Skipping file size check on NT4 ------------ Testing if/else ------------ --- if/else should work with blocks if seems to work

1 0

Nikolay Sivov : xmllite: Initial support for reader input encoding detection.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: d693790175ac8c8d1b2ac88ac2026e9a10f3102d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d693790175ac8c8d1b2ac88ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 18:01:46 2012 -0500 xmllite: Initial support for reader input encoding detection. --- dlls/xmllite/reader.c | 123 ++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 11 +++- dlls/xmllite/xmllite_private.h | 5 ++ 3 files changed, 115 insertions(+), 24 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ae05057..188b419 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -117,6 +117,14 @@ static inline void *m_alloc(IMalloc *imalloc, size_t len) return heap_alloc(len); } +static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) +{ + if (imalloc) + return IMalloc_Realloc(imalloc, mem, len); + else + return heap_realloc(mem, len); +} + static inline void m_free(IMalloc *imalloc, void *mem) { if (imalloc) @@ -142,6 +150,11 @@ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) return m_alloc(input->imalloc, len); } +static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t len) +{ + return m_realloc(input->imalloc, mem, len); +} + static inline void readerinput_free(xmlreaderinput *input, void *mem) { return m_free(input->imalloc, mem); @@ -165,7 +178,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) +static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) { const struct xml_encoding_data *data; @@ -176,12 +189,12 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) } data = &xml_encoding_map[encoding]; - *cp = data->cp; + input->buffer->code_page = data->cp; return S_OK; } -static HRESULT alloc_input_buffer(xmlreaderinput *input, xml_encoding encoding) +static HRESULT alloc_input_buffer(xmlreaderinput *input) { input_buffer *buffer; HRESULT hr; @@ -192,29 +205,20 @@ static HRESULT alloc_input_buffer(xmlreaderinput *input, xml_encoding encoding) if (!buffer) return E_OUTOFMEMORY; buffer->input = input; - hr = get_code_page(encoding, &buffer->code_page); + buffer->code_page = ~0; /* code page is unknown at this point */ + hr = init_encoded_buffer(input, &buffer->utf16); if (hr != S_OK) { readerinput_free(input, buffer); return hr; } - hr = init_encoded_buffer(input, &buffer->utf16); + hr = init_encoded_buffer(input, &buffer->encoded); if (hr != S_OK) { + free_encoded_buffer(input, &buffer->utf16); readerinput_free(input, buffer); return hr; } - if (encoding != XmlEncoding_UTF16) { - hr = init_encoded_buffer(input, &buffer->encoded); - if (hr != S_OK) { - free_encoded_buffer(input, &buffer->utf16); - readerinput_free(input, buffer); - return hr; - } - } - else - memset(&buffer->encoded, 0, sizeof(buffer->encoded)); - input->buffer = buffer; return S_OK; } @@ -226,7 +230,7 @@ static void free_input_buffer(input_buffer *buffer) readerinput_free(buffer->input, buffer); } -static void xmlreaderinput_release_stream(xmlreaderinput *readerinput) +static void readerinput_release_stream(xmlreaderinput *readerinput) { if (readerinput->stream) { ISequentialStream_Release(readerinput->stream); @@ -236,11 +240,11 @@ static void xmlreaderinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(xmlreaderinput *readerinput) +static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; - xmlreaderinput_release_stream(readerinput); + readerinput_release_stream(readerinput); hr = IUnknown_QueryInterface(readerinput->input, &IID_IStream, (void**)&readerinput->stream); if (hr != S_OK) hr = IUnknown_QueryInterface(readerinput->input, &IID_ISequentialStream, (void**)&readerinput->stream); @@ -248,6 +252,59 @@ static HRESULT xmlreaderinput_query_for_stream(xmlreaderinput *readerinput) return hr; } +/* reads a chunk to raw buffer */ +static HRESULT readerinput_growraw(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + ULONG len = buffer->allocated - buffer->written, read; + HRESULT hr; + + /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + variable width encodings like UTF-8 */ + len = (len + 3) & ~3; + /* try to use allocated space or grow */ + if (buffer->allocated - buffer->written < len) + { + buffer->allocated *= 2; + buffer->data = readerinput_realloc(readerinput, buffer->data, buffer->allocated); + len = buffer->allocated - buffer->written; + } + + hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + if (FAILED(hr)) return hr; + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + buffer->written += read; + + return hr; +} + +static xml_encoding readerinput_detectencoding(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + + /* try start symbols if we have enough data to do that, input buffer should contain + first chunk already */ + if (buffer->written >= 4) + { + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + + if (!memcmp(buffer->data, startA, sizeof(startA))) return XmlEncoding_UTF8; + if (!memcmp(buffer->data, startW, sizeof(startW))) return XmlEncoding_UTF16; + } + + /* try with BOM now */ + if (buffer->written >= 3) + { + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) return XmlEncoding_UTF8; + if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) return XmlEncoding_UTF16; + } + + return XmlEncoding_Unknown; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -305,7 +362,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->input) { - xmlreaderinput_release_stream(This->input); + readerinput_release_stream(This->input); IUnknown_Release(&This->input->IXmlReaderInput_iface); This->input = NULL; } @@ -333,7 +390,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } /* set stream for supplied IXmlReaderInput */ - hr = xmlreaderinput_query_for_stream(This->input); + hr = readerinput_query_for_stream(This->input); if (hr == S_OK) This->state = XmlReadState_Initial; @@ -386,7 +443,27 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); + xmlreader *This = impl_from_IXmlReader(iface); + + FIXME("(%p)->(%p): stub\n", This, node_type); + + if (This->state == XmlReadState_Closed) return S_FALSE; + + /* if it's a first call for a new input we need to detect stream encoding */ + if (This->state == XmlReadState_Initial) + { + xml_encoding enc; + HRESULT hr; + + hr = readerinput_growraw(This->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + enc = readerinput_detectencoding(This->input); + TRACE("detected encoding %d\n", enc); + get_code_page(enc, This->input); + } + return E_NOTIMPL; } @@ -683,7 +760,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); - hr = alloc_input_buffer(readerinput, XmlEncoding_UTF16); + hr = alloc_input_buffer(readerinput); if (hr != S_OK) { readerinput_free(readerinput, readerinput); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 582ad48..f5b7680 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -551,15 +551,24 @@ static void test_readerinput(void) static void test_reader_state(void) { IXmlReader *reader; + XmlNodeType nodetype; HRESULT hr; - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* invalid arguments */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + /* attempt to read on closed reader */ + test_read_state(reader, XmlReadState_Closed, -1, 0); +if (0) +{ + /* newer versions crash here, probably cause no input was set */ + hr = IXmlReader_Read(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); +} IXmlReader_Release(reader); } diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 1677e5c..97993e1 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -27,6 +27,11 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Nikolay Sivov : xmllite: Implement GetNodeType() for reader.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: befbc8f57dea0dc20d7d61ba90a5b183d8da05ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=befbc8f57dea0dc20d7d61ba9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 19:00:24 2012 -0500 xmllite: Implement GetNodeType() for reader. --- dlls/xmllite/reader.c | 8 ++++++-- dlls/xmllite/tests/reader.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 188b419..1970ac8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -87,6 +87,7 @@ typedef struct _xmlreader xmlreaderinput *input; IMalloc *imalloc; XmlReadState state; + XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ } xmlreader; @@ -469,8 +470,10 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + *node_type = This->nodetype; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) @@ -725,6 +728,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + reader->nodetype = XmlNodeType_None; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f5b7680..7d77fe9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -351,6 +351,7 @@ static void test_reader_create(void) IXmlReader *reader; IUnknown *input; DtdProcessing dtd; + XmlNodeType nodetype; /* crashes native */ if (0) @@ -364,6 +365,11 @@ static void test_reader_create(void) test_read_state(reader, XmlReadState_Closed, -1, FALSE); + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -403,6 +409,7 @@ static void test_readerinput(void) IXmlReader *reader, *reader2; IUnknown *obj, *input; IStream *stream, *stream2; + XmlNodeType nodetype; HRESULT hr; LONG ref; @@ -444,6 +451,11 @@ static void test_readerinput(void) test_read_state(reader, XmlReadState_Initial, -1, FALSE); + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_OK, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); ok(ref == 3, "Expected 3, got %d\n", ref);

1 0