wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Alex Henrie : ntdll: Avoid double initialization.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: 48f3bacb0b3feda2947b031f70af694628b6041e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f3bacb0b3feda2947b031f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 29 22:37:58 2015 -0700 ntdll: Avoid double initialization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 12 ++++++------ dlls/ntdll/debugbuffer.c | 2 +- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 2 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/thread.c | 6 ++++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4407277..ee2a743 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -748,8 +748,8 @@ static NTSTATUS CDROM_GetDeviceNumber(int dev, STORAGE_DEVICE_NUMBER* devnum) static NTSTATUS CDROM_GetDriveGeometry(int dev, int fd, DISK_GEOMETRY* dg) { CDROM_TOC toc; - NTSTATUS ret = 0; - int fsize = 0; + NTSTATUS ret; + int fsize; if ((ret = CDROM_ReadTOC(dev, fd, &toc)) != 0) return ret; @@ -2432,7 +2432,7 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) { #if defined(linux) - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; dvd_struct dvd; dvd_authinfo auth_info; @@ -2460,7 +2460,7 @@ static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) dk_dvd_read_structure_t dvd; DVDRegionPlaybackControlInfo rpc; DVDCopyrightInfo copy; - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; key.format = kDVDKeyFormatRegionState; key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; @@ -2636,7 +2636,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, break; } #elif defined(__APPLE__) - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; dk_dvd_read_structure_t dvdrs; union { @@ -2771,7 +2771,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize) { #ifdef HAVE_SG_IO_HDR_T_INTERFACE_ID - PSCSI_INQUIRY_DATA pInquiryData = NULL; + PSCSI_INQUIRY_DATA pInquiryData; UCHAR sense_buffer[32]; int iochk, version; sg_io_hdr_t iocmd; diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index 0ad8882..ef8baeb 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -91,7 +91,7 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf) PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(IN ULONG iSize, IN BOOLEAN iEventPair) { - PDEBUG_BUFFER oBuf = NULL; + PDEBUG_BUFFER oBuf; FIXME("(%d, %d): stub\n", iSize, iEventPair); if (iSize < sizeof(DEBUG_BUFFER)) { iSize = sizeof(DEBUG_BUFFER); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f3c6aa2..04c8e26 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -993,7 +993,7 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) */ static int get_dir_case_sensitivity_attr( const char *dir ) { - char *mntpoint = NULL; + char *mntpoint; struct attrlist attr; struct vol_caps caps; struct get_fsid get_fsid; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 74feb97..5bcc03e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1865,7 +1865,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; DWORD len, i; - void *handle = NULL; + void *handle; struct builtin_load_info info, *prev_info; /* Fix the name in case we have a full path and extension */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 9223cb4..81885eb 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -532,7 +532,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, { NTSTATUS ret; UCHAR *data_ptr; - unsigned int fixed_size = 0, min_size = 0; + unsigned int fixed_size, min_size; TRACE( "(%p,%s,%d,%p,%d)\n", handle, debugstr_us(name), info_class, info, length ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1455eb1..0b68185 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -463,7 +463,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_t pthread_id; pthread_attr_t attr; struct ntdll_thread_data *thread_data; - struct startup_info *info = NULL; + struct startup_info *info; HANDLE handle = 0, actctx = 0; TEB *teb = NULL; DWORD tid = 0; @@ -732,7 +732,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret; DWORD dummy, i; - BOOL self = FALSE; + BOOL self; #ifdef __i386__ /* on i386 debug registers always require a server call */ @@ -746,6 +746,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) ntdll_get_thread_data()->dr6 == context->Dr6 && ntdll_get_thread_data()->dr7 == context->Dr7); } +#else + self = FALSE; #endif if (!self)

1 0

Andrey Turkin : d3d11: Add the ID3D11VideoContext interface.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: 2841e180dc0ba7102003180dca7e92081ba30597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2841e180dc0ba7102003180dc… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Jan 22 12:59:49 2016 +0100 d3d11: Add the ID3D11VideoContext interface. Signed-off-by: Andrey Turkin <andrey.turkin(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 510 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 507 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2841e180dc0ba71020031…

1 0

Alistair Leslie-Hughes : msi: Refreh controls after spawned dialog is closed.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: 434f0f7cb18cc5068be0d48c0c6c981f36c82bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434f0f7cb18cc5068be0d48c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 22 20:49:30 2016 +1100 msi: Refreh controls after spawned dialog is closed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9b61937..245bfdc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -556,6 +556,17 @@ static void msi_dialog_update_controls( msi_dialog *dialog, LPCWSTR property ) } } +static void msi_dialog_update_all_controls( msi_dialog *dialog ) +{ + msi_control *control; + + LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + { + if ( control->property && control->update ) + control->update( dialog, control ); + } +} + static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCWSTR value ) { UINT r = msi_set_property( package->db, property, value, -1 ); @@ -4389,7 +4400,11 @@ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { /* don't destroy a modeless dialogs that might be our parent */ event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) msi_dialog_end_dialog( dialog ); + if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + msi_dialog_end_dialog( dialog ); + else + msi_dialog_update_all_controls(dialog); + return ERROR_SUCCESS; }

