- Wine-Devel - list.winehq.org

[PATCH] mfmediaengine: Use CRT function for heap allocations.
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4464b525a4d..a606ce364af 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -30,7 +30,6 @@ #include "dxgi.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -52,7 +51,7 @@ static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, si if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; @@ -189,7 +188,7 @@ static ULONG WINAPI media_error_Release(IMFMediaError *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - heap_free(me); + free(me); return refcount; } @@ -250,7 +249,7 @@ static HRESULT create_media_error(IMFMediaError **ret) *ret = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaError_iface.lpVtbl = &media_error_vtbl; @@ -297,8 +296,8 @@ static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) if (!refcount) { - heap_free(range->ranges); - heap_free(range); + free(range->ranges); + free(range); } return refcount; @@ -407,7 +406,7 @@ static HRESULT create_time_range(IMFMediaTimeRange **range) { struct time_range *object; - object = heap_alloc_zero(sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -977,7 +976,7 @@ static void free_media_engine(struct media_engine *engine) IMFSourceResolver_Release(engine->resolver); SysFreeString(engine->current_source); DeleteCriticalSection(&engine->cs); - heap_free(engine); + free(engine); } static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) @@ -1919,7 +1918,7 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac if (!attributes || !engine) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; -- 2.30.2

1 0

[PATCH] evr: Use CRT functions for heap allocations.
by Nikolay Sivov April 8, 2021

April 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 9 ++++----- dlls/evr/presenter.c | 7 +++---- dlls/evr/sample.c | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c59ec002340..03e2d166155 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -31,7 +31,6 @@ #include "evcode.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -200,7 +199,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) { IMFMediaType_Release(mixer->output.rt_formats[i].media_type); } - heap_free(mixer->output.rt_formats); + free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; @@ -668,7 +667,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (SUCCEEDED(IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(service, &devices[i], video_desc, &format_count, &formats))) { - if (!(ptr = heap_realloc(rt_formats, (count + format_count) * sizeof(*rt_formats)))) + if (!(ptr = realloc(rt_formats, (count + format_count) * sizeof(*rt_formats)))) { hr = E_OUTOFMEMORY; count = 0; @@ -703,7 +702,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const count = j + 1; memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - if ((mixer->output.rt_formats = heap_calloc(count, sizeof(*mixer->output.rt_formats)))) + if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { for (i = 0; i < count; ++i) { @@ -727,7 +726,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const } } - heap_free(rt_formats); + free(rt_formats); return count ? S_OK : hr; } diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9b7fb5f6f67..8d633124db2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -28,7 +28,6 @@ #include "evr_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -369,7 +368,7 @@ static void video_presenter_sample_queue_init(struct video_presenter *presenter) return; memset(queue, 0, sizeof(*queue)); - queue->samples = heap_calloc(presenter->allocator_capacity, sizeof(*queue->samples)); + queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)); queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; } @@ -836,7 +835,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) } if (presenter->allocator) IMFVideoSampleAllocator_Release(presenter->allocator); - heap_free(presenter); + free(presenter); } return refcount; @@ -1929,7 +1928,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) *out = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 9c76011f153..cbba384e181 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -25,7 +25,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -168,7 +167,7 @@ static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface) IUnknown_Release(result->object); if (result->state) IUnknown_Release(result->state); - heap_free(result); + free(result); } return refcount; @@ -250,7 +249,7 @@ static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, { struct tracked_async_result *result; - result = heap_alloc_zero(sizeof(*result)); + result = calloc(1, sizeof(*result)); if (!result) return E_OUTOFMEMORY; @@ -464,13 +463,13 @@ static void sample_allocator_release_samples(struct sample_allocator *allocator) { list_remove(&iter->entry); IMFSample_Release(iter->sample); - heap_free(iter); + free(iter); } LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &allocator->used_samples, struct queued_sample, entry) { list_remove(&iter->entry); - heap_free(iter); + free(iter); } } @@ -489,7 +488,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) IDirect3DDeviceManager9_Release(allocator->device_manager); sample_allocator_release_samples(allocator); DeleteCriticalSection(&allocator->cs); - heap_free(allocator); + free(allocator); } return refcount; @@ -618,7 +617,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato break; } - queued_sample = heap_alloc(sizeof(*queued_sample)); + queued_sample = malloc(sizeof(*queued_sample)); queued_sample->sample = sample; list_add_tail(&allocator->free_samples, &queued_sample->entry); allocator->free_sample_count++; @@ -860,7 +859,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoSampleAllocator_iface.lpVtbl = &sample_allocator_vtbl; @@ -943,7 +942,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) if (sample->sample) IMFSample_Release(sample->sample); DeleteCriticalSection(&sample->cs); - heap_free(sample); + free(sample); } return refcount; @@ -1601,7 +1600,7 @@ static ULONG WINAPI surface_buffer_Release(IMFMediaBuffer *iface) if (!refcount) { IUnknown_Release(buffer->surface); - heap_free(buffer); + free(buffer); } return refcount; @@ -1704,7 +1703,7 @@ static HRESULT create_surface_buffer(IUnknown *surface, IMFMediaBuffer **buffer) { struct surface_buffer *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaBuffer_iface.lpVtbl = &surface_buffer_vtbl; @@ -1726,7 +1725,7 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam TRACE("%p, %p.\n", surface, sample); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFSample_iface.lpVtbl = &video_sample_vtbl; @@ -1737,7 +1736,7 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam if (FAILED(hr = MFCreateSample(&object->sample))) { - heap_free(object); + free(object); return hr; } -- 2.30.2

