November 2016 - Wine-commits

Alex Henrie : winegstreamer: Fix memory leaks in amt_from_gst_caps_video.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 8d4c7245939136f8a151fab5985957d37caaba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4c7245939136f8a151fab59… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 22:41:49 2016 -0700 winegstreamer: Fix memory leaks in amt_from_gst_caps_video. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a6a41ab..892385f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -179,8 +179,8 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) { - VIDEOINFOHEADER *vih = CoTaskMemAlloc(sizeof(*vih)); - BITMAPINFOHEADER *bih = &vih->bmiHeader; + VIDEOINFOHEADER *vih; + BITMAPINFOHEADER *bih; gint32 width = 0, height = 0, nom = 0, denom = 0; GstVideoInfo vinfo; @@ -191,6 +191,9 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) nom = vinfo.fps_n; denom = vinfo.fps_d; + vih = CoTaskMemAlloc(sizeof(*vih)); + bih = &vih->bmiHeader; + amt->formattype = FORMAT_VideoInfo; amt->pbFormat = (BYTE*)vih; amt->cbFormat = sizeof(*vih); @@ -207,13 +210,16 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; default: FIXME("Unknown bpp %u\n", bih->biBitCount); + CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; - if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) + if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { + CoTaskMemFree(vih); return FALSE; + } switch (amt->subtype.Data1) { case mmioFOURCC('I','4','2','0'): case mmioFOURCC('Y','V','1','2'): @@ -269,7 +275,8 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) return FALSE; } ret = amt_from_gst_caps_video(caps, &amt); - FreeMediaType(&amt); + if (ret) + FreeMediaType(&amt); TRACE("-%i\n", ret); return ret; } else {

1 0

Alex Henrie : winegstreamer: If no audio media type was allocated, don' t free it.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 474d5be546811f0d1b885976480bd03bd338d61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=474d5be546811f0d1b8859764… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 15 22:41:50 2016 -0700 winegstreamer: If no audio media type was allocated, don't free it. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 892385f..65366ce 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -266,7 +266,8 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) return FALSE; } ret = amt_from_gst_caps_audio(caps, &amt); - FreeMediaType(&amt); + if (ret) + FreeMediaType(&amt); TRACE("+%i\n", ret); return ret; } else if (!strcmp(typename, "video/x-raw")) {

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.TotalVirtualMemorySize.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 710abd65bb600ada14b90d570fbb83f1ce9c187b URL: http://source.winehq.org/git/wine.git/?a=commit;h=710abd65bb600ada14b90d570… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 10:01:53 2016 -0600 wbemprox: Implement Win32_OperatingSystem.TotalVirtualMemorySize. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 7 ++++++- dlls/wbemprox/tests/query.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ee47cc7..7513347 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -342,6 +342,8 @@ static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR prop_totalvirtualmemorysizeW[] = + {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_typeW[] = @@ -517,6 +519,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -899,6 +902,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; }; @@ -2763,7 +2767,8 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); - rec->totalvisiblememorysize = get_total_physical_memory() / 1024; + rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; + rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 2513807..5529fe0 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1066,6 +1066,10 @@ static void test_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR totalvisiblememorysizeW[] = + {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR totalvirtualmemorysizeW[] = + {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; IWbemClassObject *obj; @@ -1170,6 +1174,24 @@ static void test_OperatingSystem( IWbemServices *services ) trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, totalvisiblememorysizeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get visible memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "totalvisiblememorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, totalvirtualmemorysizeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get virtual memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Hans Leidekker : wbemprox: Implement Win32_PhysicalMemory.MemoryType.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: b05928aae0faebb6d7de92392a85abddcc7c65d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05928aae0faebb6d7de92392… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 10:02:07 2016 -0600 wbemprox: Implement Win32_PhysicalMemory.MemoryType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 9 ++++-- dlls/wbemprox/tests/query.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7513347..718b818 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -252,6 +252,8 @@ static const WCHAR prop_mediatypeW[] = {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; +static const WCHAR prop_memorytypeW[] = + {'M','e','m','o','r','y','T','y','p','e',0}; static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = @@ -540,7 +542,8 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 } + { prop_capacityW, CIM_UINT64 }, + { prop_memorytypeW, CIM_UINT16, VT_I4 } }; static const struct column col_printer[] = { @@ -924,6 +927,7 @@ struct record_physicalmedia struct record_physicalmemory { UINT64 capacity; + UINT16 memorytype; }; struct record_printer { @@ -2303,7 +2307,8 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; - rec->capacity = get_total_physical_memory(); + rec->capacity = get_total_physical_memory(); + rec->memorytype = 9; /* RAM */ if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5529fe0..1aeb7e5 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -482,9 +482,11 @@ static void test_Win32_Process( IWbemServices *services ) static void test_Win32_ComputerSystem( IWbemServices *services ) { + static const WCHAR backslashW[] = {'\\',0}; + static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR modelW[] = {'M','o','d','e','l',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; - static const WCHAR backslashW[] = {'\\',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; @@ -526,6 +528,20 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); + hr = IWbemClassObject_Get( service, memorytypeW, 0, &value, &type, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, modelW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get model %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "model: %s\n", wine_dbgstr_w(V_BSTR( &value )) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); hr = IWbemClassObject_Get( service, nameW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); @@ -1206,7 +1222,7 @@ static void test_ComputerSystemProduct( IWbemServices *services ) 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; - IWbemClassObject *service; + IWbemClassObject *obj; VARIANT value; CIMTYPE type; HRESULT hr; @@ -1219,24 +1235,72 @@ static void test_ComputerSystemProduct( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, uuidW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, uuidW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); VariantClear( &value ); - IWbemClassObject_Release( service ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } +static void test_PhysicalMemory( IWbemServices *services ) +{ + static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; + static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_PhysicalMemory not available\n" ); + return; + } + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get capacity %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get memory type %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "memorytype %u\n", V_I4( &val ) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1276,6 +1340,7 @@ START_TEST(query) test_SystemSecurity( services ); test_OperatingSystem( services ); test_ComputerSystemProduct( services ); + test_PhysicalMemory( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Nikolay Sivov : oledb32: Implement GetCustomErrorObject().
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 333039f318168a7c40c20d6357a4f69899146399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333039f318168a7c40c20d635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:49 2016 +0300 oledb32: Implement GetCustomErrorObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 26 +++++++++++++++----------- dlls/oledb32/tests/database.c | 6 ++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 7a1eddf..48db723 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -42,7 +42,7 @@ struct ErrorEntry { ERRORINFO info; DISPPARAMS dispparams; - IUnknown *unknown; + IUnknown *custom_error; DWORD lookupID; }; @@ -113,8 +113,8 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) for (i = 0; i < This->count; i++) { - if (This->records[i].unknown) - IUnknown_Release(This->records[i].unknown); + if (This->records[i].custom_error) + IUnknown_Release(This->records[i].custom_error); } heap_free(This->records); heap_free(This); @@ -257,9 +257,9 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p entry->info = *pErrorInfo; if(pdispparams) entry->dispparams = *pdispparams; - entry->unknown = punkCustomError; - if(entry->unknown) - IUnknown_AddRef(entry->unknown); + entry->custom_error = punkCustomError; + if (entry->custom_error) + IUnknown_AddRef(entry->custom_error); entry->lookupID = dwDynamicErrorID; This->count++; @@ -283,21 +283,25 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind } static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, - REFIID riid, IUnknown **ppObject) + REFIID riid, IUnknown **object) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %s, %p)\n", This, index, debugstr_guid(riid), ppObject); + TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); - if (!ppObject) + if (!object) return E_INVALIDARG; - *ppObject = NULL; + *object = NULL; if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + index = This->count - index - 1; + if (This->records[index].custom_error) + return IUnknown_QueryInterface(This->records[index].custom_error, riid, (void **)object); + else + return S_OK; } static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 68f9eac..980dacd 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -414,6 +414,12 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); ok(cnt == 1, "expected 1 got %d\n", cnt); + /* Record does not contain custom error object. */ + unk2 = (void*)0xdeadbeef; + hr = IErrorRecords_GetCustomErrorObject(errrecs, 0, &IID_IUnknown, &unk2); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk2 == NULL, "Got custom object %p.\n", unk2); + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : oledb32: Implement GetBasicErrorInfo().
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 3fdfea778638f85184f2b069db108c81be3c6cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fdfea778638f85184f2b069d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:50 2016 +0300 oledb32: Implement GetBasicErrorInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 10 ++++++---- dlls/oledb32/tests/database.c | 7 ++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 48db723..dd39173 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -267,19 +267,21 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p return S_OK; } -static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *pErrorInfo) +static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *info) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %p)\n", This, index, pErrorInfo); + TRACE("(%p)->(%u %p)\n", This, index, info); - if(!pErrorInfo) + if (!info) return E_INVALIDARG; if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + index = This->count - index - 1; + *info = This->records[index].info; + return S_OK; } static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 980dacd..b45ef4d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -434,11 +434,8 @@ static void test_errorinfo(void) ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); - } + ok(hr == S_OK, "got %08x\n", hr); + ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); IErrorRecords_Release(errrecs); IUnknown_Release(unk);