1 0

Alistair Leslie-Hughes : msi: Allow PathEdit controls to be updated.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: e90b34e131446c356ae5c5f49fc376eb294f1ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90b34e131446c356ae5c5f49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 22 20:49:29 2016 +1100 msi: Allow PathEdit controls to be updated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 64cbbbc..9b61937 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2229,6 +2229,7 @@ static UINT msi_dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + control->update = msi_dialog_update_pathedit; info->dialog = dialog; info->control = control;

1 0

Huw Davies : oleaut32: Use the default OLE allocator to allocate BSTRs.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: 195f183ccdb0c693979092147c52b3e2086cb304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195f183ccdb0c693979092147… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 22 09:39:21 2016 +0000 oleaut32: Use the default OLE allocator to allocate BSTRs. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 93c5fd3..742e63f 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -174,7 +174,7 @@ static bstr_t *alloc_bstr(size_t size) } } - ret = HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); + ret = CoTaskMemAlloc(bstr_alloc_size(size)); if(ret) ret->size = size; return ret; @@ -321,7 +321,7 @@ void WINAPI SysFreeString(BSTR str) LeaveCriticalSection(&cs_bstr_cache); } - HeapFree(GetProcessHeap(), 0, bstr); + CoTaskMemFree(bstr); } /****************************************************************************** @@ -388,30 +388,25 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) { /* Detect integer overflow. */ if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) - return 0; + return FALSE; if (*old!=NULL) { - BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); bstr_t *old_bstr = bstr_from_str(*old); - bstr_t *bstr = HeapReAlloc(GetProcessHeap(), 0, old_bstr, bstr_alloc_size(newbytelen)); + bstr_t *bstr = CoTaskMemRealloc(old_bstr, bstr_alloc_size(newbytelen)); + + if (!bstr) return FALSE; + *old = bstr->u.str; bstr->size = newbytelen; - /* Subtle hidden feature: The old string data is still there - * when 'in' is NULL! - * Some Microsoft program needs it. - * FIXME: Is it a sideeffect of BSTR caching? - */ - if (str && old_copy!=str) memmove(*old, str, newbytelen); - (*old)[len] = 0; + /* The old string data is still there when str is NULL */ + if (str && old_bstr->u.str != str) memmove(bstr->u.str, str, newbytelen); + bstr->u.str[len] = 0; } else { - /* - * Allocate the new string - */ *old = SysAllocStringLen(str, len); } - return 1; + return TRUE; } /******************************************************************************

1 0

Nikolay Sivov : dwrite: Return earlier from GetKerningPairAdjustments() when pair kerning is not supported.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: eae84e7ddecf838f8670f446aee05abe88792ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae84e7ddecf838f8670f446a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 21:58:41 2016 +0300 dwrite: Return earlier from GetKerningPairAdjustments() when pair kerning is not supported. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dab7322..2ff3b8c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -880,6 +880,11 @@ static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 return E_INVALIDARG; } + if (!This->has_kerning_pairs) { + memset(adjustments, 0, count*sizeof(INT32)); + return S_OK; + } + for (i = 0; i < count-1; i++) adjustments[i] = freetype_get_kerning_pair_adjustment(iface, indices[i], indices[i+1]); adjustments[count-1] = 0;

1 0

Nikolay Sivov : dwrite: Ask freetype once about kerning pairs support and monospaced property.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: ed3b5a42bea0271297ef6fca2cadcb598738c806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3b5a42bea0271297ef6fca2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 21:58:40 2016 +0300 dwrite: Ask freetype once about kerning pairs support and monospaced property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +++++++--- dlls/dwrite/freetype.c | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4640de9..dab7322 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2,7 +2,7 @@ * Font and collections * * Copyright 2011 Huw Davies - * Copyright 2012, 2014-2015 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -202,6 +202,8 @@ struct dwrite_fontface { DWRITE_CARET_METRICS caret; INT charmap; BOOL is_symbol; + BOOL has_kerning_pairs : 1; + BOOL is_monospaced : 1; struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; @@ -808,7 +810,7 @@ static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); TRACE("(%p)\n", This); - return freetype_is_monospaced(iface); + return This->is_monospaced; } static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *iface, @@ -889,7 +891,7 @@ static BOOL WINAPI dwritefontface1_HasKerningPairs(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); TRACE("(%p)\n", This); - return freetype_has_kerning_pairs(iface); + return This->has_kerning_pairs; } static HRESULT WINAPI dwritefontface1_GetRecommendedRenderingMode(IDWriteFontFace2 *iface, @@ -3623,6 +3625,8 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } } fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace2_iface, &fontface->is_symbol); + fontface->has_kerning_pairs = freetype_has_kerning_pairs(&fontface->IDWriteFontFace2_iface); + fontface->is_monospaced = freetype_is_monospaced(&fontface->IDWriteFontFace2_iface); *ret = &fontface->IDWriteFontFace2_iface; return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index f4b824c..ba946a8 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -263,7 +263,7 @@ BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface) EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) - is_monospaced = FT_IS_FIXED_WIDTH(face); + is_monospaced = !!FT_IS_FIXED_WIDTH(face); LeaveCriticalSection(&freetype_cs); return is_monospaced; @@ -520,7 +520,7 @@ BOOL freetype_has_kerning_pairs(IDWriteFontFace2 *fontface) EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) - has_kerning_pairs = FT_HAS_KERNING(face); + has_kerning_pairs = !!FT_HAS_KERNING(face); LeaveCriticalSection(&freetype_cs); return has_kerning_pairs;

1 0

Sebastian Lackner : oleaut32: Fix invalid memory access on 64-bit when warn+heap is used.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: ed16704ceab9057df726f64b50b224140e5dfeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed16704ceab9057df726f64b5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 22 07:03:08 2016 +0100 oleaut32: Fix invalid memory access on 64-bit when warn+heap is used. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 00e6daf..93c5fd3 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -309,7 +309,7 @@ void WINAPI SysFreeString(BSTR str) cache_entry->cnt++; if(WARN_ON(heap)) { - unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + unsigned n = (alloc_size-FIELD_OFFSET(bstr_t, u.ptr))/sizeof(DWORD); for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER; }

1 0

Sebastian Lackner : server: Fix invalid memory accesss caused by destroying winstation before desktop.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Module: wine Branch: master Commit: df398308463357e557bd4356b1bc5240690cc0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df398308463357e557bd4356b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 22 07:01:29 2016 +0100 server: Fix invalid memory accesss caused by destroying winstation before desktop. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/winstation.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/winstation.c b/server/winstation.c index 62d780f..ece65c3 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -253,6 +253,7 @@ static void desktop_destroy( struct object *obj ) if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); + unlink_named_object( obj ); release_object( desktop->winstation ); }

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 8676f7bae099f0ca20c26a29dfa4bebd828b39b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8676f7bae099f0ca20c26a29d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:28:00 2016 +0100 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 189 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f99705e..8394f7a 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -449,6 +449,193 @@ static void test_WsWriteStartAttribute(void) WsFreeWriter( writer ); } +static void test_WsWriteType(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; + const WCHAR *val_str; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* required value */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, NULL, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, testW, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* required pointer */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, NULL, sizeof(val_str), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(WCHAR **), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str p:str=\"test\" xmlns:p=\"ns\"/>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + + WsFreeWriter( writer ); +} + +static void test_basic_type(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + ULONG i; + static const struct + { + WS_TYPE type; + INT64 val; + ULONG size; + const char *result; + const char *result2; + } + tests[] = + { + { WS_BOOL_TYPE, TRUE, sizeof(BOOL), "<t>true</t>", "<t t=\"true\"/>" }, + { WS_BOOL_TYPE, FALSE, sizeof(BOOL), "<t>false</t>", "<t t=\"false\"/>" }, + { WS_INT8_TYPE, -128, sizeof(INT8), "<t>-128</t>", "<t t=\"-128\"/>" }, + { WS_INT16_TYPE, -32768, sizeof(INT16), "<t>-32768</t>", "<t t=\"-32768\"/>" }, + { WS_INT32_TYPE, -2147483647 - 1, sizeof(INT32), "<t>-2147483648</t>", + "<t t=\"-2147483648\"/>" }, + { WS_INT64_TYPE, -9223372036854775807 - 1, sizeof(INT64), "<t>-9223372036854775808</t>", + "<t t=\"-9223372036854775808\"/>" }, + { WS_UINT8_TYPE, 255, sizeof(UINT8), "<t>255</t>", "<t t=\"255\"/>" }, + { WS_UINT16_TYPE, 65535, sizeof(UINT16), "<t>65535</t>", "<t t=\"65535\"/>" }, + { WS_UINT32_TYPE, ~0u, sizeof(UINT32), "<t>4294967295</t>", "<t t=\"4294967295\"/>" }, + { WS_UINT64_TYPE, ~0, sizeof(UINT64), "<t>18446744073709551615</t>", + "<t t=\"18446744073709551615\"/>" }, + }; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* element content type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* element type mapping is the same as element content type mapping for basic types */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* attribute type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result2, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -457,4 +644,6 @@ START_TEST(writer) test_WsSetOutputToBuffer(); test_WsWriteStartElement(); test_WsWriteStartAttribute(); + test_WsWriteType(); + test_basic_type(); }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016