1 0

[PATCH] ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Zebediah Figura April 8, 2021

April 8, 2021

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/system.c | 15 +++++++++++++++ include/winternl.h | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2b316095f4a..d3e380b8c32 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2827,6 +2827,21 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCodeIntegrityInformation: + { + SYSTEM_CODEINTEGRITY_INFORMATION *integrity_info = info; + + FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", size, info); + + len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); + + if (size < len) + integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h index 298ebbc2d36..7632cfcb999 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1698,6 +1698,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { #endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION +{ + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#define CODEINTEGRITY_OPTION_ENABLED 0x0001 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x0002 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x0004 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x0008 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x0010 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x0020 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x0040 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x0080 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x0100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x0200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x0400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x0800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes, -- 2.30.2

2 1

[PATCH 1/5] winedevice: Add a missing break statement to device_handler().
by Zebediah Figura April 8, 2021

April 8, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedevice/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 509cab96308..07a76b911e9 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -83,6 +83,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) case SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES: wine_enumerate_root_devices( driver_name ); + break; default: FIXME( "got driver ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); -- 2.30.2

2 6

[PATCH v2 1/5] winedevice: Add a missing break statement to device_handler().
by Zebediah Figura April 8, 2021

April 8, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedevice/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 509cab96308..07a76b911e9 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -83,6 +83,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) case SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES: wine_enumerate_root_devices( driver_name ); + break; default: FIXME( "got driver ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); -- 2.30.2

1 4

[PATCH v2 1/3] api-ms-win-shcore-scaling-l1-1-1: Hook up GetScaleFactorForDevice to shcore
by Joshua Ashton April 7, 2021

April 7, 2021

Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 9ebda5164c1..bc0b555de9f 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,6 +1,6 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) shcore.GetScaleFactorForDevice @ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications -- 2.31.1

1 2

[PATCH 1/2] api-ms-win-shcore-scaling-l1-1-1: Hook up GetScaleFactorForDevice to shcore
by Joshua Ashton April 7, 2021

April 7, 2021

Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 9ebda5164c1..bc0b555de9f 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,6 +1,6 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) shcore.GetScaleFactorForDevice @ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications -- 2.31.1

2 3

[PATCH 01/11] dhtmled.ocx: Add IConnectionPointContainer stub interface.
by Vijay Kiran Kamuju April 7, 2021

April 7, 2021

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/edit.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index fc518de7323..7772ec1538b 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -31,6 +31,7 @@ typedef struct IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; + IConnectionPointContainer IConnectionPointContainer_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -56,6 +57,11 @@ static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); } +static inline DHTMLEditImpl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IConnectionPointContainer_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -95,6 +101,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleControl_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IConnectionPointContainer)) + { + dhtml_edit_addref(This); + *out = &This->IConnectionPointContainer_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -923,6 +935,47 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IConnectionPointContainer(iface), iid, out); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return dhtml_edit_addref(impl_from_IConnectionPointContainer(iface)); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return dhtml_edit_release(impl_from_IConnectionPointContainer(iface)); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return CONNECT_E_NOCONNECTION; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -940,6 +993,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; + This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