1 0

Piotr Caban : msvcrt: Improve multibyte characters support in printf.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 1680e984277097b5cbd1c5abf79e2d6411bb6cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1680e984277097b5cbd1c5abf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 13:36:44 2016 -0600 msvcrt: Improve multibyte characters support in printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 12 +++++++----- dlls/msvcrt/tests/printf.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 6c9eeeb..392ead8 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -122,13 +122,18 @@ static inline int FUNC_NAME(pf_output_wstr)(FUNC_NAME(puts_clbk) pf_puts, void * return pf_puts(puts_ctx, len, str); #else LPSTR out; - int len_a = WideCharToMultiByte(locinfo->lc_codepage, 0, str, len, NULL, 0, NULL, NULL); + BOOL def_char; + int len_a = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + str, len, NULL, 0, NULL, &def_char); + if(def_char) + return 0; out = HeapAlloc(GetProcessHeap(), 0, len_a); if(!out) return -1; - WideCharToMultiByte(locinfo->lc_codepage, 0, str, len, out, len_a, NULL, NULL); + WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + str, len, out, len_a, NULL, NULL); len = pf_puts(puts_ctx, len_a, out); HeapFree(GetProcessHeap(), 0, out); return len; @@ -495,9 +500,6 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(flags.Format == 'c' || flags.Format == 'C') { int ch = pf_args(args_ctx, pos, VT_INT, valist).get_int; - if((ch&0xff) != ch) - FIXME("multibyte characters printing not supported\n"); - i = FUNC_NAME(pf_handle_string)(pf_puts, puts_ctx, &ch, 1, &flags, locinfo, legacy_wide); } else if(flags.Format == 'p') { flags.Format = 'X'; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 295c6dd..f9b3fc9 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <errno.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -768,6 +769,39 @@ static void test_sprintf( void ) r = sprintf(buffer, format, INFINITY); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); + + format = "%c"; + r = sprintf(buffer, format, 'a'); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "a"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, 0xa082); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "\x82"), "failed: \"%s\"\n", buffer); + + format = "%C"; + r = sprintf(buffer, format, 'a'); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "a"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, 0x3042); + ok(r==0, "r = %d\n", r); + ok(!strcmp(buffer, ""), "failed: \"%s\"\n", buffer); + + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + + format = "%c"; + r = sprintf(buffer, format, 0xa082); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "\x82"), "failed: \"%s\"\n", buffer); + + format = "%C"; + r = sprintf(buffer, format, 0x3042); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "\x82\xa0"), "failed: \"%s\"\n", buffer); + + setlocale(LC_ALL, "C"); } static void test_swprintf( void ) @@ -911,7 +945,7 @@ static void test_fcvt(void) { char *str; int dec=100, sign=100; - + /* Numbers less than 1.0 with different precisions */ str = _fcvt(0.0001, 1, &dec, &sign ); ok( 0 == strcmp(str,""), "bad return '%s'\n", str);

1 0

Piotr Caban : vcruntime140: Add __std_terminate implementation.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 08324e31e79c5d2c32392250659b6be500a5b408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08324e31e79c5d2c323922506… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 13:56:35 2016 -0600 vcruntime140: Add __std_terminate implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/vcruntime140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index ca9368c..b91d976 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -38,7 +38,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy -@ stub __std_terminate +@ cdecl __std_terminate() ucrtbase.terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash

1 0

Jacek Caban : advapi32/tests: Added TokenIsAppContainer tests.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: bf1537da8b64056a0d376cc043e3cc8b52099448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1537da8b64056a0d376cc04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 14:21:20 2016 -0600 advapi32/tests: Added TokenIsAppContainer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cf104ab..b28ffaf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1912,6 +1912,31 @@ static void test_token_attr(void) CloseHandle(Token); } +static void test_GetTokenInformation(void) +{ + DWORD is_app_container, size; + HANDLE token; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed: %u\n", GetLastError()); + + size = 0; + is_app_container = 0xdeadbeef; + ret = GetTokenInformation(token, TokenIsAppContainer, &is_app_container, + sizeof(is_app_container), &size); + todo_wine + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_FUNCTION), /* pre-win8 */ + "GetTokenInformation failed: %u\n", GetLastError()); + if(ret) { + ok(size == sizeof(is_app_container), "size = %u\n", size); + ok(!is_app_container, "is_app_container = %x\n", is_app_container); + } + + CloseHandle(token); +} + typedef union _MAX_SID { SID sid; @@ -6396,6 +6421,7 @@ START_TEST(security) test_FileSecurity(); test_AccessCheck(); test_token_attr(); + test_GetTokenInformation(); test_LookupAccountSid(); test_LookupAccountName(); test_security_descriptor();

1 0

Jacek Caban : ntdll: Added TokenIsAppContainer semi-stub implementation.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 2f1d068abd32d1c96adadfab311b431e385b2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1d068abd32d1c96adadfab3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 14:21:35 2016 -0600 ntdll: Added TokenIsAppContainer semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 - dlls/ntdll/nt.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b28ffaf..18f4e04 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1925,7 +1925,6 @@ static void test_GetTokenInformation(void) is_app_container = 0xdeadbeef; ret = GetTokenInformation(token, TokenIsAppContainer, &is_app_container, sizeof(is_app_container), &size); - todo_wine ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_FUNCTION), /* pre-win8 */ "GetTokenInformation failed: %u\n", GetLastError()); diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index e0f6df0..7be2a07 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -280,7 +280,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ 0, /* TokenLogonSid */ - 0, /* TokenIsAppContainer */ + sizeof(DWORD), /* TokenIsAppContainer */ 0, /* TokenCapabilities */ sizeof(TOKEN_APPCONTAINER_INFORMATION) + sizeof(SID), /* TokenAppContainerSid */ 0, /* TokenAppContainerNumber */ @@ -541,6 +541,12 @@ NTSTATUS WINAPI NtQueryInformationToken( container->TokenAppContainer = NULL; } break; + case TokenIsAppContainer: + { + TRACE("TokenIsAppContainer semi-stub\n"); + *(DWORD*)tokeninfo = 0; + break; + } default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0