2 20

[PATCH v2 09/11] dhtmled.ocx: Add IDispatch support for IDHTMLEdit.
by Vijay Kiran Kamuju April 7, 2021

April 7, 2021

This makes RSSedit to work, no error dialog is shown. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/dhtmled_private.h | 1 + dlls/dhtmled.ocx/edit.c | 112 ++++++++++++++++++++++++++--- dlls/dhtmled.ocx/main.c | 3 + 4 files changed, 108 insertions(+), 10 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index bbe397dc401..47d57f5b1f9 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid ole32 user32 gdi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/dhtmled_private.h b/dlls/dhtmled.ocx/dhtmled_private.h index 5a9e89b9977..763f1f4fd1b 100644 --- a/dlls/dhtmled.ocx/dhtmled_private.h +++ b/dlls/dhtmled.ocx/dhtmled_private.h @@ -17,3 +17,4 @@ */ extern HRESULT dhtml_edit_create(REFIID iid, void **out); +void release_typelib(void); diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index b96630c73e5..4d39f247be0 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -25,6 +25,78 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); +typedef enum tid_t { + NULL_tid, + IDHTMLEdit_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IDHTMLEdit +}; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_DHTMLEDLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + typedef struct { IDHTMLEdit IDHTMLEdit_iface; @@ -239,33 +311,55 @@ static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%p) stub\n", This, count); - *count = 0; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, count); + *count = 1; + return S_OK; } static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index, LCID lcid, ITypeInfo **type_info) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%u, %08x, %p) stub\n", This, type_index, lcid, type_info); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%u, %08x, %p)\n", This, type_index, lcid, type_info); + + hr = get_typeinfo(IDHTMLEdit_tid, type_info); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*type_info); + return hr; } static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLECHAR **names, UINT name_count, LCID lcid, DISPID *disp_ids) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%s, %p, %u, %08x, %p) stub\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %u, %08x, %p)\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_GetIDsOfNames(ti, names, name_count, disp_ids); } static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID iid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *ret, EXCEPINFO *exception_info, UINT *error_index) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p) stub\n", + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p)\n", This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index); - return E_NOTIMPL; + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_Invoke(ti, iface, member, flags, params, ret, exception_info, error_index); } static HRESULT WINAPI DHTMLEdit_ExecCommand(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, OLECMDEXECOPT options, diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c index b7409cf61a5..e4be35dd14b 100644 --- a/dlls/dhtmled.ocx/main.c +++ b/dlls/dhtmled.ocx/main.c @@ -107,6 +107,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved) DisableThreadLibraryCalls(instance); dhtmled_instance = instance; break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; -- 2.31.1

1 2

[PATCH] advapi32/tests: Use wide character string literals in registry.c.
by Giovanni Mascellani April 7, 2021

April 7, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 120 +++++++++++++++------------------ 1 file changed, 53 insertions(+), 67 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index dfadd13ea8c..534982565d9 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -248,12 +248,12 @@ static void test_set_value(void) { DWORD ret; - static const WCHAR name1W[] = {'C','l','e','a','n','S','i','n','g','l','e','S','t','r','i','n','g', 0}; - static const WCHAR name2W[] = {'S','o','m','e','I','n','t','r','a','Z','e','r','o','e','d','S','t','r','i','n','g', 0}; - static const WCHAR emptyW[] = {0}; - static const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; - static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 'L','o','t', 0 , 0 , 0 , 0, 0}; - static const WCHAR substring2W[] = {'T','h','i','s',0}; + static const WCHAR name1W[] = L"CleanSingleString"; + static const WCHAR name2W[] = L"SomeIntraZeroedString"; + static const WCHAR emptyW[] = L""; + static const WCHAR string1W[] = L"ThisNeverBreaks"; + static const WCHAR string2W[] = L"This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; + static const WCHAR substring2W[] = L"This"; static const char name1A[] = "CleanSingleString"; static const char name2A[] = "SomeIntraZeroedString"; @@ -412,7 +412,6 @@ static void test_set_value(void) win_skip("RegSetKeyValue() is not supported.\n"); else { - static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; DWORD len, type; HKEY subkey; @@ -421,10 +420,10 @@ static void test_set_value(void) test_hkey_main_Value_A(name1A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name1W, string2W, sizeof(string2W)); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, string1W, sizeof(string1W)); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ret = RegOpenKeyExW(hkey_main, subkeyW, 0, KEY_QUERY_VALUE, &subkey); + ret = RegOpenKeyExW(hkey_main, L"subkey", 0, KEY_QUERY_VALUE, &subkey); ok(ret == ERROR_SUCCESS, "got %d\n", ret); type = len = 0; ret = RegQueryValueExW(subkey, name1W, 0, &type, NULL, &len); @@ -432,13 +431,13 @@ static void test_set_value(void) ok(len == sizeof(string1W), "got %d\n", len); ok(type == REG_SZ, "got type %d\n", type); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, NULL, 0); ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 4); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, NULL, 4); ok(ret == ERROR_NOACCESS, "got %d\n", ret); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_DWORD, NULL, 4); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_DWORD, NULL, 4); ok(ret == ERROR_NOACCESS, "got %d\n", ret); RegCloseKey(subkey); @@ -475,9 +474,6 @@ static void test_enum_value(void) char value[20], data[20]; WCHAR valueW[20], dataW[20]; DWORD val_count, data_count, type; - static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; - static const WCHAR testW[] = {'T','e','s','t',0}; - static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -511,15 +507,15 @@ static void test_enum_value(void) val_count = 20; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data is not 'xxxxxxxx'\n" ); res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res ); @@ -628,7 +624,7 @@ static void test_enum_value(void) /* Unicode tests */ SetLastError(0xdeadbeef); - res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)foobarW, 7*sizeof(WCHAR) ); + res = RegSetValueExW( test_key, L"Test", 0, REG_SZ, (const BYTE *)L"foobar", 7*sizeof(WCHAR) ); if (res==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("RegSetValueExW is not implemented\n"); @@ -640,64 +636,64 @@ static void test_enum_value(void) val_count = 2; data_count = 2; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"xxxxxxxx" ), "value modified\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* overflow name */ val_count = 3; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"xxxxxxxx" ), "value modified\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* overflow data */ val_count = 20; data_count = 2; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* no overflow */ val_count = 20; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"foobar" ), "data is not 'foobar'\n" ); if (pRegGetValueA) /* avoid a crash on Windows 2000 */ { /* no valueW and no val_count parameter */ data_count = 20; type = 1234; - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); @@ -705,15 +701,15 @@ static void test_enum_value(void) val_count = 20; data_count = 20; type = 1234; - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); /* no val_count parameter */ data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, NULL, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); } @@ -1660,8 +1656,6 @@ static void test_reg_query_value(void) WCHAR valW[5]; LONG size, ret; - static const WCHAR expected[] = {'d','a','t','a',0}; - ret = RegCreateKeyA(hkey_main, "subkey", &subkey); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -1741,7 +1735,7 @@ static void test_reg_query_value(void) ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(!valW[0], "Expected valW to be untouched\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - try size in WCHARS */ SetLastError(0xdeadbeef); @@ -1750,17 +1744,17 @@ static void test_reg_query_value(void) ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(!valW[0], "Expected valW to be untouched\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - successfully read the value */ size = sizeof(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!lstrcmpW(valW, expected), "Got wrong value\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(!lstrcmpW(valW, L"data"), "Got wrong value\n"); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - set the value without a NULL terminator */ - ret = RegSetValueW(subkey, NULL, REG_SZ, expected, sizeof(expected)-sizeof(WCHAR)); + ret = RegSetValueW(subkey, NULL, REG_SZ, L"data", 8); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* unicode - read the unterminated value, value is terminated for us */ @@ -1768,8 +1762,8 @@ static void test_reg_query_value(void) size = sizeof(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!lstrcmpW(valW, expected), "Got wrong value\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(!lstrcmpW(valW, L"data"), "Got wrong value\n"); + ok(size == 10, "Got wrong size: %d\n", size); cleanup: RegDeleteKeyA(subkey, ""); @@ -1786,7 +1780,7 @@ static void test_reg_query_info(void) char expectbuffer[32]; WCHAR expectbufferW[32]; char subkey_class[] = "subkey class"; - WCHAR subkey_classW[] = {'s','u','b','k','e','y',' ','c','l','a','s','s',0}; + WCHAR subkey_classW[] = L"subkey class"; char subsubkey_class[] = "subsubkey class"; DWORD classlen; DWORD subkeys, maxsubkeylen, maxclasslen; @@ -2330,8 +2324,7 @@ static void test_rw_order(void) static void test_symlinks(void) { - static const WCHAR targetW[] = {'\\','S','o','f','t','w','a','r','e','\\','W','i','n','e', - '\\','T','e','s','t','\\','t','a','r','g','e','t',0}; + static const WCHAR targetW[] = L"\\Software\\Wine\\Test\\target"; BYTE buffer[1024]; UNICODE_STRING target_str; WCHAR *target; @@ -3613,8 +3606,6 @@ static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, in static void test_RegQueryValueExPerformanceData(void) { - static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; - static const WCHAR dummyW[5] = { 'd','u','m','m','y' }; static const char * const names[] = { NULL, "", "Global", "2", "invalid counter name" }; DWORD cbData, len, i, type; BYTE *value; @@ -3628,7 +3619,7 @@ static void test_RegQueryValueExPerformanceData(void) dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); + dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, L"Global", NULL, NULL, NULL, &cbData ); ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); /* Test ERROR_MORE_DATA, start with small buffer */ @@ -3809,7 +3800,7 @@ todo_wine if (pRegSetKeyValueW) { - dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, globalW, REG_SZ, dummyW, sizeof(dummyW)); + dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); todo_wine ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); } @@ -3831,7 +3822,7 @@ static void test_RegLoadMUIString(void) WCHAR textW[64], bufW[64]; WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; const static char tz_value[] = "MUI_Std"; - const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + const static WCHAR tz_valueW[] = L"MUI_Std"; struct { const char* value; DWORD type; @@ -4026,11 +4017,6 @@ static void test_EnumDynamicTimeZoneInformation(void) WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; - static const WCHAR stdW[] = {'S','t','d',0}; - static const WCHAR dltW[] = {'D','l','t',0}; - static const WCHAR tziW[] = {'T','Z','I',0}; - static const WCHAR mui_stdW[] = {'M','U','I','_','S','t','d',0}; - static const WCHAR mui_dltW[] = {'M','U','I','_','D','l','t',0}; struct tz_reg_data { LONG bias; @@ -4093,9 +4079,9 @@ static void test_EnumDynamicTimeZoneInformation(void) size = sizeof(name); memset(name, 0, sizeof(name)); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, mui_stdW, name, size, &size, 0, sysdir); + status = pRegLoadMUIStringW(subkey, L"MUI_Std", name, size, &size, 0, sysdir); else - status = pRegGetValueW(subkey, NULL, stdW, RRF_RT_REG_SZ, NULL, name, &size); + status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.StandardName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); @@ -4103,9 +4089,9 @@ static void test_EnumDynamicTimeZoneInformation(void) size = sizeof(name); memset(name, 0, sizeof(name)); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, mui_dltW, name, size, &size, 0, sysdir); + status = pRegLoadMUIStringW(subkey, L"MUI_Dlt", name, size, &size, 0, sysdir); else - status = pRegGetValueW(subkey, NULL, dltW, RRF_RT_REG_SZ, NULL, name, &size); + status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); @@ -4119,7 +4105,7 @@ static void test_EnumDynamicTimeZoneInformation(void) ok(!dtzi.DynamicDaylightTimeDisabled, "got %d\n", dtzi.DynamicDaylightTimeDisabled); size = sizeof(tz_data); - status = pRegGetValueW(key, keyname, tziW, RRF_RT_REG_BINARY, NULL, &tz_data, &size); + status = pRegGetValueW(key, keyname, L"TZI", RRF_RT_REG_BINARY, NULL, &tz_data, &size); ok(status == ERROR_SUCCESS, "got %d\n", status); ok(dtzi.Bias == tz_data.bias, "expected %d, got %d\n", -- 2.31.0

1 0