- wine-devel - winehq.org

[PATCH 1/4] server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value.
by Dmitry Timoshkov 06 May '20

06 May '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/mapping.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 6990a1913d..ea2cd55513 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -592,11 +592,12 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + /* zero out Optional header in the case it's not present or partial */ + memset( &nt, 0, sizeof(nt) ); + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; - /* zero out Optional header in the case it's not present or partial */ - size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader ); - if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); + if (nt.Signature != IMAGE_NT_SIGNATURE) { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; @@ -609,6 +610,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.opt.hdr32.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + /* All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value */ + size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof(IMAGE_OPTIONAL_HEADER32, CheckSum) ); + if (size < sizeof(nt.opt.hdr32)) memset( (char *)&nt.opt.hdr32 + size, 0, sizeof(nt.opt.hdr32) - size ); + switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_I386: @@ -654,6 +659,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + /* All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value */ + size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof(IMAGE_OPTIONAL_HEADER64, CheckSum) ); + if (size < sizeof(nt.opt.hdr64)) memset( (char *)&nt.opt.hdr64 + size, 0, sizeof(nt.opt.hdr64) - size ); + if (!(cpu_mask & CPU_64BIT_MASK)) return STATUS_INVALID_IMAGE_WIN_64; switch (nt.FileHeader.Machine) { -- 2.26.2

1 0

[PATCH v2 1/2] dmime: Support more common chunks
by Alistair Leslie-Hughes 06 May '20

06 May '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmobject.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 9ea31ab32a6b..8108657f0f5e 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -544,6 +544,21 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, &desc->vVersion, sizeof(desc->vVersion)) == S_OK) desc->dwValidData |= DMUS_OBJ_VERSION; break; + case DMUS_FOURCC_NAME_CHUNK: + if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_data(stream, &chunk, + &desc->wszName, chunk.size) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; + break; + case DMUS_FOURCC_FILE_CHUNK: + if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_data(stream, &chunk, + &desc->wszFileName, chunk.size) == S_OK) + desc->dwValidData |= DMUS_OBJ_FILENAME; + break; + case DMUS_FOURCC_DATE_CHUNK: + if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk, + &desc->ftDate, sizeof(desc->ftDate)) == S_OK) + desc->dwValidData |= DMUS_OBJ_DATE; + break; case FOURCC_LIST: if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME)) unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM); -- 2.26.2

1 0

[PATCH 5/5] wined3d: Fix an uninitialised variable warning.
by Zhiyi Zhang 06 May '20

06 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a1aa3c0bb96..c21ecfd5c32 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -257,7 +257,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; + const char *tex_type_str = NULL; unsigned int i; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -310,8 +310,6 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { if (!gl_info->supported[texture_type[i].extension]) -- 2.25.1

4 4

[PATCH 1/5] quartz/videorenderer: Factor out get_bitmap_header().
by Zebediah Figura 06 May '20

06 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 85 +++++++++++++------------------------ 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 54a646fbc04..77afc9fcef5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,6 +79,14 @@ static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo return CONTAINING_RECORD(iface, struct video_renderer, baseControlVideo); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -144,9 +152,7 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; - BITMAPINFOHEADER *bih; HRESULT hr; HDC dc; @@ -159,11 +165,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; - dc = GetDC(filter->baseControlWindow.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, @@ -171,7 +172,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.left, filter->SourceRect.top, filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, - pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.hwnd, dc); if (filter->renderer.filter.state == State_Paused) @@ -190,53 +191,31 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *This = impl_from_strmbase_renderer(iface); + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; - if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB32) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) - { - LONG height; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + return S_FALSE; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; - - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - height = format2->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else - { - WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); - return S_FALSE; - } - return S_OK; - } - return S_FALSE; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) + return S_FALSE; + + bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; } static void video_renderer_destroy(struct strmbase_renderer *iface) @@ -360,7 +339,6 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct video_renderer *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; const BITMAPINFOHEADER *bih; size_t image_size; BYTE *sample_data; @@ -369,10 +347,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG EnterCriticalSection(&filter->renderer.csRenderLock); - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image) -- 2.26.2

1 4

[PATCH] dmime: Parse Wave track stream
by Alistair Leslie-Hughes 05 May '20

05 May '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/dmime_private.h | 7 + dlls/dmime/wavetrack.c | 264 ++++++++++++++++++++++++++++++++++++- 2 files changed, 269 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 9759039a03e9..fddb66e89f60 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,13 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct DMUS_PRIVATE_WAVE_ITEM { + struct list entry; /* for listing elements */ + DMUS_IO_WAVE_TRACK_HEADER header; + + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_SEGMENT_ITEM { struct list entry; /* for listing elements */ DMUS_IO_SEGMENT_ITEM_HEADER header; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b52355..84d0bfa10dd5 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct DMUS_PRIVATE_WAVE_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct DMUS_PRIVATE_WAVE_ITEM, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,247 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT stream_parse_reference(IStream *stream, const struct chunk_entry *parent, + IDirectMusicObject **object) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = parent}; + DMUS_IO_REFERENCE reference; + DMUS_OBJECTDESC description; + IDirectMusicGetLoader *getloader; + IDirectMusicLoader *loader; + + memset(&description, 0, sizeof(description)); + + *object = NULL; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id != DMUS_FOURCC_REF_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &reference, chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + + TRACE("REFERENCE guidClassID %s, dwValidData 0x%08x\n", debugstr_dmguid(&reference.guidClassID), + reference.dwValidData); + + description.dwValidData = DMUS_OBJ_CLASS; + description.guidClass = reference.guidClassID; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case DMUS_FOURCC_GUID_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.guidObject, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_OBJECT; + break; + } + case DMUS_FOURCC_DATE_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.ftDate, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_DATE; + break; + } + case DMUS_FOURCC_NAME_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszName, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_NAME; + break; + } + case DMUS_FOURCC_FILE_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszFileName, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_FILENAME; + break; + } + case DMUS_FOURCC_VERSION_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.vVersion, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_VERSION; + break; + } + case DMUS_FOURCC_CATEGORY_CHUNK: { + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &description.wszCategory, + chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + description.dwValidData |= DMUS_OBJ_CATEGORY; + break; + } + } + } + + dump_DMUS_OBJECTDESC(&description); + + hr = IStream_QueryInterface (stream, &IID_IDirectMusicGetLoader, (void**)&getloader); + if (FAILED(hr)) + return hr; + + hr = IDirectMusicGetLoader_GetLoader (getloader, &loader); + if (FAILED(hr)) + return hr; + IDirectMusicGetLoader_Release (getloader); + + hr = IDirectMusicLoader_GetObject (loader, &description, &IID_IDirectMusicObject, (void**)&object); + IDirectMusicLoader_Release (loader); + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct DMUS_PRIVATE_WAVE_ITEM *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %d\n", header.rtTime); + TRACE(" - rtStartOffset %d\n", header.rtStartOffset); + TRACE(" - rtReserved %d\n", header.rtReserved); + TRACE(" - rtDuration %d\n", header.rtDuration); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id == FOURCC_LIST && child.type == DMUS_FOURCC_REF_LIST) + { + hr = stream_parse_reference(stream, &child, &item->object); + } + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_wavetrack_list(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + struct DMUS_PRIVATE_WAVE_ITEM *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(wave)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct DMUS_PRIVATE_WAVE_ITEM)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = wave}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + hr = parse_wavetrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +572,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); -- 2.26.2

3 2

[PATCH 4/5] wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target().
by Zhiyi Zhang 05 May '20

05 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 43 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 86f8277a27d..dd0419412af 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1472,7 +1472,9 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; RECT original_window_rect, window_rect; + int x, y, width, height; HWND window; HRESULT hr; @@ -1488,37 +1490,42 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta AdjustWindowRectEx(&window_rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + + x = original_window_rect.left; + y = original_window_rect.top; + width = window_rect.right - window_rect.left; + height = window_rect.bottom - window_rect.top; } else { - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - ERR("Failed to get display mode, hr %#x.\n", hr); + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + { + ERR("Failed to set display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + x = output_desc.desktop_rect.left; + y = output_desc.desktop_rect.top; + width = output_desc.desktop_rect.right - output_desc.desktop_rect.left; + height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top; } wined3d_mutex_unlock(); - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + MoveWindow(window, x, y, width, height, TRUE); return WINED3D_OK; } -- 2.25.1

2 1

[PATCH 3/5] dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs.
by Zhiyi Zhang 05 May '20

05 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 178 +++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 325a0bf07a9..f04cd2be065 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2721,12 +2721,12 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, check_swapchain_fullscreen_state(swapchain, &expected_state); } - ret = MoveWindow(window, 0, 0, 0, 0, TRUE); - ok(ret, "Failed to move window.\n"); + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); - ret = MoveWindow(window, 0, 0, 200, 200, TRUE); - ok(ret, "Failed to move window.\n"); + ret = SetWindowPos(window, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); @@ -2809,10 +2809,13 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, static void test_resize_target(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state, expected_state; + unsigned int adapter_idx, output_idx, test_idx; DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - unsigned int i; + IDXGIAdapter *adapter; + IDXGIOutput *output; ULONG refcount; HRESULT hr; @@ -2856,85 +2859,108 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - swapchain_desc.Flags = tests[i].flags; - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, - tests[i].origin.x, tests[i].origin.y, 400, 200, 0, 0, 0, 0); - if (tests[i].menu) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - HMENU menu_bar = CreateMenu(); - HMENU menu = CreateMenu(); - AppendMenuA(menu_bar, MF_POPUP, (UINT_PTR)menu, "Menu"); - SetMenu(swapchain_desc.OutputWindow, menu_bar); - } + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); - memset(&initial_state, 0, sizeof(initial_state)); - capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); - - hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - - expected_state = initial_state; - if (tests[i].fullscreen) - { - expected_state.fullscreen = TRUE; - compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, - &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); - hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); - ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_UNSUPPORTED) + for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) { - win_skip("GetContainingOutput() not supported.\n"); - IDXGISwapChain_Release(swapchain); + swapchain_desc.Flags = tests[test_idx].flags; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, + output_desc.DesktopCoordinates.left + tests[test_idx].origin.x, + output_desc.DesktopCoordinates.top + tests[test_idx].origin.y, + 400, 200, 0, 0, 0, 0); + if (tests[test_idx].menu) + { + HMENU menu_bar = CreateMenu(); + HMENU menu = CreateMenu(); + AppendMenuA(menu_bar, MF_POPUP, (UINT_PTR)menu, "Menu"); + SetMenu(swapchain_desc.OutputWindow, menu_bar); + } + + memset(&initial_state, 0, sizeof(initial_state)); + capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: CreateSwapChain failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + + expected_state = initial_state; + if (tests[test_idx].fullscreen) + { + expected_state.fullscreen = TRUE; + compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, + &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "Adapter %u output %u test %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("Adapter %u output %u test %u: GetContainingOutput() not supported.\n", + adapter_idx, output_idx, test_idx); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, + "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Adapter %u output %u test %u: Could not change fullscreen state.\n", + adapter_idx, output_idx, test_idx); + IDXGIOutput_Release(expected_state.target); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + } + check_swapchain_fullscreen_state(swapchain, &expected_state); + + hr = IDXGISwapChain_ResizeTarget(swapchain, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &expected_state); + + if (tests[test_idx].fullscreen) + { + test_fullscreen_resize_target(swapchain, &expected_state); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + IDXGIOutput_Release(expected_state.target); + check_swapchain_fullscreen_state(swapchain, &initial_state); + expected_state = initial_state; + } + else + { + test_windowed_resize_target(swapchain, swapchain_desc.OutputWindow, &expected_state); + + check_swapchain_fullscreen_state(swapchain, &expected_state); + } + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, test_idx, refcount); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); - continue; - } - - hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, - "SetFullscreenState failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) - { - skip("Could not change fullscreen state.\n"); - IDXGIOutput_Release(expected_state.target); - IDXGISwapChain_Release(swapchain); - DestroyWindow(swapchain_desc.OutputWindow); - continue; } + IDXGIOutput_Release(output); } - check_swapchain_fullscreen_state(swapchain, &expected_state); - - hr = IDXGISwapChain_ResizeTarget(swapchain, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &expected_state); - - if (tests[i].fullscreen) - { - test_fullscreen_resize_target(swapchain, &expected_state); - - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - IDXGIOutput_Release(expected_state.target); - check_swapchain_fullscreen_state(swapchain, &initial_state); - expected_state = initial_state; - } - else - { - test_windowed_resize_target(swapchain, swapchain_desc.OutputWindow, &expected_state); - - check_swapchain_fullscreen_state(swapchain, &expected_state); - } - - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state); - DestroyWindow(swapchain_desc.OutputWindow); + IDXGIAdapter_Release(adapter); } - refcount = IDXGIFactory_Release(factory); ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } -- 2.25.1

2 1

[PATCH 2/5] dxgi/tests: Do not run test_multi_adapter() in parallel with other tests.
by Zhiyi Zhang 05 May '20

05 May '20

test_multi_adapter() tests detaching non-primary outputs, interferencing other tests when non-primary outputs are enumerated. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4ca0b952f8b..325a0bf07a9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6505,7 +6505,6 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); - queue_test(test_multi_adapter); queue_test(test_factory_check_feature_support); run_queued_tests(); @@ -6515,6 +6514,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); -- 2.25.1

3 2

[PATCH 1/5] dxgi/tests: Fix a possible test failure on D3D12.
by Zhiyi Zhang 05 May '20

05 May '20

Calling d3d12_swapchain_Present() right after switching to full screen mode may fail because the swapchain window may be in the animation of becoming full screen and vkQueuePresentKHR() returns VK_ERROR_OUT_OF_DATE_KHR, even after d3d12_swapchain_present() tried to recreate the swapchain. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 32aae2567f0..4ca0b952f8b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -129,6 +129,24 @@ static void get_virtual_rect(RECT *rect) rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + int diff = 200; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -4276,6 +4294,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } + flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4427,6 +4446,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); + flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4903,24 +4923,6 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -/* try to make sure pending X events have been processed before continuing */ -static void flush_events(void) -{ - int diff = 200; - DWORD time; - MSG msg; - - time = GetTickCount() + diff; - while (diff > 0) - { - if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) - break; - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - DispatchMessageA(&msg); - diff = time - GetTickCount(); - } -} - struct adapter_info { const WCHAR *name; -- 2.25.1

2 1

[PATCH v2 1/3] ddraw/tests: Add more tests for EnumSurfaces().
by Zebediah Figura 05 May '20

05 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 168 +++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 169 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 636 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4e27ecfb796..0e1de7909dd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12093,10 +12093,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw *ddraw; + DDSURFACEDESC modes[20]; + unsigned int mode_count; + IDirectDrawSurface *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface *surface; + + if (SUCCEEDED(IDirectDraw_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) { struct enum_surfaces_param *param = context; @@ -12119,18 +12139,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; IDirectDraw *ddraw; DDSURFACEDESC desc; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -12150,6 +12206,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -12161,9 +12218,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7c25b2be557..8d38344520c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13069,10 +13069,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw2 *ddraw; + DDSURFACEDESC modes[20]; + unsigned int mode_count; + IDirectDrawSurface *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface *surface; + + if (SUCCEEDED(IDirectDraw2_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) { struct enum_surfaces_param *param = context; @@ -13095,18 +13115,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; IDirectDraw2 *ddraw; DDSURFACEDESC desc; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -13126,6 +13182,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -13137,9 +13194,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw2_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface2_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c38c0b3ce5a..3a3983639de 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15657,10 +15657,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw4 *ddraw; + DDSURFACEDESC2 modes[20]; + unsigned int mode_count; + IDirectDrawSurface4 *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface4 *surface; + + if (SUCCEEDED(IDirectDraw4_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface4_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) { struct enum_surfaces_param *param = context; @@ -15683,18 +15703,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC2 *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw4 *ddraw; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15704,30 +15760,128 @@ static void test_enum_surfaces(void) desc.dwWidth = 32; desc.dwHeight = 32; hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); - ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to create a surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface4_Release(param.surfaces[2]); IDirectDrawSurface4_Release(param.surfaces[1]); IDirectDrawSurface4_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw4_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface4_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d3ea36e9808..bf31d3915b9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15060,10 +15060,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw7 *ddraw; + DDSURFACEDESC2 modes[20]; + unsigned int mode_count; + IDirectDrawSurface7 *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface7 *surface; + + if (SUCCEEDED(IDirectDraw7_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface7_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { struct enum_surfaces_param *param = context; @@ -15086,18 +15106,57 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC2 *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw7 *ddraw; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15114,27 +15173,125 @@ static void test_enum_surfaces(void) } hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface7_Release(param.surfaces[2]); IDirectDrawSurface7_Release(param.surfaces[1]); IDirectDrawSurface7_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw7_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw7_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface7_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw7_Release(ddraw); } -- 2.26.2

3 8

[PATCH 1/4] sechost: Implement I_ScRegisterDeviceNotification().
by Zebediah Figura 05 May '20

05 May '20

Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Instead of implementing the interface in services.exe, I've elected to use a separate RPC interface hosted by plugplay.exe, for the following reasons: * device notifications don't have a lot to do with services; * the svcctl interface is already a (somewhat) documented interface which does not include any functions related to device notification; * it probably makes sense to move the BroadcastSystemMessage() call out of ntoskrnl and into the RPCserver [as in patch 0004], and services.exe can't import user32. dlls/sechost/Makefile.in | 1 + dlls/sechost/plugplay.idl | 2 + dlls/sechost/sechost.spec | 4 +- dlls/sechost/service.c | 148 +++++++++++++++++++++++++++++++++ include/wine/plugplay.idl | 32 +++++++ programs/plugplay/Makefile.in | 5 +- programs/plugplay/main.c | 130 +++++++++++++++++++++++++++++ programs/plugplay/plugplay.idl | 2 + 8 files changed, 321 insertions(+), 3 deletions(-) create mode 100644 dlls/sechost/plugplay.idl create mode 100644 include/wine/plugplay.idl create mode 100644 programs/plugplay/plugplay.idl diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index 91016c67577..f4d88272857 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -11,4 +11,5 @@ C_SRCS = \ trace.c IDL_SRCS = \ + plugplay.idl \ svcctl.idl diff --git a/dlls/sechost/plugplay.idl b/dlls/sechost/plugplay.idl new file mode 100644 index 00000000000..05e040388e4 --- /dev/null +++ b/dlls/sechost/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep client +#include "wine/plugplay.idl" diff --git a/dlls/sechost/sechost.spec b/dlls/sechost/sechost.spec index f21e2f1cda8..0867412c1cb 100644 --- a/dlls/sechost/sechost.spec +++ b/dlls/sechost/sechost.spec @@ -108,14 +108,14 @@ @ stub I_ScIsSecurityProcess @ stub I_ScPnPGetServiceName @ stub I_ScQueryServiceConfig -@ stub I_ScRegisterDeviceNotification +@ stdcall I_ScRegisterDeviceNotification(ptr ptr long) @ stub I_ScRegisterPreshutdownRestart @ stub I_ScReparseServiceDatabase @ stub I_ScRpcBindA @ stub I_ScRpcBindW @ stub I_ScSendPnPMessage @ stub I_ScSendTSMessage -@ stub I_ScUnregisterDeviceNotification +@ stdcall I_ScUnregisterDeviceNotification(ptr) @ stub I_ScValidatePnPService @ stub LocalGetConditionForString @ stub LocalGetReferencedTokenTypesForCondition diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 7a4211631e2..924a6c9264d 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -26,6 +26,8 @@ #include "winbase.h" #include "winsvc.h" #include "winternl.h" +#include "winuser.h" +#include "dbt.h" #include "wine/debug.h" #include "wine/exception.h" @@ -33,6 +35,7 @@ #include "wine/list.h" #include "svcctl.h" +#include "plugplay.h" WINE_DEFAULT_DEBUG_CHANNEL(service); @@ -1967,3 +1970,148 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceCtrlDispatcherW( const SERVICE_TABLE_E return service_run_main_thread(); } + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +static HANDLE device_notify_thread; +static struct list device_notify_list = LIST_INIT(device_notify_list); + +struct device_notify_registration +{ + struct list entry; + struct device_notification_details details; +}; + +static DWORD WINAPI device_notify_proc( void *arg ) +{ + WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; + WCHAR protseq[] = L"ncalrpc"; + RPC_WSTR binding_str; + DWORD err = ERROR_SUCCESS; + struct device_notify_registration *registration; + plugplay_rpc_handle handle = NULL; + DWORD code = 0; + unsigned int size; + BYTE *buf; + + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + { + ERR("RpcStringBindingCompose() failed, error %#x\n", err); + return err; + } + err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle ); + RpcStringFreeW( &binding_str ); + if (err) + { + ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); + return err; + } + + __TRY + { + handle = plugplay_register_listener(); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!handle) + { + ERR("failed to open RPC handle, error %u\n", err); + return 1; + } + + for (;;) + { + buf = NULL; + __TRY + { + code = plugplay_get_event( handle, &buf, &size ); + err = ERROR_SUCCESS; + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (err) + { + ERR("failed to get event, error %u\n", err); + break; + } + + EnterCriticalSection( &service_cs ); + LIST_FOR_EACH_ENTRY(registration, &device_notify_list, struct device_notify_registration, entry) + { + registration->details.cb( registration->details.handle, code, (DEV_BROADCAST_HDR *)buf ); + } + LeaveCriticalSection(&service_cs); + MIDL_user_free(buf); + } + + __TRY + { + plugplay_unregister_listener( handle ); + } + __EXCEPT(rpc_filter) + { + } + __ENDTRY + + RpcBindingFree( &plugplay_binding_handle ); + return 0; +} + +/****************************************************************************** + * I_ScRegisterDeviceNotification (sechost.@) + */ +HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ) +{ + struct device_notify_registration *registration; + + TRACE("callback %p, handle %p, filter %p, flags %#x\n", details->cb, details->handle, filter, flags); + + if (filter) FIXME("Notification filters are not yet implemented.\n"); + + if (!(registration = heap_alloc(sizeof(struct device_notify_registration)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + registration->details = *details; + + EnterCriticalSection( &service_cs ); + list_add_tail( &device_notify_list, &registration->entry ); + + if (!device_notify_thread) + device_notify_thread = CreateThread( NULL, 0, device_notify_proc, NULL, 0, NULL ); + + LeaveCriticalSection( &service_cs ); + + return registration; +} + +/****************************************************************************** + * I_ScUnregisterDeviceNotification (sechost.@) + */ +BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + struct device_notify_registration *registration = handle; + + TRACE("%p\n", handle); + + EnterCriticalSection( &service_cs ); + list_remove( &registration->entry ); + LeaveCriticalSection(&service_cs); + heap_free( registration ); + return TRUE; +} diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl new file mode 100644 index 00000000000..7cc59191248 --- /dev/null +++ b/include/wine/plugplay.idl @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; + +[ + uuid(57c680ac-7bce-4f39-97fd-ffea566754d5), + implicit_handle(handle_t plugplay_binding_handle) +] +interface plugplay +{ + typedef [context_handle] void *plugplay_rpc_handle; + + plugplay_rpc_handle plugplay_register_listener(); + DWORD plugplay_get_event([in] plugplay_rpc_handle handle, [out, size_is(,*size)] BYTE **data, [out] unsigned int *size); + void plugplay_unregister_listener([in] plugplay_rpc_handle handle); +} diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index e5d37e66f1d..1bc2aa505ab 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,7 +1,10 @@ MODULE = plugplay.exe -IMPORTS = advapi32 +IMPORTS = advapi32 rpcrt4 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + plugplay.idl diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 73bf46d6f99..59561dca503 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -21,6 +21,8 @@ #include <windows.h> #include "winsvc.h" #include "wine/debug.h" +#include "wine/list.h" +#include "plugplay.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -29,6 +31,111 @@ static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; +void __RPC_FAR * __RPC_USER MIDL_user_allocate( SIZE_T len ) +{ + return malloc( len ); +} + +void __RPC_USER MIDL_user_free( void __RPC_FAR *ptr ) +{ + free( ptr ); +} + +static CRITICAL_SECTION plugplay_cs; +static CRITICAL_SECTION_DEBUG plugplay_cs_debug = +{ + 0, 0, &plugplay_cs, + { &plugplay_cs_debug.ProcessLocksList, &plugplay_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": plugplay_cs") } +}; +static CRITICAL_SECTION plugplay_cs = { &plugplay_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list listener_list = LIST_INIT(listener_list); + +struct listener +{ + struct list entry; + struct list events; + CONDITION_VARIABLE cv; +}; + +struct event +{ + struct list entry; + DWORD code; + BYTE *data; + unsigned int size; +}; + + +static void destroy_listener( struct listener *listener ) +{ + struct event *event, *next; + + EnterCriticalSection( &plugplay_cs ); + list_remove( &listener->entry ); + LeaveCriticalSection( &plugplay_cs ); + + LIST_FOR_EACH_ENTRY_SAFE(event, next, &listener->events, struct event, entry) + { + MIDL_user_free( event->data ); + list_remove( &event->entry ); + free( event ); + } + free( listener ); +} + +void __RPC_USER plugplay_rpc_handle_rundown( plugplay_rpc_handle handle ) +{ + destroy_listener( handle ); +} + +plugplay_rpc_handle __cdecl plugplay_register_listener(void) +{ + struct listener *listener; + + if (!(listener = calloc( 1, sizeof(*listener) ))) + return NULL; + + list_init( &listener->events ); + InitializeConditionVariable( &listener->cv ); + + EnterCriticalSection( &plugplay_cs ); + list_add_tail( &listener_list, &listener->entry ); + LeaveCriticalSection( &plugplay_cs ); + + return listener; +} + +DWORD __cdecl plugplay_get_event( plugplay_rpc_handle handle, BYTE **data, unsigned int *size ) +{ + struct listener *listener = handle; + struct event *event; + struct list *entry; + DWORD ret; + + EnterCriticalSection( &plugplay_cs ); + + while (!(entry = list_head( &listener->events ))) + SleepConditionVariableCS( &listener->cv, &plugplay_cs, INFINITE ); + + event = LIST_ENTRY(entry, struct event, entry); + list_remove( &event->entry ); + + LeaveCriticalSection( &plugplay_cs ); + + ret = event->code; + *data = event->data; + *size = event->size; + free( event ); + return ret; +} + +void __cdecl plugplay_unregister_listener( plugplay_rpc_handle handle ) +{ + destroy_listener( handle ); +} + static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { SERVICE_STATUS status; @@ -60,10 +167,29 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { + unsigned char endpoint[] = "\\pipe\\wine_plugplay"; + unsigned char protseq[] = "ncalrpc"; SERVICE_STATUS status; + RPC_STATUS err; WINE_TRACE( "starting service\n" ); + if ((err = RpcServerUseProtseqEpA( protseq, 0, endpoint, NULL ))) + { + ERR("RpcServerUseProtseqEp() failed, error %u\n", err); + return; + } + if ((err = RpcServerRegisterIf( plugplay_v0_0_s_ifspec, NULL, NULL ))) + { + ERR("RpcServerRegisterIf() failed, error %u\n", err); + return; + } + if ((err = RpcServerListen( 1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE ))) + { + ERR("RpcServerListen() failed, error %u\n", err); + return; + } + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); service_handle = RegisterServiceCtrlHandlerExW( plugplayW, service_handler, NULL ); @@ -81,6 +207,10 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) WaitForSingleObject( stop_event, INFINITE ); + RpcMgmtStopServerListening( NULL ); + RpcServerUnregisterIf( plugplay_v0_0_s_ifspec, NULL, TRUE ); + RpcMgmtWaitServerListen(); + status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); diff --git a/programs/plugplay/plugplay.idl b/programs/plugplay/plugplay.idl new file mode 100644 index 00000000000..0cb8884c2df --- /dev/null +++ b/programs/plugplay/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep server +#include "wine/plugplay.idl" -- 2.26.2

1 3

[PATCH 7/7] configure: Explicitly specify subsystem when using msvc target.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

2 1

[PATCH v2 2/2] msasn1: Implement ASN1_CloseModule function
by Vijay Kiran Kamuju 05 May '20

05 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/2] msasn1: Implement ASN1_CreateModule function
by Vijay Kiran Kamuju 05 May '20

05 May '20

[Based on patch from Austin English Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2] mf: Add missing ::Release of clock timer.
by Derek Lesho 05 May '20

05 May '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Release the original reference upon removal from list instead. --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4df..d6b881218bf 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4289,6 +4289,7 @@ static HRESULT WINAPI present_clock_timer_callback_Invoke(IMFAsyncCallback *ifac EnterCriticalSection(&clock->cs); list_remove(&timer->entry); + IUnknown_Release(&timer->IUnknown_iface); LeaveCriticalSection(&clock->cs); IMFAsyncCallback_Invoke(timer->callback, timer->result); -- 2.26.2

2 1

[PATCH RFC] winedbg: Allow attaching to process by name.
by Derek Lesho 05 May '20

05 May '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I've found this useful for situations where you can't use winedbg to launch the app (steam games), and the apps fail too quickly for you to manually retrieve their PID. --- programs/winedbg/dbg.y | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/winedbg.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ac76b5baf8a..205ea167b67 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -138,6 +138,7 @@ command: | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } + | tATTACH tSTRING { dbg_attach_debuggee(dbg_find_process($2)); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tTHREAD tNUM { dbg_set_curr_thread($2); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..754e7d5b22f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -473,6 +473,7 @@ extern void dbg_set_process_name(struct dbg_process* p, const WCHAR* extern struct dbg_process* dbg_get_process(DWORD pid); extern struct dbg_process* dbg_get_process_h(HANDLE handle); extern void dbg_del_process(struct dbg_process* p); +extern DWORD dbg_find_process(const char *filename); struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, HANDLE h, void* teb); extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 19f30f04e5d..27ce57607a0 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -25,6 +25,7 @@ #include <string.h> #include "debugger.h" +#include "tlhelp32.h" #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" @@ -377,6 +378,42 @@ void dbg_del_process(struct dbg_process* p) HeapFree(GetProcessHeap(), 0, p); } +DWORD dbg_find_process(const char *search) +{ + HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + const char *process_name; + PROCESSENTRY32 cur_proc; + DWORD ret = -1; + + if (snap == INVALID_HANDLE_VALUE) + return ret; + + cur_proc.dwSize = sizeof(cur_proc); + if (!(Process32First(snap, &cur_proc))) + goto done; + + do + { + if (cur_proc.th32ProcessID == GetCurrentProcessId()) + continue; + + if (!(strcasecmp(search, cur_proc.szExeFile))) + { + ret = cur_proc.th32ProcessID; + break; + } + + cur_proc.dwSize = sizeof(cur_proc); + } + while ((Process32Next(snap, &cur_proc))); + + done: + if (ret == -1) + dbg_printf("Could not find running process with name \"%s\"\n", search); + CloseHandle(snap); + return ret; +} + /****************************************************************** * dbg_init * -- 2.26.2

1 0

[PATCH 2/7] ntoskrnl.exe: Exprot _chkstk from importlib.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 6/7] configure: Allow specifying default CROSSTARGET as configure argument.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This series, together with __cpuid patches, are enough to do a functional 64-bit Wine with ./configure CROSSTARGET=x86_64-windows CROSSCC=clang 32-bit target needs a bit more. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 5/7] configure: Asume that -delayload linker argument is supported when -target argument is used.
by Jacek Caban 05 May '20

05 May '20

In practice, it's present only on clang and it always needs to be used there. mingw and msvc targets have different syntax. We take care of that in winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- aclocal.m4 | 2 +- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH 4/7] winecrt0: Add _fltused symbol.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 dlls/winecrt0/crt_fltused.c

1 0

[PATCH 3/7] winecrt0: Build exception functions on clang msvc target.
by Jacek Caban 05 May '20

05 May '20

We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] ntdll: Export _chkstk from importlib.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH] mf: Add missing ::Release of clock timer.
by Derek Lesho 05 May '20

05 May '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4df..eb388de62ac 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4014,6 +4014,7 @@ static HRESULT present_clock_schedule_timer(struct presentation_clock *clock, DW if (FAILED(hr = MFCreateAsyncResult(&timer->IUnknown_iface, &clock->timer_callback, NULL, &result))) return hr; + IUnknown_Release(&timer->IUnknown_iface); hr = MFScheduleWorkItemEx(result, -time, &timer->key); IMFAsyncResult_Release(result); -- 2.26.2

2 3

[PATCH] cmd.exe: Don't treat explicit paths as a PATH search list.
by Gabriel Ivăncescu 05 May '20

05 May '20

For example, the explicit path "C:\some;path" is currently treated as if the PATH environment variable is "C:\some;path" which is obviously wrong, and searches for the directories "C:\some" and "path". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/cmd/wcmdmain.c | 63 +++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 16843e4..4026f3e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1045,6 +1045,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; + BOOL explicit_path = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1084,6 +1085,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and c:\windows\a.bat syntax */ if (lastSlash) *(lastSlash + 1) = 0x00; + explicit_path = TRUE; } /* Now extract PATHEXT */ @@ -1103,37 +1105,48 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL found = FALSE; BOOL inside_quotes = FALSE; - /* Work on the first directory on the search path */ - pos = pathposn; - while ((inside_quotes || *pos != ';') && *pos != 0) + if (explicit_path) { - if (*pos == '"') - inside_quotes = !inside_quotes; - pos++; + lstrcpyW(thisDir, pathposn); + pathposn = NULL; } + else + { + /* Work on the next directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } - if (*pos) { /* Reached semicolon */ - memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); - thisDir[(pos-pathposn)] = 0x00; - pathposn = pos+1; - } else { /* Reached string end */ - lstrcpyW(thisDir, pathposn); - pathposn = NULL; - } + if (*pos) /* Reached semicolon */ + { + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } + else /* Reached string end */ + { + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } - /* Remove quotes */ - length = lstrlenW(thisDir); - if (thisDir[length - 1] == '"') - thisDir[length - 1] = 0; + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; - if (*thisDir != '"') - lstrcpyW(temp, thisDir); - else - lstrcpyW(temp, thisDir + 1); + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); - /* Since you can have eg. ..\.. on the path, need to expand - to full information */ - GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + } /* 1. If extension supplied, see if that file exists */ lstrcatW(thisDir, slashW); -- 2.21.0

1 0

[PATCH 2/2] msasn1: Implement ASN1_CloseModule function
by Vijay Kiran Kamuju 05 May '20

05 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] user32: Leave critical section before calling callbacks in EnumDisplayMonitors().
by Zhiyi Zhang 05 May '20

05 May '20

Previously, callbacks were called with a critical section held. It was intended that monitor handles passed to callbacks should always be valid. But it created a deadlock condition when callbacks call other functions which try to grab the critical section using a different thread. Tests also show that a monitor handle can be invalid after a display change. So do not hold the critical section when calling callbacks. Monitor handles will be checked when passed to GetMonitorInfo(), which is the sole function that consumes HMONITORs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e8..043742a9bfa 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4126,28 +4126,34 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT default_rect = {0, 0, 640, 480}; - DWORD i; + RECT monitor_rect; + DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); if (update_monitor_cache()) { - EnterCriticalSection( &monitors_section ); - for (i = 0; i < monitor_count; i++) + while (TRUE) { - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) + EnterCriticalSection( &monitors_section ); + if (i >= monitor_count) { LeaveCriticalSection( &monitors_section ); - return FALSE; + return TRUE; } + monitor_rect = monitors[i].rcMonitor; + LeaveCriticalSection( &monitors_section ); + + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) + return FALSE; + + ++i; } - LeaveCriticalSection( &monitors_section ); - return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + SetRect( &monitor_rect, 0, 0, 640, 480 ); + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; } -- 2.25.1

1 0

[PATCH 3/4] user32/tests: Test EnumDisplayMonitors().
by Zhiyi Zhang 05 May '20

05 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 116 ++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 05e70c4b625..63cbe5067c0 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1154,11 +1154,127 @@ static void test_display_config(void) ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); } +static BOOL CALLBACK test_EnumDisplayMonitors_normal_cb(HMONITOR monitor, HDC hdc, LPRECT rect, + LPARAM lparam) +{ + MONITORINFO mi; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, &mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + ok(EqualRect(rect, &mi.rcMonitor), "Expected rect %s, got %s.\n", + wine_dbgstr_rect(&mi.rcMonitor), wine_dbgstr_rect(rect)); + + return TRUE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_return_false_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + return FALSE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + MONITORINFOEXA mi, mi2; + DEVMODEA old_dm, dm; + INT count; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + + /* Test that monitor handle is invalid after the monitor is detached */ + if (!(mi.dwFlags & MONITORINFOF_PRIMARY)) + { + count = GetSystemMetrics(SM_CMONITORS); + + /* Save current display settings */ + memset(&old_dm, 0, sizeof(old_dm)); + old_dm.dmSize = sizeof(old_dm); + ret = EnumDisplaySettingsA(mi.szDevice, ENUM_CURRENT_SETTINGS, &old_dm); + ok(ret, "EnumDisplaySettingsA %s failed, error %#x.\n", mi.szDevice, GetLastError()); + + /* Detach monitor */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition.x = mi.rcMonitor.left; + dm.dmPosition.y = mi.rcMonitor.top; + ret = ChangeDisplaySettingsExA(mi.szDevice, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + + /* Check if it's really detached */ + if (GetSystemMetrics(SM_CMONITORS) != count - 1) + { + skip("Failed to detach %s.\n", mi.szDevice); + return TRUE; + } + + /* The monitor handle should be invalid now */ + mi2.cbSize = sizeof(mi2); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); + ok(!ret, "GetMonitorInfoA succeeded.\n"); + + /* Restore the original display settings */ + ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + } + + return TRUE; +} + +static void test_EnumDisplayMonitors(void) +{ + DWORD error; + INT count; + BOOL ret; + + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_normal_cb, 0); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_return_false_cb, 0); + error = GetLastError(); + ok(!ret, "EnumDisplayMonitors succeeded.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + + count = GetSystemMetrics(SM_CMONITORS); + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0); + error = GetLastError(); + if (count >= 2) + { + todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n"); + todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); + } + else + { + ok(ret, "EnumDisplayMonitors failed.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + } +} + START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); + test_EnumDisplayMonitors(); test_monitors(); test_work_area(); test_display_config(); -- 2.25.1

1 0

[PATCH 2/4] user32/tests: Fix a ChangeDisplaySettings() test.
by Zhiyi Zhang 05 May '20

05 May '20

Overlapped monitor rectangles should be automatically adjusted to avoid overlaps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 080f040c3f2..05e70c4b625 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -757,26 +757,35 @@ static void test_ChangeDisplaySettingsEx(void) if (res) { + /* The secondary adapter should be to the right of the primary adapter */ + todo_wine ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, + "Expected dm2.dmPosition.x %d, got %d.\n", dm.dmPosition.x + dm.dmPelsWidth, + dm2.dmPosition.x); + ok(dm2.dmPosition.y == dm.dmPosition.y, "Expected dm2.dmPosition.y %d, got %d.\n", + dm.dmPosition.y, dm2.dmPosition.y); + /* Test position conflict */ - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - /* Position is not changed even if ChangeDisplaySettingsExA returned DISP_CHANGE_SUCCESSFUL */ + /* Position is changed and automatically moved */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); + todo_wine ok((dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth), + "Expected dmPosition.x %d, got %d.\n", dm.dmPosition.x - dm2.dmPelsWidth, + dm2.dmPosition.x); /* Test position with extra space. The extra space will be removed */ - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ -- 2.25.1

1 0

[PATCH 1/2] msasn1: Implement ASN1_CreateModule function
by Vijay Kiran Kamuju 05 May '20

05 May '20

Based on patch from Austin English Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] user32/tests: Flush messages after mode changes.
by Zhiyi Zhang 05 May '20

05 May '20

test_ChangeDisplaySettingsEx() can generate so many posted messages for display change events that USERPostMessageLimit is reached and ERROR_NOT_ENOUGH_QUOTA is returned for PostMessage(). Call flush_events() after mode changes to limit message post rate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 59 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e669b2b82e9..080f040c3f2 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -46,6 +46,23 @@ static void init_function_pointers(void) #undef GET_PROC } +static void flush_events(void) +{ + int diff = 1000; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 200, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -290,12 +307,6 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te dm.dmSize = sizeof(dm); SetLastError(0xdeadbeef); ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); - /* On win10 TestBot, after many resolution changes, EnumDisplaySettingsA fails sometimes for unknown reasons */ - if (!ret) - { - win_skip_(__FILE__, line)("EnumDisplaySettingsA failed.\n"); - return; - } ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); @@ -649,6 +660,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, mode); } @@ -662,14 +674,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", - devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); position.x = dm.dmPosition.x + dm.dmPelsWidth; } @@ -679,13 +684,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -714,6 +713,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, 0); } @@ -744,8 +744,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[0].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); if (res) { @@ -753,8 +752,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); } if (res) @@ -769,9 +767,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x || broken(!res), "Expect position change not applied.\n"); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); /* Test position with extra space. The extra space will be removed */ dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; @@ -818,6 +815,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm2, devices[1].name, side); } @@ -841,9 +839,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth || broken(!res), "Expect dmPosition.x %d, got %d\n", + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", dm.dmPelsWidth, dm2.dmPosition.x); } else -- 2.25.1

1 0

[PATCH] msxml6: Update version resource.
by Hans Leidekker 05 May '20

05 May '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msxml6/rsrc.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 9c6e55c551..d803f67962 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll" -#define WINE_FILEVERSION 6,10,1129,0 -#define WINE_FILEVERSION_STR "6.10.1129.0" -#define WINE_PRODUCTVERSION 6,10,1129,0 -#define WINE_PRODUCTVERSION_STR "6.10.1129.0" +#define WINE_FILEVERSION 6,30,7601,24498 +#define WINE_FILEVERSION_STR "6.30.7601.24498" +#define WINE_PRODUCTVERSION 6,30,7601,24498 +#define WINE_PRODUCTVERSION_STR "6.30.7601.24498" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" -- 2.20.1

2 1

[PATCH] msxml3: Update version resource.
by Hans Leidekker 05 May '20

05 May '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msxml3/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 127ecee884..51da3e809e 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -16,10 +16,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" -#define WINE_FILEVERSION 8,90,1101,0 -#define WINE_FILEVERSION_STR "8.90.1101.0" -#define WINE_PRODUCTVERSION 8,90,1101,0 -#define WINE_PRODUCTVERSION_STR "8.90.1101.0" +#define WINE_FILEVERSION 8,110,7601,24402 +#define WINE_FILEVERSION_STR "8.110.7601.24402" +#define WINE_PRODUCTVERSION 8,110,7601,24402 +#define WINE_PRODUCTVERSION_STR "8.110.7601.24402" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" -- 2.20.1

2 1

[PATCH 1/2] dwrite: Enable common positional features for all scripts.
by Nikolay Sivov 05 May '20

05 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 78 +++++++++++++----------------- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/shape.c | 92 ++++++++++++++++-------------------- 3 files changed, 74 insertions(+), 100 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5ee057028f..c2fd5c54d3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -94,7 +94,7 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Khar */ { 0x7261684b, 305, 15, 0x0020, 1, 0, 1, 0, 0, 0, 0 }, { _OT('k','h','a','r') } }, { /* Khmr */ { 0x726d684b, 355, 8, 0x0020, 1, 0, 1, 0, 1, 0, 0 }, { _OT('k','h','m','r') }, TRUE }, { /* Laoo */ { 0x6f6f614c, 356, 8, 0x0020, 1, 0, 1, 0, 1, 0, 0 }, { _OT('l','a','o',' ') }, TRUE }, - { /* Latn */ { 0x6e74614c, 215, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('l','a','t','n') }, FALSE, &latn_shaping_ops }, + { /* Latn */ { 0x6e74614c, 215, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('l','a','t','n') } }, { /* Lepc */ { 0x6370654c, 335, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('l','e','p','c') } }, { /* Limb */ { 0x626d694c, 336, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('l','i','m','b') } }, { /* Linb */ { 0x626e694c, 401, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, { _OT('l','i','n','b') } }, @@ -1279,9 +1279,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { const struct dwritescript_properties *scriptprops; + struct scriptshaping_context context; struct dwrite_fontface *font_obj; unsigned int i, script; - HRESULT hr = S_OK; TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, @@ -1307,29 +1307,23 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 } script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - scriptprops = &dwritescripts_properties[script]; - if (scriptprops->ops && scriptprops->ops->gpos_features) - { - struct scriptshaping_context context; - - context.cache = fontface_get_shaping_cache(font_obj); - context.text = text; - context.length = text_len; - context.is_rtl = is_rtl; - context.u.pos.glyphs = glyphs; - context.u.pos.glyph_props = glyph_props; - context.glyph_count = glyph_count; - context.emsize = emSize; - context.measuring_mode = DWRITE_MEASURING_MODE_NATURAL; - context.advances = advances; - context.offsets = offsets; - context.language_tag = get_opentype_language(locale); - - hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); - } - return hr; + context.cache = fontface_get_shaping_cache(font_obj); + context.text = text; + context.length = text_len; + context.is_rtl = is_rtl; + context.is_sideways = is_sideways; + context.u.pos.glyphs = glyphs; + context.u.pos.glyph_props = glyph_props; + context.glyph_count = glyph_count; + context.emsize = emSize; + context.measuring_mode = DWRITE_MEASURING_MODE_NATURAL; + context.advances = advances; + context.offsets = offsets; + context.language_tag = get_opentype_language(locale); + + return shape_get_positions(&context, scriptprops->scripttags); } static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, @@ -1341,10 +1335,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite UINT32 const* feature_range_lengths, UINT32 feature_ranges, float *advances, DWRITE_GLYPH_OFFSET *offsets) { const struct dwritescript_properties *scriptprops; + struct scriptshaping_context context; DWRITE_MEASURING_MODE measuring_mode; struct dwrite_fontface *font_obj; unsigned int i, script; - HRESULT hr = S_OK; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %s %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, @@ -1372,29 +1366,23 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite } script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; - scriptprops = &dwritescripts_properties[script]; - if (scriptprops->ops && scriptprops->ops->gpos_features) - { - struct scriptshaping_context context; - - context.cache = fontface_get_shaping_cache(font_obj); - context.text = text; - context.length = text_len; - context.is_rtl = is_rtl; - context.u.pos.glyphs = glyphs; - context.u.pos.glyph_props = glyph_props; - context.glyph_count = glyph_count; - context.emsize = emSize * ppdip; - context.measuring_mode = measuring_mode; - context.advances = advances; - context.offsets = offsets; - context.language_tag = get_opentype_language(locale); - - hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); - } - return hr; + context.cache = fontface_get_shaping_cache(font_obj); + context.text = text; + context.length = text_len; + context.is_rtl = is_rtl; + context.is_sideways = is_sideways; + context.u.pos.glyphs = glyphs; + context.u.pos.glyph_props = glyph_props; + context.glyph_count = glyph_count; + context.emsize = emSize * ppdip; + context.measuring_mode = measuring_mode; + context.advances = advances; + context.offsets = offsets; + context.language_tag = get_opentype_language(locale); + + return shape_get_positions(&context, scriptprops->scripttags); } static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 28ac05a1c1..0b863147af 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -536,8 +536,6 @@ struct scriptshaping_ops }; extern const struct scriptshaping_ops default_shaping_ops DECLSPEC_HIDDEN; -extern const struct scriptshaping_ops latn_shaping_ops DECLSPEC_HIDDEN; extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; -extern HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD *scripts, - const struct shaping_features *features) DECLSPEC_HIDDEN; +extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 533efe6cc7..a5a1a232e7 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -148,41 +148,6 @@ static HRESULT default_set_text_glyphs_props(struct scriptshaping_context *conte return S_OK; } -static HRESULT latn_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - HRESULT hr; - UINT32 i; - - hr = default_set_text_glyphs_props(context, clustermap, glyph_indices, glyphcount, text_props, glyph_props); - - for (i = 0; i < glyphcount; i++) - if (glyph_props[i].isZeroWidthSpace) - glyph_props[i].justification = SCRIPT_JUSTIFY_NONE; - - return hr; -} - -static struct shaping_feature std_gpos_tags[] = -{ - { DWRITE_FONT_FEATURE_TAG_KERNING }, - { DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING }, - { DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING }, -}; - -static const struct shaping_features std_gpos_features = -{ - std_gpos_tags, - ARRAY_SIZE(std_gpos_tags), -}; - -const struct scriptshaping_ops latn_shaping_ops = -{ - NULL, - latn_set_text_glyphs_props, - &std_gpos_features, -}; - const struct scriptshaping_ops default_shaping_ops = { NULL, @@ -236,13 +201,43 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD *scripts, - const struct shaping_features *features) +static void shape_add_feature(struct shaping_features *features, unsigned int tag) +{ + if (!dwrite_array_reserve((void **)&features->features, &features->capacity, features->count + 1, + sizeof(*features->features))) + return; + + features->features[features->count++].tag = tag; +} + +HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { + static const unsigned int common_features[] = + { + DWRITE_MAKE_OPENTYPE_TAG('a','b','v','m'), + DWRITE_MAKE_OPENTYPE_TAG('b','l','w','m'), + DWRITE_MAKE_OPENTYPE_TAG('m','a','r','k'), + DWRITE_MAKE_OPENTYPE_TAG('m','k','m','k'), + }; + static const unsigned int horizontal_features[] = + { + DWRITE_MAKE_OPENTYPE_TAG('c','u','r','s'), + DWRITE_MAKE_OPENTYPE_TAG('d','i','s','t'), + DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n'), + }; struct scriptshaping_cache *cache = context->cache; - unsigned int script_index, language_index; - unsigned int i; - DWORD script; + unsigned int script_index, language_index, script, i; + struct shaping_features features = { 0 }; + + for (i = 0; i < ARRAY_SIZE(common_features); ++i) + shape_add_feature(&features, common_features[i]); + + /* Horizontal features */ + if (!context->is_sideways) + { + for (i = 0; i < ARRAY_SIZE(horizontal_features); ++i) + shape_add_feature(&features, horizontal_features[i]); + } /* Resolve script tag to actually supported script. */ if (cache->gpos.table.data) @@ -253,9 +248,9 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD * if ((language = shape_select_language(cache, MS_GPOS_TAG, script_index, language, &language_index))) { - TRACE("script %s, language %s.\n", debugstr_tag(script), - language != ~0u ? debugstr_tag(language) : "deflangsys"); - opentype_layout_apply_gpos_features(context, script_index, language_index, features); + TRACE("script %s, language %s.\n", debugstr_tag(script), language != ~0u ? + debugstr_tag(language) : "deflangsys"); + opentype_layout_apply_gpos_features(context, script_index, language_index, &features); } } } @@ -264,16 +259,9 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const DWORD * if (context->u.pos.glyph_props[i].isZeroWidthSpace) context->advances[i] = 0.0f; - return S_OK; -} - -static void shape_add_feature(struct shaping_features *features, unsigned int tag) -{ - if (!dwrite_array_reserve((void **)&features->features, &features->capacity, features->count + 1, - sizeof(*features->features))) - return; + heap_free(features.features); - features->features[features->count++].tag = tag; + return S_OK; } static unsigned int shape_get_script_lang_index(struct scriptshaping_context *context, const unsigned int *scripts, -- 2.26.2

1 1

[PATCH v4 1/2] ntdll/tests: Test user_shared_data timestamp updates.
by Rémi Bernon 05 May '20

05 May '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: * New way to test timestamps, still some little variations after the updates are implemented, as we may miss a server update. * Add checks for InterruptTime, including some weird offset on testbot w864. * Use a single page for the whole system, initialized when wineboot.exe completes its creation, using its USD initial values. * Use atomic writes if possible, or assume that reordering guarantees on volatile accesses will be enough. PROT_WRITE doesn't always implies PROT_READ and atomic exchange would probably need readable page. We could also be mmap RW on the server side. * Address a race condition when receiving the usd fd by including it in the server call uninterruptible section. * Use the same 0x10000 size in ntdll initial mapping, later remapping and for the server side page creation. dlls/ntdll/tests/time.c | 78 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d8..fe71d4458c0f 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); static const int MonthLengths[2][12] = { @@ -153,6 +156,79 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static ULONGLONG read_ksystem_time(volatile KSYSTEM_TIME *time) +{ + ULONGLONG high, low; + do + { + high = time->High1Time; + low = time->LowPart; + } + while (high != time->High2Time); + return high << 32 | low; +} + +static void test_user_shared_data_time(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONGLONG t1, t2, t3; + int i = 0; + + i = 0; + do + { + t1 = GetTickCount(); + if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) + t2 = ((ULONG64)user_shared_data->TickCountLowDeprecated * user_shared_data->TickCountMultiplier) >> 24; + else + t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t3 = GetTickCount(); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + ok(t1 <= t2, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + todo_wine + ok(t2 <= t3, "USD TickCount / GetTickCount are out of order: %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + i = 0; + do + { + LARGE_INTEGER system_time; + NtQuerySystemTime(&system_time); + t1 = system_time.QuadPart; + t2 = read_ksystem_time(&user_shared_data->SystemTime); + NtQuerySystemTime(&system_time); + t3 = system_time.QuadPart; + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3, "USD SystemTime / NtQuerySystemTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + + if (!pRtlQueryUnbiasedInterruptTime) + win_skip("skipping RtlQueryUnbiasedInterruptTime tests\n"); + else + { + i = 0; + do + { + pRtlQueryUnbiasedInterruptTime(&t1); + t2 = read_ksystem_time(&user_shared_data->InterruptTime); + pRtlQueryUnbiasedInterruptTime(&t3); + } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ + + todo_wine + ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); + ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, + "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -163,6 +239,7 @@ START_TEST(time) (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); + pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -170,4 +247,5 @@ START_TEST(time) win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); + test_user_shared_data_time(); } -- 2.26.1

4 9

[PATCH 1/5] include: Add additional DISPLAYCONFIG defines.
by Brendan Shanks 05 May '20

05 May '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/wingdi.h | 112 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 0a456f8230..de028f5212 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3293,6 +3293,9 @@ typedef enum { DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff } DISPLAYCONFIG_DEVICE_INFO_TYPE; @@ -3429,6 +3432,16 @@ typedef enum DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; +typedef enum +{ + DISPLAYCONFIG_COLOR_ENCODING_RGB = 0, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR444 = 1, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR422 = 2, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR420 = 3, + DISPLAYCONFIG_COLOR_ENCODING_INTENSITY = 4, + DISPLAYCONFIG_COLOR_ENCODING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_COLOR_ENCODING; + typedef struct DISPLAYCONFIG_2DREGION { UINT32 cx; @@ -3525,6 +3538,105 @@ typedef struct DISPLAYCONFIG_MODE_INFO } DUMMYUNIONNAME; } DISPLAYCONFIG_MODE_INFO; +typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR viewGdiDeviceName[CCHDEVICENAME]; +} DISPLAYCONFIG_SOURCE_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS { + union { + struct { + UINT32 friendlyNameFromEdid :1; + UINT32 friendlyNameForced :1; + UINT32 edidIdsValid :1; + UINT32 reserved :29; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS flags; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + UINT16 edidManufactureId; + UINT16 edidProductCodeId; + UINT32 connectorInstance; + WCHAR monitorFriendlyDeviceName[64]; + WCHAR monitorDevicePath[128]; +} DISPLAYCONFIG_TARGET_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_PREFERRED_MODE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + UINT32 width; + UINT32 height; + DISPLAYCONFIG_TARGET_MODE targetMode; +} DISPLAYCONFIG_TARGET_PREFERRED_MODE; + +typedef struct DISPLAYCONFIG_ADAPTER_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR adapterDevicePath[128]; +} DISPLAYCONFIG_ADAPTER_NAME; + +typedef struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 bootPersistenceOn :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_TARGET_PERSISTENCE; + +typedef struct DISPLAYCONFIG_TARGET_BASE_TYPE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY baseOutputTechnology; +} DISPLAYCONFIG_TARGET_BASE_TYPE; + +typedef struct DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 disableMonitorVirtualResolution :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION; + +typedef struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 advancedColorSupported :1; + UINT32 advancedColorEnabled :1; + UINT32 wideColorEnforced :1; + UINT32 advancedColorForceDisabled :1; + UINT32 reserved :28; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; + DISPLAYCONFIG_COLOR_ENCODING colorEncoding; + UINT32 bitsPerColorChannel; +} DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO; + +typedef struct DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 enableAdvancedColor :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE; + +typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + ULONG SDRWhiteLevel; +} DISPLAYCONFIG_SDR_WHITE_LEVEL; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002 -- 2.26.2

3 7

[PATCH 3/3] wbemprox: Use __cpuid from intrin.h.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 55 ++++++++++------------------------------- 1 file changed, 13 insertions(+), 42 deletions(-)

1 0

[PATCH 2/3] wineboot: Use __cpuid from intrin.h.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineboot/wineboot.c | 59 ++++++++---------------------------- 1 file changed, 12 insertions(+), 47 deletions(-)

1 0

[PATCH 1/3] include: Add intrin.h and use it to provide __cpuid implementation.
by Jacek Caban 05 May '20

05 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/intrin.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 include/msvcrt/intrin.h

1 0

[PATCH 1/4] quartz/tests: Add tests for the separate reference count of IVMRSurfaceAllocatorNotify9.
by Zebediah Figura 04 May '20

04 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 54e9b53afb1..4994829641b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2769,7 +2769,7 @@ static D3DFORMAT allocator_format; static DWORD allocator_accept_flags; static IDirect3DSurface9 *allocator_surfaces[5]; static IVMRSurfaceAllocatorNotify9 *allocator_notify; -static unsigned int allocator_got_PresentImage; +static unsigned int allocator_got_PresentImage, allocator_got_TerminateDevice; static HRESULT WINAPI presenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID iid, void **out) { @@ -2882,6 +2882,7 @@ static HRESULT WINAPI allocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DW if (winetest_debug > 1) trace("TerminateDevice()\n"); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); /* Don't dereference the surfaces here, to mimic How to Survive. */ + ++allocator_got_TerminateDevice; return E_NOTIMPL; } @@ -3253,6 +3254,32 @@ static void test_clipping_window(void) DestroyWindow(window); } +static void test_surface_allocator_notify_refcount(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); + IVMRSurfaceAllocatorNotify9 *notify; + HRESULT hr; + ULONG ref; + + allocator_got_TerminateDevice = 0; + + set_mixing_mode(filter, 2); + + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); + + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &allocator_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IBaseFilter_Release(filter); + todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", + allocator_got_TerminateDevice); + todo_wine ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + + ref = IVMRSurfaceAllocatorNotify9_Release(notify); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3284,6 +3311,7 @@ START_TEST(vmr9) test_renderless_formats(); test_mixing_mode(); test_clipping_window(); + test_surface_allocator_notify_refcount(); CoUninitialize(); } -- 2.26.2

2 4

[PATCH] kernel32/tests: Account for unsupported NLSVERSIONINFOEX.
by Zebediah Figura 04 May '20

04 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/locale.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4c1e1b4d73..a8efb60eb5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6653,17 +6653,29 @@ static void test_NLSVersion(void) win_skip( "GetNLSVersion not available\n" ); return; } + SetLastError( 0xdeadbeef ); memset( &info, 0xcc, sizeof(info) ); - info.dwNLSVersionInfoSize = sizeof(info); + info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId ); ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), (NLSVERSIONINFO *)&info ); ok( ret, "GetNLSVersion failed err %u\n", GetLastError() ); - ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), - "wrong id %x\n", info.dwEffectiveId ); - ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) || - broken( IsEqualIID( &info.guidCustomVersion, &guid_null )), /* <= win7 */ - "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) ); + + SetLastError( 0xdeadbeef ); + memset( &info, 0xcc, sizeof(info) ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), + (NLSVERSIONINFO *)&info ); + ok( ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER /* < Vista */, + "GetNLSVersion failed err %u\n", GetLastError() ); + if (ret) + { + ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), + "wrong id %x\n", info.dwEffectiveId ); + ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) || + broken( IsEqualIID( &info.guidCustomVersion, &guid_null )), /* <= win7 */ + "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) ); + } SetLastError( 0xdeadbeef ); info.dwNLSVersionInfoSize = 8; -- 2.26.2

1 1

[PATCH 1/3] winevulkan: Support struct forward-declarations as base types.
by Philip Rebohle 04 May '20

04 May '20

Some types are basically forward-declared structs now, such as ANativeWindow. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5d9889620ed..e24dac99011 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -253,7 +253,10 @@ class VkBaseType(object): def definition(self): # Definition is similar for alias or non-alias as type # is already set to alias. - return "typedef {0} {1};\n".format(self.type, self.name) + if not self.type is None: + return "typedef {0} {1};\n".format(self.type, self.name) + else: + return "struct {0};\n".format(self.name) def is_alias(self): return bool(self.alias) @@ -2953,7 +2956,9 @@ class VkRegistry(object): if type_info["category"] == "basetype": name = t.find("name").text - _type = t.find("type").text + _type = None + if not t.find("type") is None: + _type = t.find("type").text basetype = VkBaseType(name, _type) base_types.append(basetype) type_info["data"] = basetype -- 2.26.2

2 9

[PATCH v2 1/2] server: Introduce a separate FD type for file mapping.
by Paul Gofman 04 May '20

04 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - no changes. server/mapping.c | 2 +- server/protocol.def | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 6990a1913d..1c189a282b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -934,7 +934,7 @@ static void mapping_destroy( struct object *obj ) static enum server_fd_type mapping_get_fd_type( struct fd *fd ) { - return FD_TYPE_FILE; + return FD_TYPE_MAPPING; } int get_page_size(void) diff --git a/server/protocol.def b/server/protocol.def index 06a29b153e..9f60e323b6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1318,6 +1318,7 @@ enum server_fd_type FD_TYPE_MAILSLOT, /* mailslot */ FD_TYPE_CHAR, /* unspecified char device */ FD_TYPE_DEVICE, /* Windows device file */ + FD_TYPE_MAPPING, /* File mapping */ FD_TYPE_NB_TYPES }; -- 2.26.2

2 4

[PATCH] include: Introduce WINE_USE_LONG macro.
by Jacek Caban 04 May '20

04 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/guiddef.h | 2 +- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winnt.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 5/5] winegcc: Add support for msvc target.
by Jacek Caban 04 May '20

04 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- For testing, this is enough to build simple executables using an existing Wine built with llvm-mingw, but specifying x86_64-windows target (although mixing static libs is not really the right thing). tools/winegcc/winegcc.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-)

1 0

[PATCH 4/5] winegcc: Use libgcc only on mingw target.
by Jacek Caban 04 May '20

04 May '20

It's not available for msvc, but we get all we need from importlibs there. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/5] winegcc: Make mingw a separated platform from msvc.
by Jacek Caban 04 May '20

04 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It follows how clang interprets targets. tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 24 +++++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-)

1 0

[PATCH 2/5] winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used.
by Jacek Caban 04 May '20

04 May '20

Linkers don't agree on its default. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 1/5] winegcc: Add entry symbol underscore when building linker command.
by Jacek Caban 04 May '20

04 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)

1 0

[PATCH 1/4] comctl32/header: Use wide string literals.
by Nikolay Sivov 04 May '20

04 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c70960484a..085549fed6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,7 @@ static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(const HEADER_INFO *infoPtr, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(const HEADER_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, const RECT *rect); -static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static const WCHAR themeClass[] = L"Header"; static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,9 +146,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - static const WCHAR emptyString[] = {0}; - - LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + const WCHAR *pszText = phdi->pszText != NULL ? phdi->pszText : L""; if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else -- 2.26.2

1 3

[PATCH 2/2] msvcrt: Fix 0 parsing in parse_double helper.
by Piotr Caban 04 May '20

04 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 1

[PATCH 1/2] msvcrt: Cleanup strtod tests.
by Piotr Caban 04 May '20

04 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 92 ++++++++++++++------------------------ 1 file changed, 33 insertions(+), 59 deletions(-)

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll signed
by Alon Barzilai 04 May '20

04 May '20

Hi, I am new to the list. I am trying to send this patch to the list. I get the message from the list with the patch but I do not see it in the list archives, testbot logs or patch status page Alon. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon(a)skylinesoft.com> --- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..e308ab0973 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,45 @@ static void testQuery(void) break; } } + + /* test RtlQueryEnvironmentVariable */ + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +568,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

2 1

[PATCH v3 2/2] ntdll: Deny file operations on mapping handles.
by Paul Gofman 04 May '20

04 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't add redundant checks on server. v3: - always pass &fd_type instead of type in server_get_unix_fd(). dlls/ntdll/file.c | 6 +++++- dlls/ntdll/server.c | 18 ++++++++++++++---- dlls/ntdll/tests/om.c | 44 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9997a5e1cd..33f78b63ac 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3266,10 +3266,11 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io PVOID buffer, ULONG length, FS_INFORMATION_CLASS info_class ) { + enum server_fd_type type; int fd, needs_close; struct stat st; - io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); + io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, &type, NULL ); if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { SERVER_START_REQ( get_volume_info ) @@ -3285,6 +3286,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } else if (io->u.Status) return io->u.Status; + if (type == FD_TYPE_MAPPING) + return STATUS_OBJECT_TYPE_MISMATCH; + io->u.Status = STATUS_NOT_IMPLEMENTED; io->Information = 0; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3832a80f1e..214c11c8f2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1073,6 +1073,7 @@ int server_remove_fd_from_cache( HANDLE handle ) int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) { + enum server_fd_type fd_type = FD_TYPE_NB_TYPES; sigset_t sigset; obj_handle_t fd_handle; int ret, fd = -1; @@ -1082,11 +1083,11 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, *needs_close = 0; wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; - ret = get_cached_fd( handle, &fd, type, &access, options ); + ret = get_cached_fd( handle, &fd, &fd_type, &access, options ); if (ret != STATUS_INVALID_HANDLE) goto done; server_enter_uninterrupted_section( &fd_cache_section, &sigset ); - ret = get_cached_fd( handle, &fd, type, &access, options ); + ret = get_cached_fd( handle, &fd, &fd_type, &access, options ); if (ret == STATUS_INVALID_HANDLE) { SERVER_START_REQ( get_handle_fd ) @@ -1094,7 +1095,7 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, req->handle = wine_server_obj_handle( handle ); if (!(ret = wine_server_call( req ))) { - if (type) *type = reply->type; + fd_type = reply->type; if (options) *options = reply->options; access = reply->access; if ((fd = receive_fd( &fd_handle )) != -1) @@ -1116,12 +1117,21 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, server_leave_uninterrupted_section( &fd_cache_section, &sigset ); done: + if (!ret && wanted_access && fd_type == FD_TYPE_MAPPING) + ret = STATUS_INVALID_HANDLE; + if (!ret && ((access & wanted_access) != wanted_access)) { ret = STATUS_ACCESS_DENIED; if (*needs_close) close( fd ); } - if (!ret) *unix_fd = fd; + if (!ret) + { + if (type) + *type = fd_type; + + *unix_fd = fd; + } return ret; } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c17b6ffa8d..b6a338596e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -23,6 +23,7 @@ #include "winternl.h" #include "stdio.h" #include "winnt.h" +#include "winioctl.h" #include "stdlib.h" static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); @@ -72,6 +73,8 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)( HANDLE handle, PIO_STATUS_BLOCK io, PVOID buffer, + ULONG length, FS_INFORMATION_CLASS info_class ); static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); @@ -1585,9 +1588,16 @@ static void test_query_object(void) static void test_type_mismatch(void) { - HANDLE h; - NTSTATUS res; + char tmp_path[MAX_PATH], file_name[MAX_PATH + 16]; + FILE_FS_DEVICE_INFORMATION info; OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + LARGE_INTEGER size; + HANDLE h, hfile; + DWORD length; + NTSTATUS res; + DWORD type; + BOOL ret; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -1603,6 +1613,35 @@ static void test_type_mismatch(void) ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %x\n", res); pNtClose( h ); + + GetTempPathA(MAX_PATH, tmp_path); + GetTempFileNameA(tmp_path, "foo", 0, file_name); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_FLAG_DELETE_ON_CLOSE, 0); + ok(hfile != INVALID_HANDLE_VALUE, "Got unexpected hfile %p.\n", hfile); + + size.QuadPart = 256; + res = pNtCreateSection(&h, SECTION_MAP_WRITE | SECTION_MAP_READ, NULL, &size, + PAGE_READWRITE, SEC_COMMIT, hfile); + ok(res == STATUS_SUCCESS , "Got unexpected res %x\n", res); + + res = pNtQueryVolumeInformationFile(h, &io, &info, sizeof(info), FileFsDeviceInformation); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected result %#x.\n", res); + + type = GetFileType(h); + ok(type == FILE_TYPE_UNKNOWN, "Got unexpected type %#x.\n", type); + + SetLastError(0xdeadbeef); + ret = WriteFile(h, file_name, 16, &length, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected ret %#x, GetLastError() %#x.\n", + ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(h, file_name, 16, &length, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected ret %#x, GetLastError() %#x.\n", + ret, GetLastError()); + pNtClose(h); + CloseHandle(hfile); } static void test_event(void) @@ -2207,6 +2246,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); test_case_sensitive(); test_namespace_pipe(); -- 2.26.2

1 0

[PATCH 1/6] dwrite: Add separate structure for top level gsub/gpos offsets.
by Nikolay Sivov 04 May '20

04 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 16 +++++++++------- dlls/dwrite/opentype.c | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5755696875..d89dacb3a4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -434,19 +434,21 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + struct scriptshaping_cache { const struct shaping_font_ops *font; void *context; UINT16 upem; - struct - { - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; - } gpos; + struct ot_gsubgpos_table gpos; struct { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0307cd5981..66c3398316 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2962,10 +2962,11 @@ void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) cache->gdef.classdef = table_read_be_word(&cache->gdef.table, FIELD_OFFSET(struct gdef_header, classdef)); } -DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD script, +unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, DWORD script, unsigned int *script_index) { - WORD script_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 script_count; unsigned int i; *script_index = ~0u; @@ -2973,14 +2974,14 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD if (kind != MS_GPOS_TAG) return 0; - script_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list); + script_count = table_read_be_word(&table->table, table->script_list); if (!script_count) return 0; for (i = 0; i < script_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + i * sizeof(struct ot_script_record)); + unsigned int tag = table_read_dword(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + i * sizeof(struct ot_script_record)); if (!tag) continue; @@ -2994,10 +2995,11 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD return 0; } -DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD language, +unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, DWORD language, unsigned int script_index, unsigned int *language_index) { - WORD table_offset, lang_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 table_offset, lang_count; unsigned int i; *language_index = ~0u; @@ -3005,17 +3007,16 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO if (kind != MS_GPOS_TAG) return 0; - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return 0; - lang_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + lang_count = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys_count)); for (i = 0; i < lang_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + table_offset + + unsigned int tag = table_read_dword(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + i * sizeof(struct ot_langsys_record)); if (tag == language) @@ -3026,7 +3027,7 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO } /* Try 'defaultLangSys' if it's set. */ - if (table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset)) + if (table_read_be_word(&table->table, table->script_list + table_offset)) return ~0u; return 0; -- 2.26.2

1 5

[PATCH] ntdll: Add missing RtlQueryEnvironmentVariable function
by Alon Barzilai 04 May '20

04 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon.barzilai(a)gmail.com> --- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 1

[PATCH] winspool.drv: return success in AddPrintProcessorA
by Austin English 04 May '20

04 May '20

This syncs the return value with AddPrintProcessorW Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 593f091c2d..0ddca147e6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5405,7 +5405,7 @@ BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, { FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + return TRUE; } /***************************************************************************** -- 2.24.1

2 1

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon.barzilai@gmail.com>
by Alon Barzilai 04 May '20

04 May '20

--- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 1

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon.barzilai@gmail.com>
by Alon Barzilai 04 May '20

04 May '20

--- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon@skylinesoft.com>
by Alon Barzilai 04 May '20

04 May '20

From: Alon Barzilai <alon(a)skylinesoft.com> --- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon@skylinesoft.com>
by Alon Barzilai 03 May '20

03 May '20

--- dlls/ntdll/env.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..59aac39a7b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -990,6 +990,44 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(WCHAR* env, WCHAR* name, SIZE_T name_length, WCHAR* value, SIZE_T value_length, SIZE_T* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + if (nts == STATUS_SUCCESS) + { + *return_length = value_u.Length / sizeof(WCHAR); + } + else + { + if (nts == STATUS_BUFFER_TOO_SMALL) + { + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + } + else + { + *return_length = value_u.Length / sizeof(WCHAR); + } + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..07ec0a08c6 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + SIZE_T name_length; + SIZE_T value_length; + SIZE_T return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,44 @@ static void testQuery(void) break; } } + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +567,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 1

[PATCH] ntoskrnl.exe: Implement IoIs32bitProcess().
by Zebediah Figura 03 May '20

03 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49088 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + include/ddk/wdm.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6ee08f7202..1aa34c9b27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2145,6 +2145,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); + IsWow64Process( handle, &process->wow64 ); return process; } @@ -3884,6 +3885,17 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) return irp->Tail.Overlay.Thread->kthread.process; } +#ifdef _WIN64 +/*********************************************************************** + * IoIs32bitProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process->wow64; +} +#endif + /*********************************************************************** * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 14d95a47f8..8e3b127b16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -416,6 +416,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState +@ stdcall -arch=win64 IoIs32bitProcess(ptr) @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous @ stub IoIsSystemThread diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 256e945e6f..23f03c336d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,7 @@ struct _EPROCESS { DISPATCHER_HEADER header; PROCESS_BASIC_INFORMATION info; + BOOL wow64; }; struct _KTHREAD diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 60396779fc..db8073ebe3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1608,6 +1608,9 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +#ifdef _WIN64 +BOOLEAN WINAPI IoIs32bitProcess(IRP*); +#endif NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

1 0

[PATCH v3 1/2] cmd: Fix regression in if condition parsing.
by Bernhard Übelacker 03 May '20

03 May '20

Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Therefore if conditions got influenced by values of the previous line. v3: Unchanged, but patchwatcher did not run tests last time. Supersedes 184644 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1870e5688da..70ccddebc11 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2819f7fa99f..16843e40873 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len; -- 2.20.1

2 2

[PATCH resend] msi: Avoid an uninitialized compiler warning in InstallerImpl_SummaryInformation.
by Gerald Pfeifer 03 May '20

03 May '20

[ https://www.winehq.org/pipermail/wine-devel/2020-February/159977.html has the original submissions; I just verified it still occurs. ] According to my visually tracing to the sources this looks like a false positive, alas a tricky one, and GCC 10 warns, hence this straightforward approach to silence it - which is conservative programming in any case. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msi/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..489adc96a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1837,7 +1837,7 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, UINT ret; HRESULT hr; MSIHANDLE hsuminfo; - IDispatch *dispatch; + IDispatch *dispatch = 0; VARIANTARG varg0, varg1; if (!(wFlags & DISPATCH_PROPERTYGET)) -- 2.25.0

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll
by Alon Barzilai 03 May '20

03 May '20

--- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..bb081e20ed 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,45 @@ static void testQuery(void) break; } } + + //test RtlQueryEnvironmentVariable + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +568,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

3 3

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll signed
by Alon Barzilai 03 May '20

03 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48773 Signed-off-by: Alon Barzilai <alon(a)skylinesoft.com> --- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..e308ab0973 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,45 @@ static void testQuery(void) break; } } + + /* test RtlQueryEnvironmentVariable */ + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +568,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 0

[PATCH] riched20: Include wine/asm.h in editstr.h.
by Jacek Caban 03 May '20

03 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH] Add missing RtlQueryEnvironmentVariable to ntdll with sign
by Alon Barzilai 03 May '20

03 May '20

--- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..bb081e20ed 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,45 @@ static void testQuery(void) break; } } + + /* test RtlQueryEnvironmentVariable */ + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } + else + { + win_skip("RtlQueryEnvironmentVariable not available, skipping tests\n"); + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +568,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 0

[PATCH 1/3] ddraw/tests: Add more tests for EnumSurfaces().
by Zebediah Figura 03 May '20

03 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 153 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 153 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 163 +++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 164 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 620 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4e27ecfb796..34ebfab1b7b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12091,9 +12091,27 @@ static void test_clear(void) DestroyWindow(window); } +struct display_mode_list +{ + DDSURFACEDESC modes[20]; + unsigned int count; +}; + +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct display_mode_list *modes = context; + + if (modes->count < ARRAY_SIZE(modes->modes)) + modes->modes[modes->count] = *desc; + ++modes->count; + + return DDENUMRET_OK; +} + struct enum_surfaces_param { IDirectDrawSurface *surfaces[8]; + struct display_mode_list modes; unsigned int count; }; @@ -12119,9 +12137,31 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes.modes)) + { + const DDSURFACEDESC *expect = &param->modes.modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&desc->ddpfPixelFormat, &expect->ddpfPixelFormat, sizeof(desc->ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { struct enum_surfaces_param param = {{0}}; + DDPIXELFORMAT current_format; IDirectDraw *ddraw; DDSURFACEDESC desc; HRESULT hr; @@ -12129,8 +12169,21 @@ static void test_enum_surfaces(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -12150,6 +12203,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -12161,9 +12215,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.modes.count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw_EnumDisplayModes(ddraw, 0, &desc, &param.modes, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.modes.count, "Expected %u surfaces, got %u.\n", param.modes.count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes.modes[0].dwWidth = param.modes.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7c25b2be557..90f7b77c839 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13067,9 +13067,27 @@ static void test_clear(void) DestroyWindow(window); } +struct display_mode_list +{ + DDSURFACEDESC modes[20]; + unsigned int count; +}; + +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct display_mode_list *modes = context; + + if (modes->count < ARRAY_SIZE(modes->modes)) + modes->modes[modes->count] = *desc; + ++modes->count; + + return DDENUMRET_OK; +} + struct enum_surfaces_param { IDirectDrawSurface *surfaces[8]; + struct display_mode_list modes; unsigned int count; }; @@ -13095,9 +13113,31 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes.modes)) + { + const DDSURFACEDESC *expect = &param->modes.modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&desc->ddpfPixelFormat, &expect->ddpfPixelFormat, sizeof(desc->ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { struct enum_surfaces_param param = {{0}}; + DDPIXELFORMAT current_format; IDirectDraw2 *ddraw; DDSURFACEDESC desc; HRESULT hr; @@ -13105,8 +13145,21 @@ static void test_enum_surfaces(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -13126,6 +13179,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -13137,9 +13191,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.modes.count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw2_EnumDisplayModes(ddraw, 0, &desc, &param.modes, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.modes.count, "Expected %u surfaces, got %u.\n", param.modes.count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes.modes[0].dwWidth = param.modes.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface2_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c38c0b3ce5a..8012e10a19c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15655,9 +15655,27 @@ static void test_clear(void) DestroyWindow(window); } +struct display_mode_list +{ + DDSURFACEDESC2 modes[20]; + unsigned int count; +}; + +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct display_mode_list *modes = context; + + if (modes->count < ARRAY_SIZE(modes->modes)) + modes->modes[modes->count] = *desc; + ++modes->count; + + return DDENUMRET_OK; +} + struct enum_surfaces_param { IDirectDrawSurface4 *surfaces[8]; + struct display_mode_list modes; unsigned int count; }; @@ -15683,9 +15701,31 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes.modes)) + { + const DDSURFACEDESC2 *expect = &param->modes.modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { struct enum_surfaces_param param = {{0}}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw4 *ddraw; HRESULT hr; @@ -15693,8 +15733,21 @@ static void test_enum_surfaces(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15704,30 +15757,128 @@ static void test_enum_surfaces(void) desc.dwWidth = 32; desc.dwHeight = 32; hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); - ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to create a surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface4_Release(param.surfaces[2]); IDirectDrawSurface4_Release(param.surfaces[1]); IDirectDrawSurface4_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.modes.count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw4_EnumDisplayModes(ddraw, 0, &desc, &param.modes, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.modes.count, "Expected %u surfaces, got %u.\n", param.modes.count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes.modes[0].dwWidth = param.modes.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface4_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d3ea36e9808..d94676ba5e6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15058,9 +15058,27 @@ static void test_clear(void) DestroyWindow(window); } +struct display_mode_list +{ + DDSURFACEDESC2 modes[20]; + unsigned int count; +}; + +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct display_mode_list *modes = context; + + if (modes->count < ARRAY_SIZE(modes->modes)) + modes->modes[modes->count] = *desc; + ++modes->count; + + return DDENUMRET_OK; +} + struct enum_surfaces_param { IDirectDrawSurface7 *surfaces[8]; + struct display_mode_list modes; unsigned int count; }; @@ -15086,9 +15104,31 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes.modes)) + { + const DDSURFACEDESC2 *expect = &param->modes.modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { struct enum_surfaces_param param = {{0}}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw7 *ddraw; HRESULT hr; @@ -15096,8 +15136,24 @@ static void test_enum_surfaces(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15114,27 +15170,125 @@ static void test_enum_surfaces(void) } hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface7_Release(param.surfaces[2]); IDirectDrawSurface7_Release(param.surfaces[1]); IDirectDrawSurface7_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.modes.count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw7_EnumDisplayModes(ddraw, 0, &desc, &param.modes, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.modes.count, "Expected %u surfaces, got %u.\n", param.modes.count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes.modes[0].dwWidth = param.modes.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw7_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface7_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw7_Release(ddraw); } -- 2.26.2

2 5

[PATCH 1/2] ntoskrnl.exe: Protect relocated pages one at a time.
by Zebediah Figura 03 May '20

03 May '20

Blindwrite 7's ezplay.sys has sections which are consecutive in memory but not page aligned. Thus changing the protection to PROT_READWRITE one section at a time has the effect that old_prot for all sections but the first is set to PROT_READWRITE (actually, PROT_WRITECOPY), causing us to restore the wrong protection and the driver to crash in its entry point. To fix this, protect and unprotect one page at a time while processing it, i.e. essentially revert 6c0a8c359. To avoid reintroducing bug 28254, protect two pages at a time instead of just one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 39 ++++++++++-------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 398f1dacfd..6ee08f7202 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3327,16 +3327,13 @@ static inline void *get_rva( HMODULE module, DWORD va ) return (void *)((char *)module + va); } -/* Copied from ntdll with checks for page alignment and characteristics removed */ -static NTSTATUS perform_relocations( void *module, SIZE_T len ) +static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) { IMAGE_NT_HEADERS *nt; char *base; IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - const IMAGE_SECTION_HEADER *sec; INT_PTR delta; - ULONG protect_old[96], i; nt = RtlImageNtHeader( module ); base = (char *)nt->OptionalHeader.ImageBase; @@ -3355,19 +3352,6 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) if (!relocs->Size) return STATUS_SUCCESS; if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; - if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) - return STATUS_INVALID_IMAGE_FORMAT; - - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, PAGE_READWRITE, &protect_old[i] ); - } - TRACE( "relocating from %p-%p to %p-%p\n", base, base + len, module, (char *)module + len ); @@ -3377,25 +3361,24 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) while (rel < end - 1 && rel->SizeOfBlock) { + void *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot; + if (rel->VirtualAddress >= len) { WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); return STATUS_ACCESS_VIOLATION; } - rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + + /* Relocation entries may hang over the end of the page, so we need to + * protect two pages. */ + VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + VirtualProtect( page, page_size * 2, old_prot, &old_prot ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; } - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, protect_old[i], &protect_old[i] ); - } - return STATUS_SUCCESS; } @@ -3424,7 +3407,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + status = perform_relocations( module, nt->OptionalHeader.SizeOfImage, info.PageSize ); if (status != STATUS_SUCCESS) goto error; -- 2.26.2

2 2

[PATCH v2 1/2] user32/tests: Add test for RedrawWindow with RDW_VALIDATE flag.
by Roman Pišl 02 May '20

02 May '20

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/user32/tests/msg.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 93ab7b4a27..2763857d8a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -136,7 +136,8 @@ typedef enum { optional=0x80, hook=0x100, winevent_hook=0x200, - kbd_hook=0x400 + kbd_hook=0x400, + has_update=0x800 } msg_flags_t; struct message { @@ -2547,6 +2548,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message); if ((expected->flags & kbd_hook) != (actual->flags & kbd_hook)) dump++; + todo_wine_if(expected->flags & has_update) + ok_( file, line) (!(expected->flags & has_update) || (actual->flags & has_update), + "%s: %u: the msg 0x%04x should have update region\n", + context, count, expected->message); + expected++; actual++; } @@ -7858,6 +7864,11 @@ static const struct message WmPaint[] = { { 0 } }; +static const struct message WmPaintUpdate[] = { + { WM_PAINT, sent|has_update }, + { 0 } +}; + static const struct message WmParentOnlyPaint[] = { { WM_PAINT, sent|parent }, { 0 } @@ -8217,6 +8228,16 @@ static void test_paint_messages(void) } ok_sequence( WmGetUpdateRect, "GetUpdateRect", FALSE ); + /* RedrawWindow with RDW_VALIDATE triggers WM_PAINT with non-empty update region */ + flush_sequence(); + InvalidateRect( hwnd, NULL, FALSE ); + GetClientRect( hwnd, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hwnd, hrgn ); + RedrawWindow( hwnd, &rect, NULL, RDW_INTERNALPAINT|RDW_NOERASE|RDW_NOFRAME|RDW_UPDATENOW|RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + ok_sequence( WmPaintUpdate, "PaintUpdate", FALSE ); + DestroyWindow( hwnd ); /* now test with a child window */ @@ -9531,6 +9552,9 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; if (beginpaint_counter) msg.flags |= beginpaint; + + if (message == WM_PAINT && GetUpdateRect(hwnd, NULL, FALSE)) msg.flags |= has_update; + msg.wParam = wParam; msg.lParam = lParam; msg.descr = "MsgCheckProc"; -- 2.20.1

2 3

[PATCH v3 0/1] Fix for drag and drop from native applications.
by Roman Pišl 02 May '20

02 May '20

Hello, this is a third revision of the patch with minor fixes (missing DECLSPEC_HIDDEN and better naming of the message) and my last try to get ACK/NAK/you screwed completely. The question that may arise is, whether this should not be a part of X11DRV_ClientMessage in a more generic way. I think it is worth the effort as it fixes multiple applications. Regards, Roman Roman Pišl (1): winex11.drv: Avoid freezing when dropping from native into Wine application that shows modal dialog. dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 4 +++- dlls/winex11.drv/xdnd.c | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) -- 2.20.1

1 1

[PATCH 1/2] server: Introduce a separate FD type for file mapping.
by Paul Gofman 02 May '20

02 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/mapping.c | 2 +- server/protocol.def | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 6990a1913d..1c189a282b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -934,7 +934,7 @@ static void mapping_destroy( struct object *obj ) static enum server_fd_type mapping_get_fd_type( struct fd *fd ) { - return FD_TYPE_FILE; + return FD_TYPE_MAPPING; } int get_page_size(void) diff --git a/server/protocol.def b/server/protocol.def index 06a29b153e..9f60e323b6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1318,6 +1318,7 @@ enum server_fd_type FD_TYPE_MAILSLOT, /* mailslot */ FD_TYPE_CHAR, /* unspecified char device */ FD_TYPE_DEVICE, /* Windows device file */ + FD_TYPE_MAPPING, /* File mapping */ FD_TYPE_NB_TYPES }; -- 2.26.2

2 3

[PATCH 1/5] quartz/tests: Add some tests for IVMRWindowlessControl9::SetVideoClippingWindow().
by Zebediah Figura 02 May '20

02 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cb04d0b4aa5..a098416bb2c 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3191,6 +3191,68 @@ static void test_mixing_mode(void) DestroyWindow(window); } +static void test_clipping_window(void) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biBitCount = 32, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB32, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); + IVMRWindowlessControl9 *windowless_control; + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + HWND window; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + testfilter_init(&source); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"vmr9"); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, (HWND)0xdeadbeef); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IVMRWindowlessControl9_Release(windowless_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3221,6 +3283,7 @@ START_TEST(vmr9) test_allocate_surface_helper(); test_renderless_formats(); test_mixing_mode(); + test_clipping_window(); CoUninitialize(); } -- 2.26.2

2 9

[PATCH] advapi32: Move string SID/SD conversion functions to sechost.
by Zebediah Figura 01 May '20

01 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/advapi32.spec | 8 +- dlls/advapi32/security.c | 1314 ----------------------------------- dlls/sechost/Makefile.in | 1 + dlls/sechost/sechost.spec | 8 +- dlls/sechost/security.c | 1247 +++++++++++++++++++++++++++++++++ 5 files changed, 1256 insertions(+), 1322 deletions(-) create mode 100644 dlls/sechost/security.c diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cd4dedac74..ac8ea6268a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -120,17 +120,17 @@ # @ stub ConvertSecurityDescriptorToAccessNamedW # @ stub ConvertSecurityDescriptorToAccessW @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorA(ptr long long ptr ptr) -@ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) +@ stdcall -import ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) @ stdcall ConvertSidToStringSidA(ptr ptr) -@ stdcall ConvertSidToStringSidW(ptr ptr) +@ stdcall -import ConvertSidToStringSidW(ptr ptr) # @ stub ConvertStringSDToSDDomainA # @ stub ConvertStringSDToSDDomainW # @ stub ConvertStringSDToSDRootDomainA # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) -@ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) +@ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) @ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall ConvertStringSidToSidW(ptr ptr) +@ stdcall -import ConvertStringSidToSidW(ptr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d3c9a6c1e2..fe2f0d9266 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -47,15 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); static DWORD trustee_to_sid(DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee); -typedef struct _ACEFLAG -{ - LPCWSTR wstr; - DWORD value; -} ACEFLAG, *LPACEFLAG; - typedef struct _MAX_SID { /* same fields as struct _SID */ @@ -65,97 +58,6 @@ typedef struct _MAX_SID DWORD SubAuthority[SID_MAX_SUB_AUTHORITIES]; } MAX_SID; -typedef struct WELLKNOWNSID -{ - WCHAR wstr[2]; - WELL_KNOWN_SID_TYPE Type; - MAX_SID Sid; -} WELLKNOWNSID; - -static const WELLKNOWNSID WellKnownSids[] = -{ - { {0,0}, WinNullSid, { SID_REVISION, 1, { SECURITY_NULL_SID_AUTHORITY }, { SECURITY_NULL_RID } } }, - { {'W','D'}, WinWorldSid, { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } } }, - { {0,0}, WinLocalSid, { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } } }, - { {'C','O'}, WinCreatorOwnerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RID } } }, - { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, - { {'O','W'}, WinCreatorOwnerRightsSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RIGHTS_RID } } }, - { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, - { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, - { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, - { {0,0}, WinDialupSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_DIALUP_RID } } }, - { {'N','U'}, WinNetworkSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_RID } } }, - { {0,0}, WinBatchSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BATCH_RID } } }, - { {'I','U'}, WinInteractiveSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } } }, - { {'S','U'}, WinServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_SERVICE_RID } } }, - { {'A','N'}, WinAnonymousSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } } }, - { {0,0}, WinProxySid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PROXY_RID } } }, - { {'E','D'}, WinEnterpriseControllersSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ENTERPRISE_CONTROLLERS_RID } } }, - { {'P','S'}, WinSelfSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PRINCIPAL_SELF_RID } } }, - { {'A','U'}, WinAuthenticatedUserSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } } }, - { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, - { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, - { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, - { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, - { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, - { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, - { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, - { {0,0}, WinBuiltinDomainSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID } } }, - { {'B','A'}, WinBuiltinAdministratorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } } }, - { {'B','U'}, WinBuiltinUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } } }, - { {'B','G'}, WinBuiltinGuestsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_GUESTS } } }, - { {'P','U'}, WinBuiltinPowerUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS } } }, - { {'A','O'}, WinBuiltinAccountOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ACCOUNT_OPS } } }, - { {'S','O'}, WinBuiltinSystemOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_SYSTEM_OPS } } }, - { {'P','O'}, WinBuiltinPrintOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PRINT_OPS } } }, - { {'B','O'}, WinBuiltinBackupOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_BACKUP_OPS } } }, - { {'R','E'}, WinBuiltinReplicatorSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REPLICATOR } } }, - { {'R','U'}, WinBuiltinPreWindows2000CompatibleAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PREW2KCOMPACCESS } } }, - { {'R','D'}, WinBuiltinRemoteDesktopUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS } } }, - { {'N','O'}, WinBuiltinNetworkConfigurationOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS } } }, - { {0,0}, WinNTLMAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_NTLM_RID } } }, - { {0,0}, WinDigestAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_DIGEST_RID } } }, - { {0,0}, WinSChannelAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_SCHANNEL_RID } } }, - { {0,0}, WinThisOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_THIS_ORGANIZATION_RID } } }, - { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, - { {0,0}, WinBuiltinIncomingForestTrustBuildersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS } } }, - { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, - { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, - { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, - { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, - { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, - { {'L','W'}, WinLowLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_LOW_RID} } }, - { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, - { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, - { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, - { {'A','C'}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, -}; - -/* these SIDs must be constructed as relative to some domain - only the RID is well-known */ -typedef struct WELLKNOWNRID -{ - WCHAR wstr[2]; - WELL_KNOWN_SID_TYPE Type; - DWORD Rid; -} WELLKNOWNRID; - -static const WELLKNOWNRID WellKnownRids[] = { - { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, - { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, - { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { {'D','A'}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { {'D','U'}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { {'D','G'}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { {'D','C'}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { {'D','D'}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { {'C','A'}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { {'S','A'}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { {'E','A'}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { {'P','A'}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, -}; - - typedef struct _AccountSid { WELL_KNOWN_SID_TYPE type; LPCWSTR account; @@ -275,69 +177,6 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, { WinBuiltinAnyPackageSid, ALL_APPLICATION_PACKAGES, APPLICATION_PACKAGE_AUTHORITY, SidTypeWellKnownGroup }, }; -/* - * ACE access rights - */ -static const WCHAR SDDL_READ_CONTROL[] = {'R','C',0}; -static const WCHAR SDDL_WRITE_DAC[] = {'W','D',0}; -static const WCHAR SDDL_WRITE_OWNER[] = {'W','O',0}; -static const WCHAR SDDL_STANDARD_DELETE[] = {'S','D',0}; - -static const WCHAR SDDL_READ_PROPERTY[] = {'R','P',0}; -static const WCHAR SDDL_WRITE_PROPERTY[] = {'W','P',0}; -static const WCHAR SDDL_CREATE_CHILD[] = {'C','C',0}; -static const WCHAR SDDL_DELETE_CHILD[] = {'D','C',0}; -static const WCHAR SDDL_LIST_CHILDREN[] = {'L','C',0}; -static const WCHAR SDDL_SELF_WRITE[] = {'S','W',0}; -static const WCHAR SDDL_LIST_OBJECT[] = {'L','O',0}; -static const WCHAR SDDL_DELETE_TREE[] = {'D','T',0}; -static const WCHAR SDDL_CONTROL_ACCESS[] = {'C','R',0}; - -static const WCHAR SDDL_FILE_ALL[] = {'F','A',0}; -static const WCHAR SDDL_FILE_READ[] = {'F','R',0}; -static const WCHAR SDDL_FILE_WRITE[] = {'F','W',0}; -static const WCHAR SDDL_FILE_EXECUTE[] = {'F','X',0}; - -static const WCHAR SDDL_KEY_ALL[] = {'K','A',0}; -static const WCHAR SDDL_KEY_READ[] = {'K','R',0}; -static const WCHAR SDDL_KEY_WRITE[] = {'K','W',0}; -static const WCHAR SDDL_KEY_EXECUTE[] = {'K','X',0}; - -static const WCHAR SDDL_GENERIC_ALL[] = {'G','A',0}; -static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; -static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; -static const WCHAR SDDL_GENERIC_EXECUTE[] = {'G','X',0}; - -static const WCHAR SDDL_NO_READ_UP[] = {'N','R',0}; -static const WCHAR SDDL_NO_WRITE_UP[] = {'N','W',0}; -static const WCHAR SDDL_NO_EXECUTE_UP[] = {'N','X',0}; - -/* - * ACL flags - */ -static const WCHAR SDDL_PROTECTED[] = {'P',0}; -static const WCHAR SDDL_AUTO_INHERIT_REQ[] = {'A','R',0}; -static const WCHAR SDDL_AUTO_INHERITED[] = {'A','I',0}; - -/* - * ACE types - */ -static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; -static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; -static const WCHAR SDDL_AUDIT[] = {'A','U',0}; -static const WCHAR SDDL_ALARM[] = {'A','L',0}; -static const WCHAR SDDL_MANDATORY_LABEL[] = {'M','L',0}; - -/* - * ACE flags - */ -static const WCHAR SDDL_CONTAINER_INHERIT[] = {'C','I',0}; -static const WCHAR SDDL_OBJECT_INHERIT[] = {'O','I',0}; -static const WCHAR SDDL_NO_PROPAGATE[] = {'N','P',0}; -static const WCHAR SDDL_INHERIT_ONLY[] = {'I','O',0}; -static const WCHAR SDDL_INHERITED[] = {'I','D',0}; -static const WCHAR SDDL_AUDIT_SUCCESS[] = {'S','A',0}; -static const WCHAR SDDL_AUDIT_FAILURE[] = {'F','A',0}; const char * debugstr_sid(PSID sid) { @@ -2807,481 +2646,6 @@ DWORD WINAPI GetAuditedPermissionsFromAclW( PACL pacl, PTRUSTEEW pTrustee, PACCE } -/****************************************************************************** - * ParseAclStringFlags - */ -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) -{ - DWORD flags = 0; - LPCWSTR szAcl = *StringAcl; - - while (*szAcl && *szAcl != '(') - { - if (*szAcl == 'P') - { - flags |= SE_DACL_PROTECTED; - } - else if (*szAcl == 'A') - { - szAcl++; - if (*szAcl == 'R') - flags |= SE_DACL_AUTO_INHERIT_REQ; - else if (*szAcl == 'I') - flags |= SE_DACL_AUTO_INHERITED; - } - szAcl++; - } - - *StringAcl = szAcl; - return flags; -} - -/****************************************************************************** - * ParseAceStringType - */ -static const ACEFLAG AceType[] = -{ - { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, - { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, - { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, - { SDDL_MANDATORY_LABEL,SYSTEM_MANDATORY_LABEL_ACE_TYPE }, - /* - { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, - */ - { NULL, 0 }, -}; - -static BYTE ParseAceStringType(LPCWSTR* StringAcl) -{ - UINT len = 0; - LPCWSTR szAcl = *StringAcl; - const ACEFLAG *lpaf = AceType; - - while (*szAcl == ' ') - szAcl++; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - lpaf++; - - if (!lpaf->wstr) - return 0; - - *StringAcl = szAcl + len; - return lpaf->value; -} - - -/****************************************************************************** - * ParseAceStringFlags - */ -static const ACEFLAG AceFlags[] = -{ - { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, - { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, - { SDDL_INHERITED, INHERITED_ACE }, - { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, - { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, - { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, - { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, - { NULL, 0 }, -}; - -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) -{ - UINT len = 0; - BYTE flags = 0; - LPCWSTR szAcl = *StringAcl; - - while (*szAcl == ' ') - szAcl++; - - while (*szAcl != ';') - { - const ACEFLAG *lpaf = AceFlags; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - lpaf++; - - if (!lpaf->wstr) - return 0; - - flags |= lpaf->value; - szAcl += len; - } - - *StringAcl = szAcl; - return flags; -} - - -/****************************************************************************** - * ParseAceStringRights - */ -static const ACEFLAG AceRights[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - - { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, - { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, - { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, - { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, - { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, - { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, - { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, - { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, - { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, - - { SDDL_FILE_ALL, FILE_ALL_ACCESS }, - { SDDL_FILE_READ, FILE_GENERIC_READ }, - { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, - { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, - - { SDDL_KEY_ALL, KEY_ALL_ACCESS }, - { SDDL_KEY_READ, KEY_READ }, - { SDDL_KEY_WRITE, KEY_WRITE }, - { SDDL_KEY_EXECUTE, KEY_EXECUTE }, - - { SDDL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP }, - { SDDL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP }, - { SDDL_NO_EXECUTE_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP }, - { NULL, 0 }, -}; - -static DWORD ParseAceStringRights(LPCWSTR* StringAcl) -{ - UINT len = 0; - DWORD rights = 0; - LPCWSTR szAcl = *StringAcl; - - while (*szAcl == ' ') - szAcl++; - - if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) - { - LPCWSTR p = szAcl; - - while (*p && *p != ';') - p++; - - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - rights = strtoulW(szAcl, NULL, 16); - szAcl = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); - } - else - { - while (*szAcl != ';') - { - const ACEFLAG *lpaf = AceRights; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - { - lpaf++; - } - - if (!lpaf->wstr) - return 0; - - rights |= lpaf->value; - szAcl += len; - } - } - - *StringAcl = szAcl; - return rights; -} - - -/****************************************************************************** - * ParseStringAclToAcl - * - * dacl_flags(string_ace1)(string_ace2)... (string_acen) - */ -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes) -{ - DWORD val; - DWORD sidlen; - DWORD length = sizeof(ACL); - DWORD acesize = 0; - DWORD acecount = 0; - PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ - DWORD error = ERROR_INVALID_ACL; - - TRACE("%s\n", debugstr_w(StringAcl)); - - if (!StringAcl) - return FALSE; - - if (pAcl) /* pAce is only useful if we're setting values */ - pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); - - /* Parse ACL flags */ - *lpdwFlags = ParseAclStringFlags(&StringAcl); - - /* Parse ACE */ - while (*StringAcl == '(') - { - StringAcl++; - - /* Parse ACE type */ - val = ParseAceStringType(&StringAcl); - if (pAce) - pAce->Header.AceType = (BYTE) val; - if (*StringAcl != ';') - { - error = RPC_S_INVALID_STRING_UUID; - goto lerr; - } - StringAcl++; - - /* Parse ACE flags */ - val = ParseAceStringFlags(&StringAcl); - if (pAce) - pAce->Header.AceFlags = (BYTE) val; - if (*StringAcl != ';') - goto lerr; - StringAcl++; - - /* Parse ACE rights */ - val = ParseAceStringRights(&StringAcl); - if (pAce) - pAce->Mask = val; - if (*StringAcl != ';') - goto lerr; - StringAcl++; - - /* Parse ACE object guid */ - while (*StringAcl == ' ') - StringAcl++; - if (*StringAcl != ';') - { - FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); - goto lerr; - } - StringAcl++; - - /* Parse ACE inherit object guid */ - while (*StringAcl == ' ') - StringAcl++; - if (*StringAcl != ';') - { - FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); - goto lerr; - } - StringAcl++; - - /* Parse ACE account sid */ - if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) - { - while (*StringAcl && *StringAcl != ')') - StringAcl++; - } - - if (*StringAcl != ')') - goto lerr; - StringAcl++; - - acesize = sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; - length += acesize; - if (pAce) - { - pAce->Header.AceSize = acesize; - pAce = (PACCESS_ALLOWED_ACE)((LPBYTE)pAce + acesize); - } - acecount++; - } - - *cBytes = length; - - if (length > 0xffff) - { - ERR("ACL too large\n"); - goto lerr; - } - - if (pAcl) - { - pAcl->AclRevision = ACL_REVISION; - pAcl->Sbz1 = 0; - pAcl->AclSize = length; - pAcl->AceCount = acecount; - pAcl->Sbz2 = 0; - } - return TRUE; - -lerr: - SetLastError(error); - WARN("Invalid ACE string format\n"); - return FALSE; -} - - -/****************************************************************************** - * ParseStringSecurityDescriptorToSecurityDescriptor - */ -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes) -{ - BOOL bret = FALSE; - WCHAR toktype; - WCHAR *tok; - LPCWSTR lptoken; - LPBYTE lpNext = NULL; - DWORD len; - - *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - - tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); - - if (SecurityDescriptor) - lpNext = (LPBYTE)(SecurityDescriptor + 1); - - while (*StringSecurityDescriptor == ' ') - StringSecurityDescriptor++; - - while (*StringSecurityDescriptor) - { - toktype = *StringSecurityDescriptor; - - /* Expect char identifier followed by ':' */ - StringSecurityDescriptor++; - if (*StringSecurityDescriptor != ':') - { - SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - StringSecurityDescriptor++; - - /* Extract token */ - lptoken = StringSecurityDescriptor; - while (*lptoken && *lptoken != ':') - lptoken++; - - if (*lptoken) - lptoken--; - - len = lptoken - StringSecurityDescriptor; - memcpy( tok, StringSecurityDescriptor, len * sizeof(WCHAR) ); - tok[len] = 0; - - switch (toktype) - { - case 'O': - { - DWORD bytes; - - if (!ParseStringSidToSid(tok, lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Owner = lpNext - (LPBYTE)SecurityDescriptor; - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - case 'G': - { - DWORD bytes; - - if (!ParseStringSidToSid(tok, lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Group = lpNext - (LPBYTE)SecurityDescriptor; - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - case 'D': - { - DWORD flags; - DWORD bytes; - - if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; - SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - case 'S': - { - DWORD flags; - DWORD bytes; - - if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; - SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - default: - FIXME("Unknown token\n"); - SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - - StringSecurityDescriptor = lptoken; - } - - bret = TRUE; - -lend: - heap_free(tok); - return bret; -} - /****************************************************************************** * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] */ @@ -3309,471 +2673,6 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( return ret; } -/****************************************************************************** - * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] - */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( - LPCWSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) -{ - DWORD cBytes; - SECURITY_DESCRIPTOR* psd; - BOOL bret = FALSE; - - TRACE("%s, %u, %p, %p\n", debugstr_w(StringSecurityDescriptor), StringSDRevision, - SecurityDescriptor, SecurityDescriptorSize); - - if (GetVersion() & 0x80000000) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - goto lend; - } - else if (!StringSecurityDescriptor || !SecurityDescriptor) - { - SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - else if (StringSDRevision != SID_REVISION) - { - SetLastError(ERROR_UNKNOWN_REVISION); - goto lend; - } - - /* Compute security descriptor length */ - if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - NULL, &cBytes)) - goto lend; - - psd = *SecurityDescriptor = LocalAlloc(GMEM_ZEROINIT, cBytes); - if (!psd) goto lend; - - psd->Revision = SID_REVISION; - psd->Control |= SE_SELF_RELATIVE; - - if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - (SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes)) - { - LocalFree(psd); - goto lend; - } - - if (SecurityDescriptorSize) - *SecurityDescriptorSize = cBytes; - - bret = TRUE; - -lend: - TRACE(" ret=%d\n", bret); - return bret; -} - -static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) -{ - if (cch == -1) - cch = strlenW(string); - - if (plen) - *plen += cch; - - if (pwptr) - { - memcpy(*pwptr, string, sizeof(WCHAR)*cch); - *pwptr += cch; - } -} - -static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - static const WCHAR subauthfmt[] = { '-','%','u',0 }; - DWORD i; - WCHAR buf[26]; - SID *pisid = psid; - - if( !IsValidSid( psid ) || pisid->Revision != SDDL_REVISION) - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - if (pisid->IdentifierAuthority.Value[0] || - pisid->IdentifierAuthority.Value[1]) - { - FIXME("not matching MS' bugs\n"); - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - sprintfW( buf, fmt, pisid->Revision, - MAKELONG( - MAKEWORD( pisid->IdentifierAuthority.Value[5], - pisid->IdentifierAuthority.Value[4] ), - MAKEWORD( pisid->IdentifierAuthority.Value[3], - pisid->IdentifierAuthority.Value[2] ) - ) ); - DumpString(buf, -1, pwptr, plen); - - for( i=0; i<pisid->SubAuthorityCount; i++ ) - { - sprintfW( buf, subauthfmt, pisid->SubAuthority[i] ); - DumpString(buf, -1, pwptr, plen); - } - return TRUE; -} - -static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) -{ - size_t i; - for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) - { - if (WellKnownSids[i].wstr[0] && EqualSid(psid, (PSID)&(WellKnownSids[i].Sid.Revision))) - { - DumpString(WellKnownSids[i].wstr, 2, pwptr, plen); - return TRUE; - } - } - - return DumpSidNumeric(psid, pwptr, plen); -} - -static const LPCWSTR AceRightBitNames[32] = { - SDDL_CREATE_CHILD, /* 0 */ - SDDL_DELETE_CHILD, - SDDL_LIST_CHILDREN, - SDDL_SELF_WRITE, - SDDL_READ_PROPERTY, /* 4 */ - SDDL_WRITE_PROPERTY, - SDDL_DELETE_TREE, - SDDL_LIST_OBJECT, - SDDL_CONTROL_ACCESS, /* 8 */ - NULL, - NULL, - NULL, - NULL, /* 12 */ - NULL, - NULL, - NULL, - SDDL_STANDARD_DELETE, /* 16 */ - SDDL_READ_CONTROL, - SDDL_WRITE_DAC, - SDDL_WRITE_OWNER, - NULL, /* 20 */ - NULL, - NULL, - NULL, - NULL, /* 24 */ - NULL, - NULL, - NULL, - SDDL_GENERIC_ALL, /* 28 */ - SDDL_GENERIC_EXECUTE, - SDDL_GENERIC_WRITE, - SDDL_GENERIC_READ -}; - -static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR fmtW[] = {'0','x','%','x',0}; - WCHAR buf[15]; - size_t i; - - if (mask == 0) - return; - - /* first check if the right have name */ - for (i = 0; i < ARRAY_SIZE(AceRights); i++) - { - if (AceRights[i].wstr == NULL) - break; - if (mask == AceRights[i].value) - { - DumpString(AceRights[i].wstr, -1, pwptr, plen); - return; - } - } - - /* then check if it can be built from bit names */ - for (i = 0; i < 32; i++) - { - if ((mask & (1 << i)) && (AceRightBitNames[i] == NULL)) - { - /* can't be built from bit names */ - sprintfW(buf, fmtW, mask); - DumpString(buf, -1, pwptr, plen); - return; - } - } - - /* build from bit names */ - for (i = 0; i < 32; i++) - if (mask & (1 << i)) - DumpString(AceRightBitNames[i], -1, pwptr, plen); -} - -static inline BOOL is_object_ace(BYTE AceType) -{ - switch (AceType) - { - case ACCESS_ALLOWED_OBJECT_ACE_TYPE: - case ACCESS_DENIED_OBJECT_ACE_TYPE: - case ACCESS_AUDIT_OBJECT_ACE_TYPE: - case ACCESS_ALARM_OBJECT_ACE_TYPE: - case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: - case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: - case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: - case SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE: - return TRUE; - - default: return FALSE; - } -} - -static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) -{ - ACCESS_ALLOWED_ACE *piace; /* all the supported ACEs have the same memory layout */ - static const WCHAR openbr = '('; - static const WCHAR closebr = ')'; - static const WCHAR semicolon = ';'; - DWORD *SidStart; - - piace = pace; - - if (piace->Header.AceType > ACCESS_MAX_MS_V5_ACE_TYPE || piace->Header.AceSize < sizeof(ACCESS_ALLOWED_ACE)) - { - SetLastError(ERROR_INVALID_ACL); - return FALSE; - } - - DumpString(&openbr, 1, pwptr, plen); - switch (piace->Header.AceType) - { - case ACCESS_ALLOWED_ACE_TYPE: - DumpString(SDDL_ACCESS_ALLOWED, -1, pwptr, plen); - break; - case ACCESS_DENIED_ACE_TYPE: - DumpString(SDDL_ACCESS_DENIED, -1, pwptr, plen); - break; - case SYSTEM_AUDIT_ACE_TYPE: - DumpString(SDDL_AUDIT, -1, pwptr, plen); - break; - case SYSTEM_ALARM_ACE_TYPE: - DumpString(SDDL_ALARM, -1, pwptr, plen); - break; - } - DumpString(&semicolon, 1, pwptr, plen); - - if (piace->Header.AceFlags & OBJECT_INHERIT_ACE) - DumpString(SDDL_OBJECT_INHERIT, -1, pwptr, plen); - if (piace->Header.AceFlags & CONTAINER_INHERIT_ACE) - DumpString(SDDL_CONTAINER_INHERIT, -1, pwptr, plen); - if (piace->Header.AceFlags & NO_PROPAGATE_INHERIT_ACE) - DumpString(SDDL_NO_PROPAGATE, -1, pwptr, plen); - if (piace->Header.AceFlags & INHERIT_ONLY_ACE) - DumpString(SDDL_INHERIT_ONLY, -1, pwptr, plen); - if (piace->Header.AceFlags & INHERITED_ACE) - DumpString(SDDL_INHERITED, -1, pwptr, plen); - if (piace->Header.AceFlags & SUCCESSFUL_ACCESS_ACE_FLAG) - DumpString(SDDL_AUDIT_SUCCESS, -1, pwptr, plen); - if (piace->Header.AceFlags & FAILED_ACCESS_ACE_FLAG) - DumpString(SDDL_AUDIT_FAILURE, -1, pwptr, plen); - DumpString(&semicolon, 1, pwptr, plen); - DumpRights(piace->Mask, pwptr, plen); - DumpString(&semicolon, 1, pwptr, plen); - SidStart = &piace->SidStart; - if (is_object_ace(piace->Header.AceType)) - { - ACCESS_ALLOWED_OBJECT_ACE *objace = pace; - - SidStart++; /* Flags */ - if (objace->Flags & ACE_OBJECT_TYPE_PRESENT) - SidStart += sizeof(GUID) / sizeof(*SidStart); /* ObjectType */ - if (objace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) - SidStart += sizeof(GUID) / sizeof(*SidStart); /* InheritedObjectType */ - } - /* objects not supported */ - DumpString(&semicolon, 1, pwptr, plen); - /* objects not supported */ - DumpString(&semicolon, 1, pwptr, plen); - if (!DumpSid(SidStart, pwptr, plen)) - return FALSE; - DumpString(&closebr, 1, pwptr, plen); - return TRUE; -} - -static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL autoInheritReq, BOOL autoInherited) -{ - WORD count; - UINT i; - - if (protected) - DumpString(SDDL_PROTECTED, -1, pwptr, plen); - if (autoInheritReq) - DumpString(SDDL_AUTO_INHERIT_REQ, -1, pwptr, plen); - if (autoInherited) - DumpString(SDDL_AUTO_INHERITED, -1, pwptr, plen); - - if (pacl == NULL) - return TRUE; - - if (!IsValidAcl(pacl)) - return FALSE; - - count = pacl->AceCount; - for (i = 0; i < count; i++) - { - LPVOID ace; - if (!GetAce(pacl, i, &ace)) - return FALSE; - if (!DumpAce(ace, pwptr, plen)) - return FALSE; - } - - return TRUE; -} - -static BOOL DumpOwner(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR prefix[] = {'O',':',0}; - BOOL bDefaulted; - PSID psid; - - if (!GetSecurityDescriptorOwner(SecurityDescriptor, &psid, &bDefaulted)) - return FALSE; - - if (psid == NULL) - return TRUE; - - DumpString(prefix, -1, pwptr, plen); - if (!DumpSid(psid, pwptr, plen)) - return FALSE; - return TRUE; -} - -static BOOL DumpGroup(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR prefix[] = {'G',':',0}; - BOOL bDefaulted; - PSID psid; - - if (!GetSecurityDescriptorGroup(SecurityDescriptor, &psid, &bDefaulted)) - return FALSE; - - if (psid == NULL) - return TRUE; - - DumpString(prefix, -1, pwptr, plen); - if (!DumpSid(psid, pwptr, plen)) - return FALSE; - return TRUE; -} - -static BOOL DumpDacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR dacl[] = {'D',':',0}; - SECURITY_DESCRIPTOR_CONTROL control; - BOOL present, defaulted; - DWORD revision; - PACL pacl; - - if (!GetSecurityDescriptorDacl(SecurityDescriptor, &present, &pacl, &defaulted)) - return FALSE; - - if (!GetSecurityDescriptorControl(SecurityDescriptor, &control, &revision)) - return FALSE; - - if (!present) - return TRUE; - - DumpString(dacl, 2, pwptr, plen); - if (!DumpAcl(pacl, pwptr, plen, control & SE_DACL_PROTECTED, control & SE_DACL_AUTO_INHERIT_REQ, control & SE_DACL_AUTO_INHERITED)) - return FALSE; - return TRUE; -} - -static BOOL DumpSacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) -{ - static const WCHAR sacl[] = {'S',':',0}; - SECURITY_DESCRIPTOR_CONTROL control; - BOOL present, defaulted; - DWORD revision; - PACL pacl; - - if (!GetSecurityDescriptorSacl(SecurityDescriptor, &present, &pacl, &defaulted)) - return FALSE; - - if (!GetSecurityDescriptorControl(SecurityDescriptor, &control, &revision)) - return FALSE; - - if (!present) - return TRUE; - - DumpString(sacl, 2, pwptr, plen); - if (!DumpAcl(pacl, pwptr, plen, control & SE_SACL_PROTECTED, control & SE_SACL_AUTO_INHERIT_REQ, control & SE_SACL_AUTO_INHERITED)) - return FALSE; - return TRUE; -} - -/****************************************************************************** - * ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] - */ -BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, DWORD SDRevision, SECURITY_INFORMATION RequestedInformation, LPWSTR *OutputString, PULONG OutputLen) -{ - ULONG len; - WCHAR *wptr, *wstr; - - if (SDRevision != SDDL_REVISION_1) - { - ERR("Program requested unknown SDDL revision %d\n", SDRevision); - SetLastError(ERROR_UNKNOWN_REVISION); - return FALSE; - } - - len = 0; - if (RequestedInformation & OWNER_SECURITY_INFORMATION) - if (!DumpOwner(SecurityDescriptor, NULL, &len)) - return FALSE; - if (RequestedInformation & GROUP_SECURITY_INFORMATION) - if (!DumpGroup(SecurityDescriptor, NULL, &len)) - return FALSE; - if (RequestedInformation & DACL_SECURITY_INFORMATION) - if (!DumpDacl(SecurityDescriptor, NULL, &len)) - return FALSE; - if (RequestedInformation & SACL_SECURITY_INFORMATION) - if (!DumpSacl(SecurityDescriptor, NULL, &len)) - return FALSE; - - wstr = wptr = LocalAlloc(0, (len + 1)*sizeof(WCHAR)); - if (RequestedInformation & OWNER_SECURITY_INFORMATION) - if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) { - LocalFree (wstr); - return FALSE; - } - if (RequestedInformation & GROUP_SECURITY_INFORMATION) - if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) { - LocalFree (wstr); - return FALSE; - } - if (RequestedInformation & DACL_SECURITY_INFORMATION) - if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) { - LocalFree (wstr); - return FALSE; - } - if (RequestedInformation & SACL_SECURITY_INFORMATION) - if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) { - LocalFree (wstr); - return FALSE; - } - *wptr = 0; - - TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len); - *OutputString = wstr; - if (OutputLen) - *OutputLen = strlenW(*OutputString)+1; - return TRUE; -} - /****************************************************************************** * ConvertSecurityDescriptorToStringSecurityDescriptorA [ADVAPI32.@] */ @@ -3803,30 +2702,6 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(PSECURITY_DESCR } } -/****************************************************************************** - * ConvertStringSidToSidW [ADVAPI32.@] - */ -BOOL WINAPI ConvertStringSidToSidW(LPCWSTR StringSid, PSID* Sid) -{ - BOOL bret = FALSE; - DWORD cBytes; - - TRACE("%s, %p\n", debugstr_w(StringSid), Sid); - if (GetVersion() & 0x80000000) - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - else if (!StringSid || !Sid) - SetLastError(ERROR_INVALID_PARAMETER); - else if (ParseStringSidToSid(StringSid, NULL, &cBytes)) - { - PSID pSid = *Sid = LocalAlloc(0, cBytes); - - bret = ParseStringSidToSid(StringSid, pSid, &cBytes); - if (!bret) - LocalFree(*Sid); - } - return bret; -} - /****************************************************************************** * ConvertStringSidToSidA [ADVAPI32.@] */ @@ -3848,34 +2723,6 @@ BOOL WINAPI ConvertStringSidToSidA(LPCSTR StringSid, PSID* Sid) return bret; } -/****************************************************************************** - * ConvertSidToStringSidW [ADVAPI32.@] - * - * format of SID string is: - * S-<count>-<auth>-<subauth1>-<subauth2>-<subauth3>... - * where - * <rev> is the revision of the SID encoded as decimal - * <auth> is the identifier authority encoded as hex - * <subauthN> is the subauthority id encoded as decimal - */ -BOOL WINAPI ConvertSidToStringSidW( PSID pSid, LPWSTR *pstr ) -{ - DWORD len = 0; - LPWSTR wstr, wptr; - - TRACE("%p %p\n", pSid, pstr ); - - len = 0; - if (!DumpSidNumeric(pSid, NULL, &len)) - return FALSE; - wstr = wptr = LocalAlloc(0, (len+1) * sizeof(WCHAR)); - DumpSidNumeric(pSid, &wptr, NULL); - *wptr = 0; - - *pstr = wstr; - return TRUE; -} - /****************************************************************************** * ConvertSidToStringSidA [ADVAPI32.@] */ @@ -3929,167 +2776,6 @@ BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR app current_directory, startup_info, process_information ); } -/****************************************************************************** - * ComputeStringSidSize - */ -static DWORD ComputeStringSidSize(LPCWSTR StringSid) -{ - if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */ - { - int ctok = 0; - while (*StringSid) - { - if (*StringSid == '-') - ctok++; - StringSid++; - } - - if (ctok >= 3) - return GetSidLengthRequired(ctok - 2); - } - else /* String constant format - Only available in winxp and above */ - { - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) - if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) - return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - - for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) - if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) - { - MAX_SID local; - ADVAPI_GetComputerSid(&local); - return GetSidLengthRequired(*GetSidSubAuthorityCount(&local) + 1); - } - - } - - return GetSidLengthRequired(0); -} - -/****************************************************************************** - * ParseStringSidToSid - */ -static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) -{ - BOOL bret = FALSE; - SID* pisid=pSid; - - TRACE("%s, %p, %p\n", debugstr_w(StringSid), pSid, cBytes); - if (!StringSid) - { - SetLastError(ERROR_INVALID_PARAMETER); - TRACE("StringSid is NULL, returning FALSE\n"); - return FALSE; - } - - while (*StringSid == ' ') - StringSid++; - - *cBytes = ComputeStringSidSize(StringSid); - if (!pisid) /* Simply compute the size */ - { - TRACE("only size requested, returning TRUE with %d\n", *cBytes); - return TRUE; - } - - if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ - { - DWORD i = 0, identAuth; - DWORD csubauth = ((*cBytes - GetSidLengthRequired(0)) / sizeof(DWORD)); - - StringSid += 2; /* Advance to Revision */ - pisid->Revision = atoiW(StringSid); - - if (pisid->Revision != SDDL_REVISION) - { - TRACE("Revision %d is unknown\n", pisid->Revision); - goto lend; /* ERROR_INVALID_SID */ - } - if (csubauth == 0) - { - TRACE("SubAuthorityCount is 0\n"); - goto lend; /* ERROR_INVALID_SID */ - } - - pisid->SubAuthorityCount = csubauth; - - /* Advance to identifier authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - /* MS' implementation can't handle values greater than 2^32 - 1, so - * we don't either; assume most significant bytes are always 0 - */ - pisid->IdentifierAuthority.Value[0] = 0; - pisid->IdentifierAuthority.Value[1] = 0; - identAuth = atoiW(StringSid); - pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; - pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; - pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; - pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; - - /* Advance to first sub authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - while (*StringSid) - { - pisid->SubAuthority[i++] = atoiW(StringSid); - - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - } - - if (i != pisid->SubAuthorityCount) - goto lend; /* ERROR_INVALID_SID */ - - bret = TRUE; - } - else /* String constant format - Only available in winxp and above */ - { - unsigned int i; - pisid->Revision = SDDL_REVISION; - - for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) - if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) - { - DWORD j; - pisid->SubAuthorityCount = WellKnownSids[i].Sid.SubAuthorityCount; - pisid->IdentifierAuthority = WellKnownSids[i].Sid.IdentifierAuthority; - for (j = 0; j < WellKnownSids[i].Sid.SubAuthorityCount; j++) - pisid->SubAuthority[j] = WellKnownSids[i].Sid.SubAuthority[j]; - bret = TRUE; - } - - for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) - if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) - { - ADVAPI_GetComputerSid(pisid); - pisid->SubAuthority[pisid->SubAuthorityCount] = WellKnownRids[i].Rid; - pisid->SubAuthorityCount++; - bret = TRUE; - } - - if (!bret) - FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); - } - -lend: - if (!bret) - SetLastError(ERROR_INVALID_SID); - - TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); - return bret; -} - /****************************************************************************** * GetNamedSecurityInfoA [ADVAPI32.@] */ diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index eb98d04859..91016c6757 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -6,6 +6,7 @@ DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + security.c \ service.c \ trace.c diff --git a/dlls/sechost/sechost.spec b/dlls/sechost/sechost.spec index df6af1646d..f21e2f1cda 100644 --- a/dlls/sechost/sechost.spec +++ b/dlls/sechost/sechost.spec @@ -31,13 +31,13 @@ @ stdcall ControlTraceA(int64 str ptr long) @ stdcall ControlTraceW(int64 wstr ptr long) @ stub ConvertSDToStringSDRootDomainW -@ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW -@ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW +@ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) +@ stdcall ConvertSidToStringSidW(ptr ptr) @ stub ConvertStringSDToSDDomainA @ stub ConvertStringSDToSDDomainW @ stub ConvertStringSDToSDRootDomainW -@ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) +@ stdcall ConvertStringSidToSidW(ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stub CreateServiceEx @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c new file mode 100644 index 0000000000..47ffba9ed5 --- /dev/null +++ b/dlls/sechost/security.c @@ -0,0 +1,1247 @@ +/* + * Security API + * + * Copyright 2003 CodeWeavers Inc. (Ulrich Czekalla) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "sddl.h" +#include "iads.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(security); + +static const struct +{ + WCHAR str[3]; + DWORD value; +} +ace_rights[] = +{ + { L"GA", GENERIC_ALL }, + { L"GR", GENERIC_READ }, + { L"GW", GENERIC_WRITE }, + { L"GX", GENERIC_EXECUTE }, + + { L"RC", READ_CONTROL }, + { L"SD", DELETE }, + { L"WD", WRITE_DAC }, + { L"WO", WRITE_OWNER }, + + { L"RP", ADS_RIGHT_DS_READ_PROP }, + { L"WP", ADS_RIGHT_DS_WRITE_PROP }, + { L"CC", ADS_RIGHT_DS_CREATE_CHILD }, + { L"DC", ADS_RIGHT_DS_DELETE_CHILD }, + { L"LC", ADS_RIGHT_ACTRL_DS_LIST }, + { L"SW", ADS_RIGHT_DS_SELF }, + { L"LO", ADS_RIGHT_DS_LIST_OBJECT }, + { L"DT", ADS_RIGHT_DS_DELETE_TREE }, + { L"CR", ADS_RIGHT_DS_CONTROL_ACCESS }, + + { L"FA", FILE_ALL_ACCESS }, + { L"FR", FILE_GENERIC_READ }, + { L"FW", FILE_GENERIC_WRITE }, + { L"FX", FILE_GENERIC_EXECUTE }, + + { L"KA", KEY_ALL_ACCESS }, + { L"KR", KEY_READ }, + { L"KW", KEY_WRITE }, + { L"KX", KEY_EXECUTE }, + + { L"NR", SYSTEM_MANDATORY_LABEL_NO_READ_UP }, + { L"NW", SYSTEM_MANDATORY_LABEL_NO_WRITE_UP }, + { L"NX", SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP }, +}; + +struct max_sid +{ + /* same fields as struct _SID */ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[SID_MAX_SUB_AUTHORITIES]; +}; + +static const struct +{ + WCHAR str[2]; + WELL_KNOWN_SID_TYPE Type; + struct max_sid sid; +} +well_known_sids[] = +{ + { {0,0}, WinNullSid, { SID_REVISION, 1, { SECURITY_NULL_SID_AUTHORITY }, { SECURITY_NULL_RID } } }, + { {'W','D'}, WinWorldSid, { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } } }, + { {0,0}, WinLocalSid, { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } } }, + { {'C','O'}, WinCreatorOwnerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RID } } }, + { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, + { {'O','W'}, WinCreatorOwnerRightsSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RIGHTS_RID } } }, + { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, + { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, + { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, + { {0,0}, WinDialupSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_DIALUP_RID } } }, + { {'N','U'}, WinNetworkSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_RID } } }, + { {0,0}, WinBatchSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BATCH_RID } } }, + { {'I','U'}, WinInteractiveSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } } }, + { {'S','U'}, WinServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_SERVICE_RID } } }, + { {'A','N'}, WinAnonymousSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } } }, + { {0,0}, WinProxySid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PROXY_RID } } }, + { {'E','D'}, WinEnterpriseControllersSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ENTERPRISE_CONTROLLERS_RID } } }, + { {'P','S'}, WinSelfSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_PRINCIPAL_SELF_RID } } }, + { {'A','U'}, WinAuthenticatedUserSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } } }, + { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, + { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, + { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, + { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, + { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, + { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, + { {0,0}, WinBuiltinDomainSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID } } }, + { {'B','A'}, WinBuiltinAdministratorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } } }, + { {'B','U'}, WinBuiltinUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } } }, + { {'B','G'}, WinBuiltinGuestsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_GUESTS } } }, + { {'P','U'}, WinBuiltinPowerUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS } } }, + { {'A','O'}, WinBuiltinAccountOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ACCOUNT_OPS } } }, + { {'S','O'}, WinBuiltinSystemOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_SYSTEM_OPS } } }, + { {'P','O'}, WinBuiltinPrintOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PRINT_OPS } } }, + { {'B','O'}, WinBuiltinBackupOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_BACKUP_OPS } } }, + { {'R','E'}, WinBuiltinReplicatorSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REPLICATOR } } }, + { {'R','U'}, WinBuiltinPreWindows2000CompatibleAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_PREW2KCOMPACCESS } } }, + { {'R','D'}, WinBuiltinRemoteDesktopUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS } } }, + { {'N','O'}, WinBuiltinNetworkConfigurationOperatorsSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS } } }, + { {0,0}, WinNTLMAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_NTLM_RID } } }, + { {0,0}, WinDigestAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_DIGEST_RID } } }, + { {0,0}, WinSChannelAuthenticationSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_PACKAGE_BASE_RID, SECURITY_PACKAGE_SCHANNEL_RID } } }, + { {0,0}, WinThisOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_THIS_ORGANIZATION_RID } } }, + { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, + { {0,0}, WinBuiltinIncomingForestTrustBuildersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS } } }, + { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, + { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, + { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, + { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, + { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, + { {'L','W'}, WinLowLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_LOW_RID} } }, + { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, + { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, + { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, + { {'A','C'}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, +}; + +/* these SIDs must be constructed as relative to some domain - only the RID is well-known */ +static const struct +{ + WCHAR str[2]; + WELL_KNOWN_SID_TYPE type; + DWORD rid; +} +well_known_rids[] = +{ + { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, + { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, + { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, + { {'D','A'}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {'D','U'}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {'D','G'}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {'D','C'}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {'D','D'}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {'C','A'}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {'S','A'}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {'E','A'}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {'P','A'}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, +}; + + +static void print_string(const WCHAR *string, int cch, WCHAR **pwptr, ULONG *plen) +{ + if (cch == -1) + cch = wcslen(string); + + if (plen) + *plen += cch; + + if (pwptr) + { + memcpy(*pwptr, string, sizeof(WCHAR)*cch); + *pwptr += cch; + } +} + +static BOOL print_sid_numeric(PSID psid, WCHAR **pwptr, ULONG *plen) +{ + DWORD i; + WCHAR buf[26]; + SID *pisid = psid; + + if( !IsValidSid( psid ) || pisid->Revision != SDDL_REVISION) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + if (pisid->IdentifierAuthority.Value[0] || + pisid->IdentifierAuthority.Value[1]) + { + FIXME("not matching MS' bugs\n"); + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + swprintf( buf, ARRAY_SIZE(buf), L"S-%u-%d", pisid->Revision, MAKELONG( + MAKEWORD( pisid->IdentifierAuthority.Value[5], pisid->IdentifierAuthority.Value[4] ), + MAKEWORD( pisid->IdentifierAuthority.Value[3], pisid->IdentifierAuthority.Value[2] ) + ) ); + print_string(buf, -1, pwptr, plen); + + for( i=0; i<pisid->SubAuthorityCount; i++ ) + { + swprintf( buf, ARRAY_SIZE(buf), L"-%u", pisid->SubAuthority[i] ); + print_string(buf, -1, pwptr, plen); + } + return TRUE; +} + +/****************************************************************************** + * ConvertSidToStringSidW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ConvertSidToStringSidW( PSID sid, WCHAR **pstr ) +{ + DWORD len = 0; + WCHAR *wstr, *wptr; + + TRACE("%p %p\n", sid, pstr ); + + len = 0; + if (!print_sid_numeric( sid, NULL, &len )) + return FALSE; + wstr = wptr = LocalAlloc( 0, (len + 1) * sizeof(WCHAR) ); + print_sid_numeric( sid, &wptr, NULL ); + *wptr = 0; + + *pstr = wstr; + return TRUE; +} + +static BOOL print_sid(PSID psid, WCHAR **pwptr, ULONG *plen) +{ + size_t i; + for (i = 0; i < ARRAY_SIZE(well_known_sids); i++) + { + if (well_known_sids[i].str[0] && EqualSid(psid, (PSID)&well_known_sids[i].sid.Revision)) + { + print_string(well_known_sids[i].str, 2, pwptr, plen); + return TRUE; + } + } + + return print_sid_numeric(psid, pwptr, plen); +} + +static void print_rights(DWORD mask, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR *bit_names[32] = + { + L"CC", /* 0 */ + L"DC", + L"LC", + L"SW", + L"RP", /* 4 */ + L"WP", + L"DT", + L"LO", + L"CR", /* 8 */ + NULL, + NULL, + NULL, + NULL, /* 12 */ + NULL, + NULL, + NULL, + L"SD", /* 16 */ + L"RC", + L"WD", + L"WO", + NULL, /* 20 */ + NULL, + NULL, + NULL, + NULL, /* 24 */ + NULL, + NULL, + NULL, + L"GA", /* 28 */ + L"GX", + L"GW", + L"GR", + }; + + WCHAR buf[15]; + size_t i; + + if (mask == 0) + return; + + /* first check if the right have name */ + for (i = 0; i < ARRAY_SIZE(ace_rights); i++) + { + if (mask == ace_rights[i].value) + { + print_string(ace_rights[i].str, -1, pwptr, plen); + return; + } + } + + /* then check if it can be built from bit names */ + for (i = 0; i < 32; i++) + { + if ((mask & (1 << i)) && !bit_names[i]) + { + /* can't be built from bit names */ + swprintf(buf, ARRAY_SIZE(buf), L"0x%x", mask); + print_string(buf, -1, pwptr, plen); + return; + } + } + + /* build from bit names */ + for (i = 0; i < 32; i++) + if (mask & (1 << i)) + print_string(bit_names[i], -1, pwptr, plen); +} + +static inline BOOL is_object_ace(BYTE type) +{ + switch (type) + { + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + case ACCESS_DENIED_OBJECT_ACE_TYPE: + case ACCESS_AUDIT_OBJECT_ACE_TYPE: + case ACCESS_ALARM_OBJECT_ACE_TYPE: + case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: + case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: + case SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE: + return TRUE; + + default: + return FALSE; + } +} + +static BOOL print_ace(void *pace, WCHAR **pwptr, ULONG *plen) +{ + ACCESS_ALLOWED_ACE *piace; /* all the supported ACEs have the same memory layout */ + DWORD *sid_start; + + piace = pace; + + if (piace->Header.AceType > ACCESS_MAX_MS_V5_ACE_TYPE || piace->Header.AceSize < sizeof(ACCESS_ALLOWED_ACE)) + { + SetLastError(ERROR_INVALID_ACL); + return FALSE; + } + + print_string(L"(", -1, pwptr, plen); + switch (piace->Header.AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + print_string(L"A", -1, pwptr, plen); + break; + case ACCESS_DENIED_ACE_TYPE: + print_string(L"D", -1, pwptr, plen); + break; + case SYSTEM_AUDIT_ACE_TYPE: + print_string(L"AU", -1, pwptr, plen); + break; + case SYSTEM_ALARM_ACE_TYPE: + print_string(L"AL", -1, pwptr, plen); + break; + } + print_string(L";", -1, pwptr, plen); + + if (piace->Header.AceFlags & OBJECT_INHERIT_ACE) + print_string(L"OI", -1, pwptr, plen); + if (piace->Header.AceFlags & CONTAINER_INHERIT_ACE) + print_string(L"CI", -1, pwptr, plen); + if (piace->Header.AceFlags & NO_PROPAGATE_INHERIT_ACE) + print_string(L"NP", -1, pwptr, plen); + if (piace->Header.AceFlags & INHERIT_ONLY_ACE) + print_string(L"IO", -1, pwptr, plen); + if (piace->Header.AceFlags & INHERITED_ACE) + print_string(L"ID", -1, pwptr, plen); + if (piace->Header.AceFlags & SUCCESSFUL_ACCESS_ACE_FLAG) + print_string(L"SA", -1, pwptr, plen); + if (piace->Header.AceFlags & FAILED_ACCESS_ACE_FLAG) + print_string(L"FA", -1, pwptr, plen); + print_string(L";", -1, pwptr, plen); + print_rights(piace->Mask, pwptr, plen); + print_string(L";", -1, pwptr, plen); + sid_start = &piace->SidStart; + if (is_object_ace(piace->Header.AceType)) + { + ACCESS_ALLOWED_OBJECT_ACE *objace = pace; + + sid_start++; /* Flags */ + if (objace->Flags & ACE_OBJECT_TYPE_PRESENT) + sid_start += sizeof(GUID) / sizeof(*sid_start); /* ObjectType */ + if (objace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + sid_start += sizeof(GUID) / sizeof(*sid_start); /* InheritedObjectType */ + } + /* objects not supported */ + print_string(L";", -1, pwptr, plen); + /* objects not supported */ + print_string(L";", -1, pwptr, plen); + if (!print_sid(sid_start, pwptr, plen)) + return FALSE; + print_string(L")", -1, pwptr, plen); + return TRUE; +} + +static BOOL print_acl(ACL *pacl, WCHAR **pwptr, ULONG *plen, SECURITY_DESCRIPTOR_CONTROL control) +{ + WORD count; + UINT i; + + if (control & SE_DACL_PROTECTED) + print_string(L"P", -1, pwptr, plen); + if (control & SE_DACL_AUTO_INHERIT_REQ) + print_string(L"AR", -1, pwptr, plen); + if (control & SE_DACL_AUTO_INHERITED) + print_string(L"AI", -1, pwptr, plen); + + if (pacl == NULL) + return TRUE; + + if (!IsValidAcl(pacl)) + return FALSE; + + count = pacl->AceCount; + for (i = 0; i < count; i++) + { + void *ace; + if (!GetAce(pacl, i, &ace)) + return FALSE; + if (!print_ace(ace, pwptr, plen)) + return FALSE; + } + + return TRUE; +} + +static BOOL print_owner(PSECURITY_DESCRIPTOR sd, WCHAR **pwptr, ULONG *plen) +{ + BOOL defaulted; + PSID psid; + + if (!GetSecurityDescriptorOwner(sd, &psid, &defaulted)) + return FALSE; + + if (psid == NULL) + return TRUE; + + print_string(L"O:", -1, pwptr, plen); + if (!print_sid(psid, pwptr, plen)) + return FALSE; + return TRUE; +} + +static BOOL print_group(PSECURITY_DESCRIPTOR sd, WCHAR **pwptr, ULONG *plen) +{ + BOOL defaulted; + PSID psid; + + if (!GetSecurityDescriptorGroup(sd, &psid, &defaulted)) + return FALSE; + + if (psid == NULL) + return TRUE; + + print_string(L"G:", -1, pwptr, plen); + if (!print_sid(psid, pwptr, plen)) + return FALSE; + return TRUE; +} + +static BOOL print_dacl(PSECURITY_DESCRIPTOR sd, WCHAR **pwptr, ULONG *plen) +{ + SECURITY_DESCRIPTOR_CONTROL control; + BOOL present, defaulted; + DWORD revision; + ACL *pacl; + + if (!GetSecurityDescriptorDacl(sd, &present, &pacl, &defaulted)) + return FALSE; + + if (!GetSecurityDescriptorControl(sd, &control, &revision)) + return FALSE; + + if (!present) + return TRUE; + + print_string(L"D:", -1, pwptr, plen); + if (!print_acl(pacl, pwptr, plen, control)) + return FALSE; + return TRUE; +} + +static BOOL print_sacl(PSECURITY_DESCRIPTOR sd, WCHAR **pwptr, ULONG *plen) +{ + SECURITY_DESCRIPTOR_CONTROL control; + BOOL present, defaulted; + DWORD revision; + ACL *pacl; + + if (!GetSecurityDescriptorSacl(sd, &present, &pacl, &defaulted)) + return FALSE; + + if (!GetSecurityDescriptorControl(sd, &control, &revision)) + return FALSE; + + if (!present) + return TRUE; + + print_string(L"S:", -1, pwptr, plen); + if (!print_acl(pacl, pwptr, plen, control)) + return FALSE; + return TRUE; +} + +/****************************************************************************** + * ConvertSecurityDescriptorToStringSecurityDescriptorW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ConvertSecurityDescriptorToStringSecurityDescriptorW( PSECURITY_DESCRIPTOR sd, + DWORD revision, SECURITY_INFORMATION flags, WCHAR **string, ULONG *ret_len ) +{ + ULONG len = 0; + WCHAR *wptr, *wstr; + + if (revision != SDDL_REVISION_1) + { + ERR("Unhandled SDDL revision %d\n", revision); + SetLastError( ERROR_UNKNOWN_REVISION ); + return FALSE; + } + + if ((flags & OWNER_SECURITY_INFORMATION) && !print_owner(sd, NULL, &len)) + return FALSE; + if ((flags & GROUP_SECURITY_INFORMATION) && !print_group(sd, NULL, &len)) + return FALSE; + if ((flags & DACL_SECURITY_INFORMATION) && !print_dacl(sd, NULL, &len)) + return FALSE; + if ((flags & SACL_SECURITY_INFORMATION) && !print_sacl(sd, NULL, &len)) + return FALSE; + + wstr = wptr = LocalAlloc( 0, (len + 1) * sizeof(WCHAR) ); + if ((flags & OWNER_SECURITY_INFORMATION) && !print_owner(sd, &wptr, NULL)) + { + LocalFree(wstr); + return FALSE; + } + if ((flags & GROUP_SECURITY_INFORMATION) && !print_group(sd, &wptr, NULL)) + { + LocalFree(wstr); + return FALSE; + } + if ((flags & DACL_SECURITY_INFORMATION) && !print_dacl(sd, &wptr, NULL)) + { + LocalFree(wstr); + return FALSE; + } + if ((flags & SACL_SECURITY_INFORMATION) && !print_sacl(sd, &wptr, NULL)) + { + LocalFree(wstr); + return FALSE; + } + *wptr = 0; + + TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len); + *string = wstr; + if (ret_len) *ret_len = wcslen(*string) + 1; + return TRUE; +} + +static BOOL get_computer_sid( PSID sid ) +{ + static const struct /* same fields as struct SID */ + { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[4]; + } computer_sid = + { SID_REVISION, 4, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0 } }; + + memcpy( sid, &computer_sid, sizeof(computer_sid) ); + return TRUE; +} + +static DWORD get_sid_size( const WCHAR *string ) +{ + if (string[0] == 'S' && string[1] == '-') /* S-R-I(-S)+ */ + { + int token_count = 0; + while (*string) + { + if (*string == '-') + token_count++; + string++; + } + + if (token_count >= 3) + return GetSidLengthRequired( token_count - 2 ); + } + else /* String constant format - Only available in winxp and above */ + { + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(well_known_sids); i++) + { + if (!wcsncmp( well_known_sids[i].str, string, 2 )) + return GetSidLengthRequired( well_known_sids[i].sid.SubAuthorityCount ); + } + + for (i = 0; i < ARRAY_SIZE(well_known_rids); i++) + { + if (!wcsncmp( well_known_rids[i].str, string, 2 )) + { + struct max_sid local; + get_computer_sid(&local); + return GetSidLengthRequired( *GetSidSubAuthorityCount(&local) + 1 ); + } + } + } + + return GetSidLengthRequired( 0 ); +} + +static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) +{ + while (*string == ' ') + string++; + + *size = get_sid_size( string ); + if (!pisid) /* Simply compute the size */ + return TRUE; + + if (string[0] == 'S' && string[1] == '-') /* S-R-I-S-S */ + { + DWORD i = 0, identAuth; + DWORD csubauth = ((*size - GetSidLengthRequired(0)) / sizeof(DWORD)); + + string += 2; /* Advance to Revision */ + pisid->Revision = wcstoul( string, NULL, 10 ); + + if (pisid->Revision != SDDL_REVISION) + { + TRACE("Revision %d is unknown\n", pisid->Revision); + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + if (csubauth == 0) + { + TRACE("SubAuthorityCount is 0\n"); + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + pisid->SubAuthorityCount = csubauth; + + /* Advance to identifier authority */ + while (*string && *string != '-') + string++; + if (*string == '-') + string++; + + /* MS' implementation can't handle values greater than 2^32 - 1, so + * we don't either; assume most significant bytes are always 0 + */ + pisid->IdentifierAuthority.Value[0] = 0; + pisid->IdentifierAuthority.Value[1] = 0; + identAuth = wcstoul( string, NULL, 10 ); + pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; + pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; + pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; + pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; + + /* Advance to first sub authority */ + while (*string && *string != '-') + string++; + if (*string == '-') + string++; + + while (*string) + { + pisid->SubAuthority[i++] = wcstoul( string, NULL, 10 ); + + while (*string && *string != '-') + string++; + if (*string == '-') + string++; + } + + if (i != pisid->SubAuthorityCount) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + return TRUE; + } + else /* String constant format - Only available in winxp and above */ + { + unsigned int i; + pisid->Revision = SDDL_REVISION; + + for (i = 0; i < ARRAY_SIZE(well_known_sids); i++) + { + if (!wcsncmp(well_known_sids[i].str, string, 2)) + { + DWORD j; + pisid->SubAuthorityCount = well_known_sids[i].sid.SubAuthorityCount; + pisid->IdentifierAuthority = well_known_sids[i].sid.IdentifierAuthority; + for (j = 0; j < well_known_sids[i].sid.SubAuthorityCount; j++) + pisid->SubAuthority[j] = well_known_sids[i].sid.SubAuthority[j]; + return TRUE; + } + } + + for (i = 0; i < ARRAY_SIZE(well_known_rids); i++) + { + if (!wcsncmp(well_known_rids[i].str, string, 2)) + { + get_computer_sid(pisid); + pisid->SubAuthority[pisid->SubAuthorityCount] = well_known_rids[i].rid; + pisid->SubAuthorityCount++; + return TRUE; + } + } + + FIXME("String constant not supported: %s\n", debugstr_wn(string, 2)); + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } +} + +/****************************************************************************** + * ConvertStringSidToSidW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ConvertStringSidToSidW( const WCHAR *string, PSID *sid ) +{ + DWORD size; + + TRACE("%s, %p\n", debugstr_w(string), sid); + + if (GetVersion() & 0x80000000) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (!string || !sid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!parse_sid( string, NULL, &size )) + return FALSE; + + *sid = LocalAlloc( 0, size ); + + if (!parse_sid( string, *sid, &size )) + { + LocalFree( *sid ); + return FALSE; + } + return TRUE; +} + +static DWORD parse_acl_flags( const WCHAR **string_ptr ) +{ + DWORD flags = 0; + const WCHAR *string = *string_ptr; + + while (*string && *string != '(') + { + if (*string == 'P') + { + flags |= SE_DACL_PROTECTED; + } + else if (*string == 'A') + { + string++; + if (*string == 'R') + flags |= SE_DACL_AUTO_INHERIT_REQ; + else if (*string == 'I') + flags |= SE_DACL_AUTO_INHERITED; + } + string++; + } + + *string_ptr = string; + return flags; +} + +static BYTE parse_ace_type( const WCHAR **string_ptr ) +{ + static const struct + { + const WCHAR *str; + DWORD value; + } + ace_types[] = + { + { L"AL", SYSTEM_ALARM_ACE_TYPE }, + { L"AU", SYSTEM_AUDIT_ACE_TYPE }, + { L"A", ACCESS_ALLOWED_ACE_TYPE }, + { L"D", ACCESS_DENIED_ACE_TYPE }, + { L"ML", SYSTEM_MANDATORY_LABEL_ACE_TYPE }, + /* + { ACCESS_ALLOWED_OBJECT_ACE_TYPE }, + { ACCESS_DENIED_OBJECT_ACE_TYPE }, + { SYSTEM_ALARM_OBJECT_ACE_TYPE }, + { SYSTEM_AUDIT_OBJECT_ACE_TYPE }, + */ + }; + + const WCHAR *string = *string_ptr; + unsigned int i; + + while (*string == ' ') + string++; + + for (i = 0; i < ARRAY_SIZE(ace_types); ++i) + { + size_t len = wcslen( ace_types[i].str ); + if (!wcsncmp( string, ace_types[i].str, len )) + { + *string_ptr = string + len; + return ace_types[i].value; + } + } + return 0; +} + +static DWORD parse_ace_flag( const WCHAR *string ) +{ + static const struct + { + WCHAR str[3]; + DWORD value; + } + ace_flags[] = + { + { L"CI", CONTAINER_INHERIT_ACE }, + { L"FA", FAILED_ACCESS_ACE_FLAG }, + { L"ID", INHERITED_ACE }, + { L"IO", INHERIT_ONLY_ACE }, + { L"NP", NO_PROPAGATE_INHERIT_ACE }, + { L"OI", OBJECT_INHERIT_ACE }, + { L"SA", SUCCESSFUL_ACCESS_ACE_FLAG }, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(ace_flags); ++i) + { + if (!wcsncmp( string, ace_flags[i].str, 2 )) + return ace_flags[i].value; + } + return 0; +} + +static DWORD parse_ace_right( const WCHAR *string ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) + { + if (!wcsncmp( string, ace_rights[i].str, 2 )) + return ace_rights[i].value; + } + return 0; +} + +static BYTE parse_ace_flags( const WCHAR **string_ptr ) +{ + const WCHAR *string = *string_ptr; + BYTE flags = 0; + + while (*string == ' ') + string++; + + while (*string != ';') + { + DWORD flag = parse_ace_flag( string ); + if (!flag) return 0; + flags |= flag; + string += 2; + } + + *string_ptr = string; + return flags; +} + +static DWORD parse_ace_rights( const WCHAR **string_ptr ) +{ + DWORD rights = 0; + const WCHAR *string = *string_ptr; + + while (*string == ' ') + string++; + + if (string[0] == '0' && string[1] == 'x') + { + const WCHAR *p = string; + + while (*p && *p != ';') + p++; + + if (p - string <= 10 /* 8 hex digits + "0x" */ ) + { + rights = wcstoul( string, NULL, 16 ); + string = p; + } + else + WARN("Invalid rights string format: %s\n", debugstr_wn(string, p - string)); + } + else + { + while (*string != ';') + { + DWORD right = parse_ace_right( string ); + if (!right) return 0; + rights |= right; + string += 2; + } + } + + *string_ptr = string; + return rights; +} + +static BOOL parse_acl( const WCHAR *string, DWORD *flags, ACL *acl, DWORD *ret_size ) +{ + DWORD val; + DWORD sidlen; + DWORD length = sizeof(ACL); + DWORD acesize = 0; + DWORD acecount = 0; + ACCESS_ALLOWED_ACE *ace = NULL; /* pointer to current ACE */ + + TRACE("%s\n", debugstr_w(string)); + + if (acl) /* ace is only useful if we're setting values */ + ace = (ACCESS_ALLOWED_ACE *)(acl + 1); + + /* Parse ACL flags */ + *flags = parse_acl_flags( &string ); + + /* Parse ACE */ + while (*string == '(') + { + string++; + + /* Parse ACE type */ + val = parse_ace_type( &string ); + if (ace) + ace->Header.AceType = val; + if (*string != ';') + { + SetLastError( RPC_S_INVALID_STRING_UUID ); + return FALSE; + } + string++; + + /* Parse ACE flags */ + val = parse_ace_flags( &string ); + if (ace) + ace->Header.AceFlags = val; + if (*string != ';') + goto err; + string++; + + /* Parse ACE rights */ + val = parse_ace_rights( &string ); + if (ace) + ace->Mask = val; + if (*string != ';') + goto err; + string++; + + /* Parse ACE object guid */ + while (*string == ' ') + string++; + if (*string != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto err; + } + string++; + + /* Parse ACE inherit object guid */ + while (*string == ' ') + string++; + if (*string != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto err; + } + string++; + + /* Parse ACE account sid */ + if (parse_sid( string, ace ? (SID *)&ace->SidStart : NULL, &sidlen )) + { + while (*string && *string != ')') + string++; + } + + if (*string != ')') + goto err; + string++; + + acesize = sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + length += acesize; + if (ace) + { + ace->Header.AceSize = acesize; + ace = (ACCESS_ALLOWED_ACE *)((BYTE *)ace + acesize); + } + acecount++; + } + + *ret_size = length; + + if (length > 0xffff) + { + ERR("ACL too large\n"); + goto err; + } + + if (acl) + { + acl->AclRevision = ACL_REVISION; + acl->Sbz1 = 0; + acl->AclSize = length; + acl->AceCount = acecount; + acl->Sbz2 = 0; + } + return TRUE; + +err: + SetLastError( ERROR_INVALID_ACL ); + WARN("Invalid ACE string format\n"); + return FALSE; +} + +static BOOL parse_sd( const WCHAR *string, SECURITY_DESCRIPTOR_RELATIVE *sd, DWORD *size) +{ + BOOL ret = FALSE; + WCHAR toktype; + WCHAR *tok; + const WCHAR *lptoken; + BYTE *next = NULL; + DWORD len; + + *size = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + + tok = heap_alloc( (wcslen(string) + 1) * sizeof(WCHAR) ); + if (!tok) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + if (sd) + next = (BYTE *)(sd + 1); + + while (*string == ' ') + string++; + + while (*string) + { + toktype = *string; + + /* Expect char identifier followed by ':' */ + string++; + if (*string != ':') + { + SetLastError( ERROR_INVALID_PARAMETER ); + goto out; + } + string++; + + /* Extract token */ + lptoken = string; + while (*lptoken && *lptoken != ':') + lptoken++; + + if (*lptoken) + lptoken--; + + len = lptoken - string; + memcpy( tok, string, len * sizeof(WCHAR) ); + tok[len] = 0; + + switch (toktype) + { + case 'O': + { + DWORD bytes; + + if (!parse_sid( tok, (SID *)next, &bytes )) + goto out; + + if (sd) + { + sd->Owner = next - (BYTE *)sd; + next += bytes; /* Advance to next token */ + } + + *size += bytes; + + break; + } + + case 'G': + { + DWORD bytes; + + if (!parse_sid( tok, (SID *)next, &bytes )) + goto out; + + if (sd) + { + sd->Group = next - (BYTE *)sd; + next += bytes; /* Advance to next token */ + } + + *size += bytes; + + break; + } + + case 'D': + { + DWORD flags; + DWORD bytes; + + if (!parse_acl( tok, &flags, (ACL *)next, &bytes )) + goto out; + + if (sd) + { + sd->Control |= SE_DACL_PRESENT | flags; + sd->Dacl = next - (BYTE *)sd; + next += bytes; /* Advance to next token */ + } + + *size += bytes; + + break; + } + + case 'S': + { + DWORD flags; + DWORD bytes; + + if (!parse_acl( tok, &flags, (ACL *)next, &bytes )) + goto out; + + if (sd) + { + sd->Control |= SE_SACL_PRESENT | flags; + sd->Sacl = next - (BYTE *)sd; + next += bytes; /* Advance to next token */ + } + + *size += bytes; + + break; + } + + default: + FIXME("Unknown token\n"); + SetLastError( ERROR_INVALID_PARAMETER ); + goto out; + } + + string = lptoken; + } + + ret = TRUE; + +out: + heap_free(tok); + return ret; +} + +/****************************************************************************** + * ConvertStringSecurityDescriptorToSecurityDescriptorW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ConvertStringSecurityDescriptorToSecurityDescriptorW( + const WCHAR *string, DWORD revision, PSECURITY_DESCRIPTOR *sd, ULONG *ret_size ) +{ + DWORD size; + SECURITY_DESCRIPTOR *psd; + + TRACE("%s, %u, %p, %p\n", debugstr_w(string), revision, sd, ret_size); + + if (GetVersion() & 0x80000000) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + if (!string || !sd) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (revision != SID_REVISION) + { + SetLastError(ERROR_UNKNOWN_REVISION); + return FALSE; + } + + /* Compute security descriptor length */ + if (!parse_sd( string, NULL, &size )) + return FALSE; + + psd = *sd = LocalAlloc( GMEM_ZEROINIT, size ); + if (!psd) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + psd->Revision = SID_REVISION; + psd->Control |= SE_SELF_RELATIVE; + + if (!parse_sd( string, (SECURITY_DESCRIPTOR_RELATIVE *)psd, &size )) + { + LocalFree(psd); + return FALSE; + } + + if (ret_size) *ret_size = size; + return TRUE; +} -- 2.26.2

1 0

[PATCH v2] qcap: Fix uninitialised variable warning.
by Gijs Vermeulen 01 May '20

01 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 184651 dlls/qcap/filewriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 5e63facf7b..5e7acf9250 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -72,8 +72,8 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); REFERENCE_TIME start, stop; LARGE_INTEGER offset; + DWORD size = 0; HRESULT hr; - DWORD size; BYTE *data; if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK) -- 2.26.1

1 0

[PATCH] qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive().
by Zebediah Figura 01 May '20

01 May '20

This supersedes <https://source.winehq.org/patches/data/184651> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/filewriter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 2a0225a854..be1e4e773a 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -81,7 +81,11 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) || !WriteFile(filter->file, data, stop - start, &size, NULL)) + { ERR("Failed to write file, error %u.\n", GetLastError()); + return HRESULT_FROM_WIN32(hr); + } + if (size != stop - start) ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start)); -- 2.26.2

1 0

[PATCH 1/4] wineqtdecoder: Do not use wide string literals to fix warning.
by Gijs Vermeulen 01 May '20

01 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 031b08e1de..a86cd432c2 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -602,6 +602,8 @@ static const struct strmbase_filter_ops filter_ops = HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { + static const WCHAR inW[] = { 'I','n',0 }; + static const WCHAR outW[] = { 'O','u','t',0 }; QTVDecoderImpl *object; HRESULT hr; ISeekingPassThru *passthrough; @@ -614,9 +616,9 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->stream_cs); object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTVDecoderImpl.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, inW, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_source_init(&object->source, &object->filter, outW, &source_ops); if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, -- 2.26.1

2 4

[PATCH resend 1/2] cmd: Fix regression in if condition parsing.
by Bernhard Übelacker 01 May '20

01 May '20

Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Therefore if conditions got influenced by values of the previous line. Previous submission: https://www.winehq.org/pipermail/wine-devel/2020-April/165342.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1870e5688da..70ccddebc11 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2819f7fa99f..16843e40873 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len; -- 2.20.1

1 1

[PATCH] d3dcompiler: Add a helper to initialize the hlsl_ir_node structure.
by Zebediah Figura 01 May '20

01 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +- dlls/d3dcompiler_43/hlsl.y | 110 +++++++++++++--------- dlls/d3dcompiler_43/utils.c | 58 ++---------- 3 files changed, 81 insertions(+), 97 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1f1d8e26637..387e932a6cc 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1077,6 +1077,14 @@ static inline struct hlsl_ir_node *node_from_list(struct list *list) return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); } +static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, + struct hlsl_type *data_type, struct source_location loc) +{ + node->type = type; + node->data_type = data_type; + node->loc = loc; +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; @@ -1096,8 +1104,6 @@ struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) DECLSPEC_HIDDEN; -struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field) DECLSPEC_HIDDEN; struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assign_op assign_op, struct hlsl_ir_node *right) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b63166d8950..db305361738 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -277,7 +277,7 @@ static BOOL append_conditional_break(struct list *cond_list) ERR("Out of memory.\n"); return FALSE; } - iff->node.type = HLSL_IR_IF; + init_node(&iff->node, HLSL_IR_IF, NULL, condition->loc); iff->condition = not; list_add_tail(cond_list, &iff->node.entry); @@ -293,7 +293,7 @@ static BOOL append_conditional_break(struct list *cond_list) ERR("Out of memory.\n"); return FALSE; } - jump->node.type = HLSL_IR_JUMP; + init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); jump->type = HLSL_IR_JUMP_BREAK; list_add_head(iff->then_instrs, &jump->node.entry); return TRUE; @@ -324,8 +324,7 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l loop = d3dcompiler_alloc(sizeof(*loop)); if (!loop) goto oom; - loop->node.type = HLSL_IR_LOOP; - loop->node.loc = loc; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); loop->body = d3dcompiler_alloc(sizeof(*loop->body)); if (!loop->body) @@ -390,9 +389,8 @@ static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, if (!swizzle) return NULL; - swizzle->node.type = HLSL_IR_SWIZZLE; - swizzle->node.loc = *loc; - swizzle->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1); + init_node(&swizzle->node, HLSL_IR_SWIZZLE, + new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); swizzle->val = val; swizzle->swizzle = s; return swizzle; @@ -489,8 +487,7 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source ERR("Out of memory\n"); return NULL; } - jump->node.type = HLSL_IR_JUMP; - jump->node.loc = loc; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); jump->type = HLSL_IR_JUMP_RETURN; if (value) { @@ -510,6 +507,38 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source return jump; } +static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct source_location loc) +{ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + + if (!deref) + { + ERR("Out of memory.\n"); + return NULL; + } + init_node(&deref->node, HLSL_IR_DEREF, var->data_type, loc); + deref->src.type = HLSL_IR_DEREF_VAR; + deref->src.v.var = var; + return deref; +} + +static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, + struct hlsl_struct_field *field, const struct source_location loc) +{ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + + if (!deref) + { + ERR("Out of memory.\n"); + return NULL; + } + init_node(&deref->node, HLSL_IR_DEREF, field->type, loc); + deref->src.type = HLSL_IR_DEREF_RECORD; + deref->src.v.record.record = record; + deref->src.v.record.field = field; + return deref; +} + static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -540,13 +569,12 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, } if (components_count_type(field->type) == components_count_type(node->data_type)) { - deref = new_record_deref(&new_var_deref(var)->node, field); + deref = new_record_deref(&new_var_deref(var, var->loc)->node, field, node->loc); if (!deref) { ERR("Out of memory.\n"); break; } - deref->node.loc = node->loc; list_add_tail(list, &deref->node.entry); assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, node); list_add_tail(list, &assignment->entry); @@ -695,7 +723,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, list_move_tail(statements_list, v->initializer.instrs); d3dcompiler_free(v->initializer.instrs); - deref = new_var_deref(var); + deref = new_var_deref(var, var->loc); list_add_tail(statements_list, &deref->node.entry); assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); d3dcompiler_free(v->initializer.args); @@ -1982,8 +2010,7 @@ selection_statement: KW_IF '(' expr ')' if_body ERR("Out of memory\n"); YYABORT; } - instr->node.type = HLSL_IR_IF; - instr->node.loc = get_location(&@1); + init_node(&instr->node, HLSL_IR_IF, NULL, get_location(&@1)); instr->condition = node_from_list($3); instr->then_instrs = $5.then_instrs; instr->else_instrs = $5.else_instrs; @@ -2047,9 +2074,8 @@ primary_expr: C_FLOAT ERR("Out of memory.\n"); YYABORT; } - c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&@1); - c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + init_node(&c->node, HLSL_IR_CONSTANT, new_hlsl_type(d3dcompiler_strdup("float"), + HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1), get_location(&@1)); c->v.value.f[0] = $1; if (!($$ = make_list(&c->node))) YYABORT; @@ -2062,9 +2088,8 @@ primary_expr: C_FLOAT ERR("Out of memory.\n"); YYABORT; } - c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&@1); - c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + init_node(&c->node, HLSL_IR_CONSTANT, new_hlsl_type(d3dcompiler_strdup("int"), + HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1), get_location(&@1)); c->v.value.i[0] = $1; if (!($$ = make_list(&c->node))) YYABORT; @@ -2077,9 +2102,8 @@ primary_expr: C_FLOAT ERR("Out of memory.\n"); YYABORT; } - c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&@1); - c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); + init_node(&c->node, HLSL_IR_CONSTANT, new_hlsl_type(d3dcompiler_strdup("bool"), + HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1), get_location(&@1)); c->v.value.b[0] = $1; if (!($$ = make_list(&c->node))) YYABORT; @@ -2096,9 +2120,8 @@ primary_expr: C_FLOAT set_parse_status(&hlsl_ctx.status, PARSE_ERR); YYABORT; } - if ((deref = new_var_deref(var))) + if ((deref = new_var_deref(var, get_location(&@1)))) { - deref->node.loc = get_location(&@1); if (!($$ = make_list(&deref->node))) YYABORT; } @@ -2164,14 +2187,13 @@ postfix_expr: primary_expr { if (!strcmp($3, field->name)) { - struct hlsl_ir_deref *deref = new_record_deref(node, field); + struct hlsl_ir_deref *deref = new_record_deref(node, field, loc); if (!deref) { ERR("Out of memory\n"); YYABORT; } - deref->node.loc = loc; $$ = append_unop($1, &deref->node); break; } @@ -2208,28 +2230,23 @@ postfix_expr: primary_expr /* This may be an array dereference or a vector/matrix * subcomponent access. * We store it as an array dereference in any case. */ - struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); - struct hlsl_type *expr_type = node_from_list($1)->data_type; + const struct hlsl_type *expr_type = node_from_list($1)->data_type; + struct hlsl_ir_deref *deref; + struct hlsl_type *data_type; TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); - if (!deref) - { - ERR("Out of memory\n"); - YYABORT; - } - deref->node.type = HLSL_IR_DEREF; - deref->node.loc = get_location(&@2); + if (expr_type->type == HLSL_CLASS_ARRAY) { - deref->node.data_type = expr_type->e.array.type; + data_type = expr_type->e.array.type; } else if (expr_type->type == HLSL_CLASS_MATRIX) { - deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); + data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); } else if (expr_type->type == HLSL_CLASS_VECTOR) { - deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); + data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); } else { @@ -2237,19 +2254,26 @@ postfix_expr: primary_expr hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "array-indexed expression is scalar"); else hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "expression is not array-indexable"); - d3dcompiler_free(deref); free_instr_list($1); free_instr_list($3); YYABORT; } + if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) { hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); - d3dcompiler_free(deref); free_instr_list($1); free_instr_list($3); YYABORT; } + + if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) + { + free_instr_list($1); + free_instr_list($3); + YYABORT; + } + init_node(&deref->node, HLSL_IR_DEREF, data_type, get_location(&@2)); deref->src.type = HLSL_IR_DEREF_ARRAY; deref->src.v.array.array = node_from_list($1); deref->src.v.array.index = node_from_list($3); @@ -2287,9 +2311,7 @@ postfix_expr: primary_expr assert($4.args_count <= ARRAY_SIZE(constructor->args)); constructor = d3dcompiler_alloc(sizeof(*constructor)); - constructor->node.type = HLSL_IR_CONSTRUCTOR; - constructor->node.loc = get_location(&@3); - constructor->node.data_type = $2; + init_node(&constructor->node, HLSL_IR_CONSTRUCTOR, $2, get_location(&@3)); constructor->args_count = $4.args_count; memcpy(constructor->args, $4.args, $4.args_count * sizeof(*$4.args)); d3dcompiler_free($4.args); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f89db448582..ac9da97f27c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1327,17 +1327,10 @@ struct hlsl_ir_node *implicit_conversion(struct hlsl_ir_node *node, struct hlsl_ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, struct source_location *loc) { - struct hlsl_ir_expr *expr = d3dcompiler_alloc(sizeof(*expr)); + struct hlsl_ir_expr *expr; struct hlsl_type *type; unsigned int i; - if (!expr) - { - ERR("Out of memory\n"); - return NULL; - } - expr->node.type = HLSL_IR_EXPR; - expr->node.loc = *loc; type = operands[0]->data_type; for (i = 1; i <= 2; ++i) { @@ -1345,10 +1338,7 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope break; type = expr_common_type(type, operands[i]->data_type, loc); if (!type) - { - d3dcompiler_free(expr); return NULL; - } } for (i = 0; i <= 2; ++i) { @@ -1366,14 +1356,14 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope } if (!(cast = new_cast(operands[i], type, &operands[i]->loc))) - { - d3dcompiler_free(expr); return NULL; - } list_add_after(&operands[i]->entry, &cast->node.entry); operands[i] = &cast->node; } - expr->node.data_type = type; + + if (!(expr = d3dcompiler_alloc(sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, type, *loc); expr->op = op; expr->operands[0] = operands[0]; expr->operands[1] = operands[1]; @@ -1393,39 +1383,6 @@ struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, return expr_from_node(cast); } -struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) -{ - struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); - - if (!deref) - { - ERR("Out of memory.\n"); - return NULL; - } - deref->node.type = HLSL_IR_DEREF; - deref->node.data_type = var->data_type; - deref->src.type = HLSL_IR_DEREF_VAR; - deref->src.v.var = var; - return deref; -} - -struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field) -{ - struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); - - if (!deref) - { - ERR("Out of memory.\n"); - return NULL; - } - deref->node.type = HLSL_IR_DEREF; - deref->node.data_type = field->type; - deref->src.type = HLSL_IR_DEREF_RECORD; - deref->src.v.record.record = record; - deref->src.v.record.field = field; - return deref; -} - static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -1593,9 +1550,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign type_class = lhs->data_type->type; type = new_hlsl_type(NULL, type_class, lhs->data_type->base_type, dimx, 1); } - assign->node.type = HLSL_IR_ASSIGNMENT; - assign->node.loc = lhs->loc; - assign->node.data_type = type; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, type, lhs->loc); assign->writemask = writemask; rhs = implicit_conversion(rhs, type, &rhs->loc); -- 2.26.2

2 1

[PATCH 1/7] comctl32/monthcal: Use wide string literals.
by Nikolay Sivov 01 May '20

01 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/monthcal.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1de13dab36..98c682df33 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -142,7 +142,7 @@ typedef struct SIZE dim; /* [cx,cy] - dimensions of calendars matrix, row/column count */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; -static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; +static const WCHAR themeClass[] = L"Scrollbar"; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; @@ -782,7 +782,6 @@ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *st, int bold, const PAINTSTRUCT *ps) { - static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; COLORREF oldCol = 0; @@ -811,7 +810,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM SelectObject(hdc, bold ? infoPtr->hBoldFont : infoPtr->hFont); old_bkmode = SetBkMode(hdc, TRANSPARENT); - wsprintfW(buf, fmtW, st->wDay); + wsprintfW(buf, L"%d", st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); SetBkMode(hdc, old_bkmode); @@ -862,12 +861,6 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direc /* paint a title with buttons and month/year string */ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { - static const WCHAR mmmmW[] = {'M','M','M','M',0}; - static const WCHAR mmmW[] = {'M','M','M',0}; - static const WCHAR mmW[] = {'M','M',0}; - static const WCHAR fmtyearW[] = {'%','l','d',0}; - static const WCHAR fmtmmW[] = {'%','0','2','d',0}; - static const WCHAR fmtmW[] = {'%','d',0}; RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; WCHAR monthW[80], strW[80], fmtW[80], yearW[6] /* valid year range is 1601-30827 */; @@ -887,18 +880,18 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU DrawTextW(hdc, strW, lstrlenW(strW), title, DT_CENTER | DT_VCENTER | DT_SINGLELINE); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, fmtW, ARRAY_SIZE(fmtW)); - wsprintfW(yearW, fmtyearW, st->wYear); + wsprintfW(yearW, L"%ld", st->wYear); /* month is trickier as it's possible to have different format pictures, we'll test for M, MM, MMM, and MMMM */ - if (wcsstr(fmtW, mmmmW)) + if (wcsstr(fmtW, L"MMMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmmW)) + else if (wcsstr(fmtW, L"MMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmW)) - wsprintfW(monthW, fmtmmW, st->wMonth); + else if (wcsstr(fmtW, L"MM")) + wsprintfW(monthW, L"%02d", st->wMonth); else - wsprintfW(monthW, fmtmW, st->wMonth); + wsprintfW(monthW, L"%d", st->wMonth); /* update hit boxes */ yearoffset = 0; @@ -946,7 +939,6 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - static const WCHAR fmt_weekW[] = { '%','d',0 }; INT mindays, weeknum, weeknum1, startofprescal; INT i, prev_month; SYSTEMTIME st; @@ -1032,15 +1024,15 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con for(i = 0; i < 6; i++) { if((i == 0) && (weeknum > 50)) { - wsprintfW(buf, fmt_weekW, weeknum); + wsprintfW(buf, L"%d", weeknum); weeknum = 0; } else if((i == 5) && (weeknum > 47)) { - wsprintfW(buf, fmt_weekW, 1); + wsprintfW(buf, L"%d", 1); } else - wsprintfW(buf, fmt_weekW, weeknum + i); + wsprintfW(buf, L"%d", weeknum + i); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, 0, infoPtr->height_increment); @@ -1056,7 +1048,6 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con /* bottom today date */ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; WCHAR buf_todayW[30], buf_dateW[20], buf[80]; RECT text_rect, box_rect; HFONT old_font; @@ -1075,7 +1066,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons old_font = SelectObject(hdc, infoPtr->hBoldFont); SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); - wsprintfW(buf, fmt_todayW, buf_todayW, buf_dateW); + wsprintfW(buf, L"%s %s", buf_todayW, buf_dateW); DrawTextW(hdc, buf, -1, &text_rect, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE); DrawTextW(hdc, buf, -1, &text_rect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); @@ -2484,7 +2475,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) /* sets the size information */ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { - static const WCHAR O0W[] = { '0','0',0 }; RECT *title=&infoPtr->calendars[0].title; RECT *prev=&infoPtr->titlebtnprev; RECT *next=&infoPtr->titlebtnnext; @@ -2526,8 +2516,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) } else /* locale independent fallback on failure */ { - static const WCHAR sunW[] = { 'S','u','n' }; - GetTextExtentPoint32W(hdc, sunW, ARRAY_SIZE(sunW), &sz); + GetTextExtentPoint32W(hdc, L"Sun", 3, &sz); day_width = sz.cx; break; } @@ -2537,7 +2526,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ size.cx = 0; - GetTextExtentPoint32W(hdc, O0W, 2, &size); + GetTextExtentPoint32W(hdc, L"00", 2, &size); /* restore the originally selected font */ SelectObject(hdc, font); -- 2.26.2

1 6

[PATCH v2] dmime: Parse lyric track data
by Alistair Leslie-Hughes 01 May '20

01 May '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/lyricstrack.c | 93 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 49f44f52a34..64ce793cfa9 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicLyricsTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI lyrics_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -236,10 +241,94 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { lyrics_track_Join }; +static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream *stream, + struct chunk_entry *lyric) +{ + struct chunk_entry chunk = {.parent = lyric}; + HRESULT hr; + DMUS_IO_LYRICSTRACK_EVENTHEADER header; + WCHAR name[256]; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENT_LIST) { + struct chunk_entry child = {.parent = &chunk}; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTHEADER_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %d\n", header.lTimeLogical); + TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM;; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &name, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK\n"); + TRACE(" - name %s\n", debugstr_w(name)); + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_lyricstrack_list(IDirectMusicLyricsTrack *This, IStream *stream, struct chunk_entry *lyric) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = lyric}; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENTS_LIST) + hr = parse_lyrics_track_events(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACK_LIST) + hr = parse_lyricstrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.26.2

2 1

[PATCH] include: Add missing GUIDs and CLSIDs to wincodecsdk.idl
by Vijay Kiran Kamuju 01 May '20

01 May '20

Supercedes 184632 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 5/5] wined3d: Submit the current command buffer in adapter_vk_flush_context().
by Henri Verbeet 01 May '20

01 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 65850ab4ccc..f06cf30f273 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1493,7 +1493,11 @@ static void adapter_vk_destroy_query(struct wined3d_query *query) static void adapter_vk_flush_context(struct wined3d_context *context) { - TRACE("context %p.\n", context); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + + TRACE("context_vk %p.\n", context_vk); + + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } static void adapter_vk_draw_primitive(struct wined3d_device *device, -- 2.20.1

1 0

[PATCH 4/5] wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB.
by Henri Verbeet 01 May '20

01 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 222b3bf92c0..e7f04cbdf20 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4187,6 +4187,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, -- 2.20.1

1 0

[PATCH 3/5] wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM.
by Henri Verbeet 01 May '20

01 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 04e9300ee63..222b3bf92c0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4186,6 +4186,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, + {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, -- 2.20.1

1 0

[PATCH 2/5] wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM.
by Henri Verbeet 01 May '20

01 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 17 +++++++++++++---- dlls/wined3d/utils.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8b90c95c5e..49373eb58ac 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4509,6 +4509,7 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; VkImageViewCreateInfo create_info; + struct color_fixup_desc fixup; uint32_t flags = 0; VkResult vr; @@ -4529,10 +4530,18 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(texture_vk->t.resource.type, flags); create_info.format = format_vk->vk_format; - create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + fixup = format_vk->f.color_fixup; + if (is_identity_fixup(fixup) || !can_use_texture_swizzle(context_vk->c.d3d_info, &format_vk->f)) + { + create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + } + else + { + wined3d_vk_swizzle_from_color_fixup(&create_info.components, fixup); + } create_info.subresourceRange.aspectMask = vk_aspect_mask_from_format(&format_vk->f); create_info.subresourceRange.baseMipLevel = 0; create_info.subresourceRange.levelCount = texture_vk->t.level_count; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2108eb65ba3..04e9300ee63 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4135,6 +4135,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { enum wined3d_format_id id; VkFormat vk_format; + const char *fixup; } vulkan_formats[] = { @@ -4182,7 +4183,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, - {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, @@ -4211,6 +4212,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, VkFormatProperties properties; VkImageUsageFlags vk_usage; unsigned int flags; + const char *fixup; unsigned int i; VkResult vr; @@ -4219,6 +4221,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, if (vulkan_formats[i].id == format->f.id) { vk_format = vulkan_formats[i].vk_format; + fixup = vulkan_formats[i].fixup; break; } } @@ -4229,7 +4232,10 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } format->vk_format = vk_format; - format->f.color_fixup = COLOR_FIXUP_IDENTITY; + if (fixup) + format->f.color_fixup = create_color_fixup_desc_from_string(fixup); + else + format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Create Vulkan samplers for samplers.
by Henri Verbeet 01 May '20

01 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 23 +++++-- dlls/wined3d/context_vk.c | 59 +++++++++++++++++ dlls/wined3d/sampler.c | 115 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 20 +++++- 4 files changed, 210 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bd943a65afb..65850ab4ccc 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1439,7 +1439,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac static HRESULT adapter_vk_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { - struct wined3d_sampler *sampler_vk; + struct wined3d_sampler_vk *sampler_vk; TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", device, desc, parent, parent_ops, sampler); @@ -1450,16 +1450,31 @@ static HRESULT adapter_vk_create_sampler(struct wined3d_device *device, const st wined3d_sampler_vk_init(sampler_vk, device, desc, parent, parent_ops); TRACE("Created sampler %p.\n", sampler_vk); - *sampler = sampler_vk; + *sampler = &sampler_vk->s; return WINED3D_OK; } +static void wined3d_sampler_vk_destroy_object(void *object) +{ + struct wined3d_sampler_vk *sampler_vk = object; + struct wined3d_context_vk *context_vk; + + context_vk = wined3d_context_vk(context_acquire(sampler_vk->s.device, NULL, 0)); + + wined3d_context_vk_destroy_sampler(context_vk, sampler_vk->vk_image_info.sampler, sampler_vk->command_buffer_id); + heap_free(sampler_vk); + + context_release(&context_vk->c); +} + static void adapter_vk_destroy_sampler(struct wined3d_sampler *sampler) { - TRACE("sampler %p.\n", sampler); + struct wined3d_sampler_vk *sampler_vk = wined3d_sampler_vk(sampler); + + TRACE("sampler_vk %p.\n", sampler_vk); - wined3d_cs_destroy_object(sampler->device->cs, heap_free, sampler); + wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_vk_destroy_object, sampler_vk); } static HRESULT adapter_vk_create_query(struct wined3d_device *device, enum wined3d_query_type type, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 35b2b7eb7c7..20a0df181ca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -29,6 +29,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) +{ + switch (op) + { + case WINED3D_CMP_NEVER: + return VK_COMPARE_OP_NEVER; + case WINED3D_CMP_LESS: + return VK_COMPARE_OP_LESS; + case WINED3D_CMP_EQUAL: + return VK_COMPARE_OP_EQUAL; + case WINED3D_CMP_LESSEQUAL: + return VK_COMPARE_OP_LESS_OR_EQUAL; + case WINED3D_CMP_GREATER: + return VK_COMPARE_OP_GREATER; + case WINED3D_CMP_NOTEQUAL: + return VK_COMPARE_OP_NOT_EQUAL; + case WINED3D_CMP_GREATEREQUAL: + return VK_COMPARE_OP_GREATER_OR_EQUAL; + case WINED3D_CMP_ALWAYS: + return VK_COMPARE_OP_ALWAYS; + default: + if (!op) + WARN("Unhandled compare operation %#x.\n", op); + else + FIXME("Unhandled compare operation %#x.\n", op); + return VK_COMPARE_OP_NEVER; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -519,6 +548,31 @@ void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk o->command_buffer_id = command_buffer_id; } +void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, + VkSampler vk_sampler, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroySampler(device_vk->vk_device, vk_sampler, NULL)); + TRACE("Destroyed sampler 0x%s.\n", wine_dbgstr_longlong(vk_sampler)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking sampler 0x%s.\n", wine_dbgstr_longlong(vk_sampler)); + return; + } + + o->type = WINED3D_RETIRED_SAMPLER_VK; + o->u.vk_sampler = vk_sampler; + o->command_buffer_id = command_buffer_id; +} + void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { size_t object_size, idx; @@ -627,6 +681,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(o->u.vk_image_view)); break; + case WINED3D_RETIRED_SAMPLER_VK: + VK_CALL(vkDestroySampler(device_vk->vk_device, o->u.vk_sampler, NULL)); + TRACE("Destroyed sampler 0x%s.\n", wine_dbgstr_longlong(o->u.vk_sampler)); + break; + default: ERR("Unhandled object type %#x.\n", o->type); break; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index c4f4d3eec30..8d909627a18 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -124,13 +124,124 @@ void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined wined3d_cs_init_object(device->cs, wined3d_sampler_gl_cs_init, sampler_gl); } -void wined3d_sampler_vk_init(struct wined3d_sampler *sampler_vk, struct wined3d_device *device, +static VkFilter vk_filter_from_wined3d(enum wined3d_texture_filter_type f) +{ + switch (f) + { + default: + ERR("Invalid filter type %#x.\n", f); + case WINED3D_TEXF_POINT: + return VK_FILTER_NEAREST; + case WINED3D_TEXF_LINEAR: + return VK_FILTER_LINEAR; + } +} + +static VkSamplerMipmapMode vk_mipmap_mode_from_wined3d(enum wined3d_texture_filter_type f) +{ + switch (f) + { + default: + ERR("Invalid filter type %#x.\n", f); + case WINED3D_TEXF_NONE: + case WINED3D_TEXF_POINT: + return VK_SAMPLER_MIPMAP_MODE_NEAREST; + case WINED3D_TEXF_LINEAR: + return VK_SAMPLER_MIPMAP_MODE_LINEAR; + } +} + +static VkSamplerAddressMode vk_address_mode_from_wined3d(enum wined3d_texture_address a) +{ + switch (a) + { + default: + ERR("Invalid address mode %#x.\n", a); + case WINED3D_TADDRESS_WRAP: + return VK_SAMPLER_ADDRESS_MODE_REPEAT; + case WINED3D_TADDRESS_MIRROR: + return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT; + case WINED3D_TADDRESS_CLAMP: + return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; + case WINED3D_TADDRESS_BORDER: + return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; + case WINED3D_TADDRESS_MIRROR_ONCE: + return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; + } +} + +static void wined3d_sampler_vk_cs_init(void *object) +{ + struct wined3d_sampler_vk *sampler_vk = object; + const struct wined3d_sampler_desc *desc; + const struct wined3d_d3d_info *d3d_info; + struct VkSamplerCreateInfo sampler_desc; + const struct wined3d_vk_info *vk_info; + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + VkSampler vk_sampler; + VkResult vr; + + context_vk = wined3d_context_vk(context_acquire(sampler_vk->s.device, NULL, 0)); + device_vk = wined3d_device_vk(context_vk->c.device); + d3d_info = context_vk->c.d3d_info; + vk_info = context_vk->vk_info; + + desc = &sampler_vk->s.desc; + sampler_desc.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; + sampler_desc.pNext = NULL; + sampler_desc.flags = 0; + sampler_desc.magFilter = vk_filter_from_wined3d(desc->mag_filter); + sampler_desc.minFilter = vk_filter_from_wined3d(desc->min_filter); + sampler_desc.mipmapMode = vk_mipmap_mode_from_wined3d(desc->mip_filter); + sampler_desc.addressModeU = vk_address_mode_from_wined3d(desc->address_u); + sampler_desc.addressModeV = vk_address_mode_from_wined3d(desc->address_v); + sampler_desc.addressModeW = vk_address_mode_from_wined3d(desc->address_w); + sampler_desc.mipLodBias = desc->lod_bias; + sampler_desc.anisotropyEnable = desc->max_anisotropy != 1; + sampler_desc.maxAnisotropy = desc->max_anisotropy; + sampler_desc.compareEnable = desc->compare; + sampler_desc.compareOp = vk_compare_op_from_wined3d(desc->comparison_func); + sampler_desc.minLod = desc->min_lod; + sampler_desc.maxLod = desc->max_lod; + sampler_desc.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; + sampler_desc.unnormalizedCoordinates = VK_FALSE; + + if ((desc->address_u == WINED3D_TADDRESS_BORDER || desc->address_v == WINED3D_TADDRESS_BORDER + || desc->address_w == WINED3D_TADDRESS_BORDER) + && (desc->border_color[0] != 0.0f || desc->border_color[1] != 0.0f + || desc->border_color[2] != 0.0f || desc->border_color[3] != 0.0f)) + FIXME("Unhandled border colour {%.8e, %.8e, %.8e, %.8e}.\n", + desc->border_color[0], desc->border_color[1], + desc->border_color[2], desc->border_color[3]); + if (desc->mip_base_level) + FIXME("Unhandled mip_base_level %u.\n", desc->mip_base_level); + if ((d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) && !desc->srgb_decode) + FIXME("Unhandled srgb_decode %#x.\n", desc->srgb_decode); + + vr = VK_CALL(vkCreateSampler(device_vk->vk_device, &sampler_desc, NULL, &vk_sampler)); + context_release(&context_vk->c); + if (vr < 0) + { + ERR("Failed to create Vulkan sampler, vr %s.\n", wined3d_debug_vkresult(vr)); + return; + } + + TRACE("Created sampler 0x%s.\n", wine_dbgstr_longlong(vk_sampler)); + + sampler_vk->vk_image_info.sampler = vk_sampler; + sampler_vk->vk_image_info.imageView = VK_NULL_HANDLE; + sampler_vk->vk_image_info.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; +} + +void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("sampler_vk %p, device %p, desc %p, parent %p, parent_ops %p.\n", sampler_vk, device, desc, parent, parent_ops); - wined3d_sampler_init(sampler_vk, device, desc, parent, parent_ops); + wined3d_sampler_init(&sampler_vk->s, device, desc, parent, parent_ops); + wined3d_cs_init_object(device->cs, wined3d_sampler_vk_cs_init, sampler_vk); } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2409728f270..7a412d7a8e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -300,6 +300,7 @@ extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) @@ -2232,6 +2233,7 @@ enum wined3d_retired_object_type_vk WINED3D_RETIRED_IMAGE_VK, WINED3D_RETIRED_BUFFER_VIEW_VK, WINED3D_RETIRED_IMAGE_VIEW_VK, + WINED3D_RETIRED_SAMPLER_VK, }; struct wined3d_retired_object_vk @@ -2252,6 +2254,7 @@ struct wined3d_retired_object_vk VkImage vk_image; VkBufferView vk_buffer_view; VkImageView vk_image_view; + VkSampler vk_sampler; } u; uint64_t command_buffer_id; }; @@ -2334,6 +2337,8 @@ void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk VkImageView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, + VkSampler vk_sampler, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, const struct wined3d_fb_state *fb, unsigned int rt_count, @@ -4113,7 +4118,20 @@ void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_sampler_vk_init(struct wined3d_sampler *sampler_vk, +struct wined3d_sampler_vk +{ + struct wined3d_sampler s; + + VkDescriptorImageInfo vk_image_info; + uint64_t command_buffer_id; +}; + +static inline struct wined3d_sampler_vk *wined3d_sampler_vk(struct wined3d_sampler *sampler) +{ + return CONTAINING_RECORD(sampler, struct wined3d_sampler_vk, s); +} + +void wined3d_sampler_vk_init(struct wined3d_sampler_vk *sampler_vk, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH v2] msvcrt: Avoid depending on signed variable overflow in parse_double.
by Piotr Caban 01 May '20

01 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Avoid depending on signed variable overflow in parse_double.
by Piotr Caban 01 May '20

01 May '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] quartz/tests: Fix a copy-paste error.
by Zebediah Figura 01 May '20

01 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 367d7df568f..d8c2ee8b4a7 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -378,12 +378,12 @@ static void test_aggregation(void) ULONG ref; filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); -- 2.26.2

1 4

[PATCH 2/3] windowscodecs/tests: Move the loop in test_dds_decoder_frame_count() and test_dds_decoder_image_parameters() into a single one.
by Ziqing Hui 01 May '20

01 May '20

test_dds_decoder_frame_count() and test_dds_decoder_image_parameters() have the same structure. They have a same loop, they use same test data, which makes code duplicate. This patch move the loop to test_dds_decoder() so that there is only one loop. Also, make the test data a global array rather than two local arrays. PATCH 1 and PATCH 2 in this patches set used to be one patch. I split them to make the patches look clearer. (PATCH 2 is still not too clear to review but better than before) Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 177 ++++++++++----------------- 1 file changed, 67 insertions(+), 110 deletions(-)

2 1

[PATCH] include: Add missing CLSIDs to wincodecsdk.idl
by Vijay Kiran Kamuju 01 May '20

01 May '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] ntoskrnl: Quiet down failed class installer debug message
by Andrew Eikum 30 Apr '20

30 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 75310f7b35..9e4c2c1416 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -298,7 +298,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN { if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) { - ERR("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); return FALSE; } } -- 2.26.2

1 0

[PATCH 1/2] setupapi: Quiet down missing driver debug message
by Andrew Eikum 30 Apr '20

30 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..fca60402a5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + WARN("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; } -- 2.26.2

1 0

[PATCH 1/5] kernelbase/locale: Implement sortkey generation on official tables
by Fabian Maurer 30 Apr '20

30 Apr '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/locale.c | 110 ++++++++ dlls/kernelbase/locale.c | 477 ++++++++++++++++++++++++++--------- 2 files changed, 464 insertions(+), 123 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4c1e1b4d73..13839bb10a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2681,6 +2681,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + /* test small buffer */ + lstrcpyW(buf, fooW); + ret = func_ptr(LCMAP_SORTKEY, lower_case, -1, buf, 2); + ok(ret == 0, "Expected a failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%s unexpected error code %d\n", func_name, GetLastError());; + /* test srclen = 0 */ SetLastError(0xdeadbeef); ret = func_ptr(0, upper_case, 0, buf, ARRAY_SIZE(buf)); @@ -3108,6 +3115,108 @@ static void test_sorting(void) } } +struct sorting_test_entry { + const WCHAR* locale; + DWORD flags; + const WCHAR* first; + const WCHAR* second; + int result_sortkey; + int result_compare; + BOOL broken_on_old_win; +}; + +static const struct sorting_test_entry unicode_sorting_tests[] = +{ + /* 0 */ { L"en-US", 0, L"\ue6e3\u0a02", L"\ue6e3\u20dc", CSTR_LESS_THAN, 0, TRUE }, /* Test default character, when there is main weight extra there must be no diacritic weight */ + /* 1 */ { L"en-US", 0, L"\u276a", L"\u2768", CSTR_GREATER_THAN }, /* Test symbols, must add diacritic weight */ + /* 2 */ { L"en-US", 0, L"\u204d", L"\uff02", CSTR_LESS_THAN }, /* Test symbols, must add case weight */ + /* 3 */ { L"en-US", 0, L"a \u2060 b", L"a b", CSTR_EQUAL }, /* Test unsortable characters */ + /* 4 */ { L"en-US", 0, L"a \xfff0 b", L"a b", CSTR_EQUAL }, /* Test invalid characters */ + /* 5 */ { L"en-US", 0, L"\x00fc", L"\x016d", CSTR_LESS_THAN }, + /* 6 */ { L"en-US", 0, L"\x3fcb\x7fd5", L"\x0006\x3032", CSTR_GREATER_THAN }, + /* 7 */ { L"en-US", 0, L"\x00fc\x30fd", L"\x00fa\x1833", CSTR_LESS_THAN }, + /* 8 */ { L"en-US", 0, L"\x0037", L"\x277c", CSTR_LESS_THAN, 0, TRUE }, /* Normal character */ + /* 9 */ { L"en-US", 0, L"\x1eca", L"\x1ecb", CSTR_GREATER_THAN }, /* Normal character */ + /* 10 */ { L"en-US", 0, L"\x1d05", L"\x1d48", CSTR_GREATER_THAN }, /* Normal character */ + /* 11 */ { L"en-US", 0, L"\x19d7", L"\x096d", CSTR_GREATER_THAN }, /* Normal character diacritics */ + /* 12 */ { L"en-US", 0, L"\x00f5", L"\x1ecf", CSTR_LESS_THAN }, /* Normal character diacritics */ + /* 13 */ { L"en-US", 0, L"\x2793", L"\x0d70", CSTR_LESS_THAN, 0, TRUE }, /* Normal character diacritics */ + /* 14 */ { L"en-US", 0, L"A", L"a", CSTR_GREATER_THAN }, /* Normal character case weights */ + /* 15 */ { L"en-US", 0, L"z", L"Z", CSTR_LESS_THAN }, /* Normal character case weights */ + /* 16 */ { L"en-US", 0, L"\xe5a6", L"\xe5a5\x0333", CSTR_GREATER_THAN, 0, TRUE }, /* CJK with extra value */ + /* 17 */ { L"en-US", 0, L"\xe5d7", L"\xe5d6\x0330", CSTR_GREATER_THAN, 0, TRUE }, /* CJK with extra value */ + /* 18 */ { L"en-US", 0, L"\x1B56\x0330", L"\x1096", CSTR_GREATER_THAN }, /* Diacritic is added */ + /* 19 */ { L"en-US", 0, L"\x1817\x0333", L"\x19d7", CSTR_GREATER_THAN }, /* Diacritic is added */ + /* 20 */ { L"en-US", 0, L"\x04de\x05ac", L"\x0499", CSTR_GREATER_THAN }, /* Diacritic is added */ + /* 21 */ { L"en-US", 0, L"\x01ba\x0654", L"\x01b8", CSTR_LESS_THAN }, /* Diacritic can overflow */ + /* 22 */ { L"en-US", 0, L"\x06b7\x06eb", L"\x06b6", CSTR_LESS_THAN }, /* Diacritic can overflow */ + /* 23 */ { L"en-US", 0, L"\x1420\x0333", L"\x141f", CSTR_LESS_THAN }, /* Diacritic can overflow */ + /* 24 */ { L"en-US", 0, L"\x11bc", L"\x110b", CSTR_GREATER_THAN }, /* Jamo case weight */ + /* 25 */ { L"en-US", 0, L"\x11c1", L"\x1111", CSTR_GREATER_THAN }, /* Jamo case weight */ + /* 26 */ { L"en-US", 0, L"\x11af", L"\x1105", CSTR_GREATER_THAN }, /* Jamo case weight */ + /* 27 */ { L"en-US", 0, L"\x11c2", L"\x11f5", CSTR_LESS_THAN }, /* Jamo main weight */ + /* 28 */ { L"en-US", 0, L"\x1108", L"\x1121", CSTR_LESS_THAN }, /* Jamo main weight */ + /* 29 */ { L"en-US", 0, L"\x1116", L"\x11c7", CSTR_LESS_THAN }, /* Jamo main weight */ + /* 30 */ { L"en-US", 0, L"\x11b1", L"\x11d1", CSTR_LESS_THAN }, /* Jamo main weight */ + /* 31 */ { L"en-US", 0, L"\x4550\x73d2", L"\x3211\x23ad", CSTR_GREATER_THAN }, /* Script 5 main weight 1 */ + /* 32 */ { L"en-US", 0, L"\x3265", L"\x4079", CSTR_LESS_THAN }, /* Script 5 main weight 1 */ + /* 33 */ { L"en-US", 0, L"\x4c19\x68d0\x52d0", L"\x316d", CSTR_GREATER_THAN }, /* Script 5 main weight 1 */ + /* 34 */ { L"en-US", 0, L"\x72dd", L"\x6b8a", CSTR_GREATER_THAN }, /* Script 5 main weight 2 */ + /* 35 */ { L"en-US", 0, L"\x6785\x3bff\x6f83", L"\x7550\x34c9\x71a7", CSTR_LESS_THAN }, /* Script 5 main weight 2 */ + /* 36 */ { L"en-US", 0, L"\x5d61", L"\x3aef", CSTR_LESS_THAN }, /* Script 5 main weight 2 */ + /* 37 */ { L"en-US", 0, L"\x207a", L"\xfe62", CSTR_GREATER_THAN }, /* Symbols case weights */ + /* 38 */ { L"en-US", 0, L"\xfe65", L"\xff1e", CSTR_GREATER_THAN }, /* Symbols case weights */ + /* 39 */ { L"en-US", 0, L"\x2502", L"\xffe8", CSTR_GREATER_THAN }, /* Symbols case weights */ + /* 40 */ { L"en-US", 0, L"\x21da", L"\x21dc", CSTR_LESS_THAN }, /* Symbols diacritic weights */ + /* 41 */ { L"en-US", 0, L"\x29fb", L"\x2295", CSTR_LESS_THAN }, /* Symbols diacritic weights */ + /* 42 */ { L"en-US", 0, L"\x0092", L"\x009c", CSTR_LESS_THAN }, /* Symbols diacritic weights */ + /* 43 */ { L"en-US", NORM_IGNORESYMBOLS, L"\x21da", L"\x21dc", CSTR_EQUAL }, /* NORM_IGNORESYMBOLS */ + /* 44 */ { L"en-US", NORM_IGNORESYMBOLS, L"\x29fb", L"\x2295", CSTR_EQUAL }, /* NORM_IGNORESYMBOLS */ + /* 45 */ { L"en-US", NORM_IGNORESYMBOLS, L"\x0092", L"\x009c", CSTR_EQUAL }, /* NORM_IGNORESYMBOLS */ + /* 46 */ { L"en-US", 0, L"\x3099", L"\x309a", CSTR_EQUAL }, /* MIN_WEIGHT */ + /* 47 */ { L"en-US", 0, L"\x309b", L"\x05a2", CSTR_EQUAL }, /* MIN_WEIGHT */ + /* 48 */ { L"en-US", 0, L"\xff9e", L"\x0e47", CSTR_EQUAL }, /* MIN_WEIGHT */ +}; + +static void test_unicode_sorting(void) +{ + int i; + if (!pLCMapStringEx) + { + + win_skip("LCMapStringEx not available\n"); + return; + } + for (i = 0; i < ARRAY_SIZE(unicode_sorting_tests); i++) + { + int pos; + BYTE buff1[1000]; + BYTE buff2[1000]; + int len1, len2; + int result = CSTR_EQUAL; + const struct sorting_test_entry* entry = &unicode_sorting_tests[i]; + + len1 = pLCMapStringEx(entry->locale, LCMAP_SORTKEY | entry->flags, entry->first, -1, (WCHAR*)buff1, ARRAY_SIZE(buff1), NULL, NULL, 0); + len2 = pLCMapStringEx(entry->locale, LCMAP_SORTKEY | entry->flags, entry->second, -1, (WCHAR*)buff2, ARRAY_SIZE(buff2), NULL, NULL, 0); + + for (pos = 0; pos < len1 && pos < len2; pos++) + { + if (buff1[pos] > buff2[pos]) + { + result = CSTR_GREATER_THAN; + break; + } + else if (buff1[pos] < buff2[pos]) + { + result = CSTR_LESS_THAN; + break; + } + } + + ok (result == entry->result_sortkey || broken(entry->broken_on_old_win), "Test %d - Expected %d, got %d\n", i, entry->result_sortkey, result); + } +} + static void test_FoldStringA(void) { int ret, i, j; @@ -6897,4 +7006,5 @@ START_TEST(locale) test_NLSVersion(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); + test_unicode_sorting(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 53e4e42da3..74177371d9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2126,127 +2126,6 @@ static int wcstombs_codepage( UINT codepage, DWORD flags, const WCHAR *src, int return wcstombs_sbcs( info, src, srclen, dst, dstlen ); } - -static int get_sortkey( DWORD flags, const WCHAR *src, int srclen, char *dst, int dstlen ) -{ - WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ - int key_len[4]; - char *key_ptr[4]; - const WCHAR *src_save = src; - int srclen_save = srclen; - - key_len[0] = key_len[1] = key_len[2] = key_len[3] = 0; - for (; srclen; srclen--, src++) - { - unsigned int i, decomposed_len = 1;/*wine_decompose(*src, dummy, 4);*/ - dummy[0] = *src; - if (decomposed_len) - { - for (i = 0; i < decomposed_len; i++) - { - WCHAR wch = dummy[i]; - unsigned int ce; - - if ((flags & NORM_IGNORESYMBOLS) && - (get_char_type( CT_CTYPE1, wch ) & (C1_PUNCT | C1_SPACE))) - continue; - - if (flags & NORM_IGNORECASE) wch = casemap( nls_info.LowerCaseTable, wch ); - - ce = collation_table[collation_table[collation_table[wch >> 8] + ((wch >> 4) & 0x0f)] + (wch & 0xf)]; - if (ce != (unsigned int)-1) - { - if (ce >> 16) key_len[0] += 2; - if ((ce >> 8) & 0xff) key_len[1]++; - if ((ce >> 4) & 0x0f) key_len[2]++; - if (ce & 1) - { - if (wch >> 8) key_len[3]++; - key_len[3]++; - } - } - else - { - key_len[0] += 2; - if (wch >> 8) key_len[0]++; - if (wch & 0xff) key_len[0]++; - } - } - } - } - - if (!dstlen) /* compute length */ - /* 4 * '\1' + key length */ - return key_len[0] + key_len[1] + key_len[2] + key_len[3] + 4; - - if (dstlen < key_len[0] + key_len[1] + key_len[2] + key_len[3] + 4 + 1) - return 0; /* overflow */ - - src = src_save; - srclen = srclen_save; - - key_ptr[0] = dst; - key_ptr[1] = key_ptr[0] + key_len[0] + 1; - key_ptr[2] = key_ptr[1] + key_len[1] + 1; - key_ptr[3] = key_ptr[2] + key_len[2] + 1; - - for (; srclen; srclen--, src++) - { - unsigned int i, decomposed_len = 1;/*wine_decompose(*src, dummy, 4);*/ - dummy[0] = *src; - if (decomposed_len) - { - for (i = 0; i < decomposed_len; i++) - { - WCHAR wch = dummy[i]; - unsigned int ce; - - if ((flags & NORM_IGNORESYMBOLS) && - (get_char_type( CT_CTYPE1, wch ) & (C1_PUNCT | C1_SPACE))) - continue; - - if (flags & NORM_IGNORECASE) wch = casemap( nls_info.LowerCaseTable, wch ); - - ce = collation_table[collation_table[collation_table[wch >> 8] + ((wch >> 4) & 0x0f)] + (wch & 0xf)]; - if (ce != (unsigned int)-1) - { - WCHAR key; - if ((key = ce >> 16)) - { - *key_ptr[0]++ = key >> 8; - *key_ptr[0]++ = key & 0xff; - } - /* make key 1 start from 2 */ - if ((key = (ce >> 8) & 0xff)) *key_ptr[1]++ = key + 1; - /* make key 2 start from 2 */ - if ((key = (ce >> 4) & 0x0f)) *key_ptr[2]++ = key + 1; - /* key 3 is always a character code */ - if (ce & 1) - { - if (wch >> 8) *key_ptr[3]++ = wch >> 8; - if (wch & 0xff) *key_ptr[3]++ = wch & 0xff; - } - } - else - { - *key_ptr[0]++ = 0xff; - *key_ptr[0]++ = 0xfe; - if (wch >> 8) *key_ptr[0]++ = wch >> 8; - if (wch & 0xff) *key_ptr[0]++ = wch & 0xff; - } - } - } - } - - *key_ptr[0] = 1; - *key_ptr[1] = 1; - *key_ptr[2] = 1; - *key_ptr[3]++ = 1; - *key_ptr[3] = 0; - return key_ptr[3] - dst; -} - - /* compose a full-width katakana. return consumed source characters. */ static int compose_katakana( const WCHAR *src, int srclen, WCHAR *dst ) { @@ -2574,6 +2453,358 @@ static int compare_weights(int flags, const WCHAR *str1, int len1, return len1 - len2; } +/* Start sortkey handler code. */ + +/* Defines */ + +#define JAPANESE 3 +#define MIN_WEIGHT 2 +#define LIST_STACK_BUFFER 1000 + +/* Internal structures */ + +typedef struct _character_info +{ + BYTE weight_primary; + BYTE script_member; + BYTE weight_diacritic; + BYTE weight_case; +} character_info; + +typedef struct _weight_main_info +{ + BYTE script_member; + BYTE weight_primary; + BYTE extra; +} weight_main_info; + +typedef struct _list +{ + int extra_len; + int len; + BYTE buffer[LIST_STACK_BUFFER]; + int buffer_count; + BYTE* extra; + int element_size; +} list; + +typedef struct _sortkey_data +{ + int flags; + list key; + list weights_main; + list weights_diacritic; + list weights_case; +} sortkey_data; + +/* List functions */ + +static void LIST_INIT(list* name, int type_size) +{ + name->extra_len = 0; + name->len = 0; + name->extra = 0; + name->buffer_count = LIST_STACK_BUFFER / type_size; + name->element_size = type_size; +} + +static void LIST_DESTROY(list* name) +{ + RtlFreeHeap(GetProcessHeap(), 0, name->extra); +} + +static void* LIST_GET(list* name, int index) +{ + if ((index + 1) * name->element_size <= LIST_STACK_BUFFER) + return &name->buffer[index * name->element_size]; + else + return &name->extra[index * name->element_size - name->buffer_count]; +} + +/* Add entry to list, resizing as needed */ +static void LIST_ADD(list* name, const void *value) +{ + void* entry; + if ((name->len + 1) * name->element_size > name->extra_len + LIST_STACK_BUFFER) + { + if (!name->extra) /* First allocation */ + { + name->extra_len = LIST_STACK_BUFFER; + name->extra = RtlAllocateHeap(GetProcessHeap(), 0, name->extra_len); + } + else + { + name->extra_len *= 2; + name->extra = RtlReAllocateHeap(GetProcessHeap(), 0,name->extra, name->extra_len); + } + } + entry = LIST_GET(name, name->len); + memcpy(entry, value, name->element_size); + name->len++; +} + +/* Append a weight list to the sortkey */ +#define APPEND_LIST_TO_SORTKEY(data, weights, type, statement_get_value, statement_is_ignored) \ + do { \ + int z; \ + int end = data->weights.len - 1; \ + while (end >= 0) \ + { \ + const type* element = LIST_GET(&data->weights, end); \ + (void)element; \ + if (!(statement_is_ignored)) break; \ + end--; \ + } \ + for (z = 0; z <= end; z++) \ + { \ + const type* element = LIST_GET(&data->weights, z); \ + LIST_ADD(&data->key, statement_get_value); \ + } \ + } while (0); + +/* Helper functions */ + +static BOOL get_char(sortkey_data* data, character_info* info, WCHAR ch) +{ + DWORD value = sort.keys[ch]; + + info->weight_case = value >> 24; + info->weight_diacritic = (value >> 16) & 0xff; + info->script_member = (value >> 8) & 0xff; + info->weight_primary = value & 0xff; + return info->script_member != 0; +} + +static void sortkey_data_init(sortkey_data* data, int flags, const WCHAR* locale, BOOL is_compare_string) +{ + data->flags = flags; + LIST_INIT(&data->key, sizeof(BYTE)); + LIST_INIT(&data->weights_main, sizeof(BYTE)); + LIST_INIT(&data->weights_diacritic, sizeof(BYTE)); + LIST_INIT(&data->weights_case, sizeof(BYTE)); +} + +static void sortkey_data_destroy(sortkey_data* data) +{ + LIST_DESTROY(&data->key); + LIST_DESTROY(&data->weights_main); + LIST_DESTROY(&data->weights_diacritic); + LIST_DESTROY(&data->weights_case); +} + +static weight_main_info create_weight_main(BYTE script_member, BYTE weight_primary) +{ + weight_main_info ret = { 0 }; + ret.script_member = script_member; + ret.weight_primary = weight_primary; + return ret; +} + +static void case_weights_add(sortkey_data* data, BYTE value) +{ + int flags = data->flags; + if (NORM_IGNORECASE & flags) + value = value & ~(16 + 8); + if (NORM_IGNOREWIDTH & flags) + value = value & ~(1); + if (NORM_IGNOREKANATYPE & flags) + value = value & ~(32); + + LIST_ADD(&data->weights_case, &value); +} + +static void main_weights_add(sortkey_data *data, weight_main_info* value) +{ + LIST_ADD(&data->weights_main, &value->script_member); + LIST_ADD(&data->weights_main, &value->weight_primary); + if (value->extra > 0) + LIST_ADD(&data->weights_main, &value->extra); +} + +static void diacritic_weights_add(sortkey_data* data, const character_info* info, BYTE value) +{ + LIST_ADD(&data->weights_diacritic, &value); +} + +/* Main sortkey logic */ + +static void sortkey_handle_default_character(sortkey_data* data, WCHAR c) +{ + weight_main_info weightmain; + character_info info; + + if (!get_char(data, &info, c)) + { + return; + } + + weightmain = create_weight_main(info.script_member, info.weight_primary); + if (info.script_member >= 0xa9 && info.script_member <= 0xaf) /* Some CJK have extra value */ + weightmain.extra = info.weight_diacritic; + else + diacritic_weights_add(data, &info, info.weight_diacritic); + + main_weights_add(data, &weightmain); + + case_weights_add(data, info.weight_case); +} + +static BOOL sortkey_handle_character(sortkey_data* data, WCHAR c, const WCHAR* str, int i) +{ + weight_main_info weightmain; + character_info info; + int flags = data->flags; + + if (!get_char(data, &info, c)) + { + return FALSE; + } + + switch (info.script_member) + { + case 0: /* Not sorted */ + break; + + case 1: + if (data->weights_diacritic.len > 0) + { + BYTE* entry = LIST_GET(&data->weights_diacritic, data->weights_diacritic.len - 1); + *entry += info.weight_diacritic; /* Overflow can happen, that's okay */ + } + else + diacritic_weights_add(data, &info, info.weight_diacritic); + break; + + case JAPANESE: + /* TODO */ + break; + + case 4: /* Jamo */ + weightmain = create_weight_main(info.weight_primary, info.weight_diacritic); + main_weights_add(data, &weightmain); + + diacritic_weights_add(data, &info, MIN_WEIGHT); + + case_weights_add(data, info.weight_case); + break; + + case 5: + weightmain = create_weight_main(253, 255); + main_weights_add(data, &weightmain); + + weightmain = create_weight_main(info.weight_primary, info.weight_diacritic); + main_weights_add(data, &weightmain); + + diacritic_weights_add(data, &info, MIN_WEIGHT); + + case_weights_add(data, MIN_WEIGHT); + break; + + case 6: /* Punctuation */ + /* TODO */ + break; + + case 7: /* Symbols */ + case 8: /* Symbols */ + case 9: /* Symbols */ + case 10: /* Symbols */ + case 11: /* Symbols */ + case 12: /* Symbols */ + if (flags & NORM_IGNORESYMBOLS) + break; + + weightmain = create_weight_main(info.script_member, info.weight_primary); + main_weights_add(data, &weightmain); + + diacritic_weights_add(data, &info, info.weight_diacritic); + + case_weights_add(data, info.weight_case); + break; + + default: + sortkey_handle_default_character(data, c); + break; + } + return TRUE; +} + +static void sortkey_write_result(sortkey_data* data) +{ + int flags = data->flags; + + const BYTE SORTKEY_SEPARATOR = 1; + const BYTE SORTKEY_TERMINATOR = 0; + + /* Main weights */ + + APPEND_LIST_TO_SORTKEY(data, weights_main, BYTE, element, FALSE); + + LIST_ADD(&data->key, &SORTKEY_SEPARATOR); + + /* Diacritic weights */ + + if ((flags & NORM_IGNORENONSPACE) == 0) + { + APPEND_LIST_TO_SORTKEY(data, weights_diacritic, BYTE, element, *element <= MIN_WEIGHT); + } + + LIST_ADD(&data->key, &SORTKEY_SEPARATOR); + + /* Case weights */ + if ((NORM_IGNORECASE & flags) == 0 || (NORM_IGNOREWIDTH & flags) == 0) + { + APPEND_LIST_TO_SORTKEY(data, weights_case, BYTE, element, FALSE); + } + + LIST_ADD(&data->key, &SORTKEY_SEPARATOR); + + /* Extra weights */ + /* TODO */ + + LIST_ADD(&data->key, &SORTKEY_SEPARATOR); + + /* Special weights */ + /* TODO */ + + LIST_ADD(&data->key, &SORTKEY_TERMINATOR); +} + +static int sortkey_generate(int flags, const WCHAR* locale, const WCHAR* str, int str_len, BYTE* buffer, int buffer_len) +{ + int i; + sortkey_data data; + int ret = 0; + + sortkey_data_init(&data, flags, locale, FALSE); + + if (str_len == -1) + str_len = wcslen(str); + + for (i = 0; i < str_len; i++) + { + sortkey_handle_character(&data, str[i], str, i); + } + + sortkey_write_result(&data); + + if (data.key.len <= buffer_len) + { + for (i = 0; i < data.key.len; i++) + { + BYTE* value = LIST_GET(&data.key, i); + buffer[i] = *value; + } + ret = data.key.len; + } + else if (!buffer) + { + ret = data.key.len; + } + sortkey_data_destroy(&data); + return ret; +} + +/* End sortkey handler code */ static const struct geoinfo *get_geoinfo_ptr( GEOID geoid ) { @@ -4964,8 +5195,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co TRACE( "(%s,0x%08x,%s,%d,%p,%d)\n", debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen ); - if ((ret = get_sortkey( flags, src, srclen, (char *)dst, dstlen ))) ret++; - else SetLastError( ERROR_INSUFFICIENT_BUFFER ); + if (!(ret = sortkey_generate(flags, L"", src, srclen, (BYTE *)dst, dstlen ))) + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return ret; } -- 2.26.2

3 12

[PATCH 1/2] cmd: Fix regression in if condition parsing.
by Bernhard Übelacker 30 Apr '20

30 Apr '20

Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Therefore if conditions got influenced by values of the previous line. Previous submission: https://www.winehq.org/pipermail/wine-devel/2020-March/162158.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 43c4d9efef3..8911a597eb9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2834986bf9e..6efc1c677d2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len; -- 2.20.1

2 3

[PATCH V4 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Remove warnings Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V4 1/2] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Added more checks and tests. Also fixed warnings. >From : Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[website] German translation for release 5.7
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 4.0.4
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.6
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] include: Add missing defines for winioctl.h
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[website] German translation for release 5.5
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for gsoc announcement.
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] Add RtlQueryEnvironmentVariable to ntdll
by Alon Barzilai 30 Apr '20

30 Apr '20

--- dlls/ntdll/env.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6670786def..db8abd04aa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -976,6 +976,48 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + PSIZE_T return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + NTSTATUS nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..c1f602d423 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, PSIZE_T); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,6 +96,9 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; for (i = 0; tests[i].var; i++) @@ -130,6 +134,39 @@ static void testQuery(void) break; } } + + //test RtlQueryEnvironmentVariable + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val) , "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +562,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

3 3

[website] German translation for release 5.4
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.3
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.2
by Julian Rüger 30 Apr '20

30 Apr '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/5] d3dcompiler: Fix matrix dimension declaration and access.
by Zebediah Figura 30 Apr '20

30 Apr '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1b6e31e4964..5a4e9077d5f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -214,7 +214,7 @@ static void declare_predefined_types(struct hlsl_scope *scope) { for (x = 1; x <= 4; ++x) { - sprintf(name, "%s%ux%u", names[bt], x, y); + sprintf(name, "%s%ux%u", names[bt], y, x); type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); add_type_to_scope(scope, type); @@ -425,13 +425,13 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha { if (swizzle[i + 1] != 'm') return NULL; - x = swizzle[i + 2] - '0'; - y = swizzle[i + 3] - '0'; + y = swizzle[i + 2] - '0'; + x = swizzle[i + 3] - '0'; } else { - x = swizzle[i + 1] - '1'; - y = swizzle[i + 2] - '1'; + y = swizzle[i + 1] - '1'; + x = swizzle[i + 2] - '1'; } if (x >= value->data_type->dimx || y >= value->data_type->dimy) -- 2.26.2

4 11

[PATCH 5/5] wined3d: Create Vulkan buffer views for unordered access view counters.
by Henri Verbeet 30 Apr '20

30 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 31 ++++++++++++++++--- dlls/wined3d/view.c | 54 +++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a0f503edbe5..bd943a65afb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1218,6 +1218,8 @@ struct wined3d_view_vk_destroy_ctx struct wined3d_device_vk *device_vk; VkBufferView *vk_buffer_view; VkImageView *vk_image_view; + struct wined3d_bo_vk *vk_counter_bo; + VkBufferView *vk_counter_view; uint64_t *command_buffer_id; void *object; struct wined3d_view_vk_destroy_ctx *free; @@ -1260,6 +1262,21 @@ static void wined3d_view_vk_destroy_object(void *object) TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_image_view)); } } + if (ctx->vk_counter_bo && ctx->vk_counter_bo->vk_buffer) + wined3d_context_vk_destroy_bo(wined3d_context_vk(context), ctx->vk_counter_bo); + if (ctx->vk_counter_view) + { + if (context) + { + wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context), + *ctx->vk_counter_view, *ctx->command_buffer_id); + } + else + { + VK_CALL(vkDestroyBufferView(device_vk->vk_device, *ctx->vk_counter_view, NULL)); + TRACE("Destroyed counter buffer view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_counter_view)); + } + } if (context) context_release(context); @@ -1269,7 +1286,8 @@ static void wined3d_view_vk_destroy_object(void *object) } static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView *vk_buffer_view, - VkImageView *vk_image_view, uint64_t *command_buffer_id, void *view_vk) + VkImageView *vk_image_view, struct wined3d_bo_vk *vk_counter_bo, + VkBufferView *vk_counter_view, uint64_t *command_buffer_id, void *view_vk) { struct wined3d_view_vk_destroy_ctx *ctx, c; @@ -1278,6 +1296,8 @@ static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView ctx->device_vk = wined3d_device_vk(device); ctx->vk_buffer_view = vk_buffer_view; ctx->vk_image_view = vk_image_view; + ctx->vk_counter_bo = vk_counter_bo; + ctx->vk_counter_view = vk_counter_view; ctx->command_buffer_id = command_buffer_id; ctx->object = view_vk; ctx->free = ctx != &c ? ctx : NULL; @@ -1302,7 +1322,8 @@ static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_vk->v); - wined3d_view_vk_destroy(device, NULL, &view_vk->vk_image_view, &view_vk->command_buffer_id, view_vk); + wined3d_view_vk_destroy(device, NULL, &view_vk->vk_image_view, + NULL, NULL, &view_vk->command_buffer_id, view_vk); if (swapchain_count) wined3d_device_decref(device); } @@ -1355,7 +1376,8 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_shader_resource_view_cleanup(&srv_vk->v); - wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, srv_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, + NULL, NULL, &view_vk->command_buffer_id, srv_vk); if (swapchain_count) wined3d_device_decref(device); } @@ -1408,7 +1430,8 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_unordered_access_view_cleanup(&uav_vk->v); - wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, uav_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo, + &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d87a94023d2..e7f77f58cd5 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1459,13 +1459,16 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_view_vk *view_vk = &uav_vk->view_vk; struct wined3d_view_desc *desc = &uav_vk->v.desc; const struct wined3d_format_vk *format_vk; + const struct wined3d_vk_info *vk_info; struct wined3d_texture_vk *texture_vk; struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; + VkBufferViewCreateInfo create_info; struct wined3d_resource *resource; VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; + VkResult vr; resource = uav_vk->v.resource; device_vk = wined3d_device_vk(resource->device); @@ -1474,16 +1477,53 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, - desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk); - context_release(&context_vk->c); + vk_info = context_vk->vk_info; - if (!vk_buffer_view) - return; + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, + desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk))) + { + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); - TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); + uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + } + + if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) + { + if (!wined3d_context_vk_create_bo(context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT + | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &uav_vk->counter_bo)) + { + ERR("Failed to create counter bo.\n"); + context_release(&context_vk->c); - uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + return; + } + + VK_CALL(vkCmdFillBuffer(wined3d_context_vk_get_command_buffer(context_vk), + uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.buffer_offset, sizeof(uint32_t), 0)); + wined3d_context_vk_reference_bo(context_vk, &uav_vk->counter_bo); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.buffer = uav_vk->counter_bo.vk_buffer; + create_info.format = VK_FORMAT_R32_UINT; + create_info.offset = uav_vk->counter_bo.buffer_offset; + create_info.range = sizeof(uint32_t); + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &create_info, NULL, &uav_vk->vk_counter_view))) < 0) + { + ERR("Failed to create counter buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + } + else + { + TRACE("Created counter buffer view 0x%s.\n", wine_dbgstr_longlong(uav_vk->vk_counter_view)); + + uav_vk->v.counter_bo = (uintptr_t)&uav_vk->counter_bo; + } + } + + context_release(&context_vk->c); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a65a33ad256..2409728f270 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4671,6 +4671,9 @@ struct wined3d_unordered_access_view_vk { struct wined3d_unordered_access_view v; struct wined3d_view_vk view_vk; + + VkBufferView vk_counter_view; + struct wined3d_bo_vk counter_bo; }; static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk( -- 2.20.1

1 0

[PATCH 4/5] wined3d: Create Vulkan buffer views for unordered access views.
by Henri Verbeet 30 Apr '20

30 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 7 +++++-- dlls/wined3d/view.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5a5b51da501..a0f503edbe5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1392,6 +1392,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac struct wined3d_device *device = uav_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + VkBufferView *vk_buffer_view = NULL; VkImageView *vk_image_view = NULL; TRACE("uav_vk %p.\n", uav_vk); @@ -1402,10 +1403,12 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); - if (uav_vk->v.resource->type != WINED3D_RTYPE_BUFFER) + if (uav_vk->v.resource->type == WINED3D_RTYPE_BUFFER) + vk_buffer_view = &view_vk->u.vk_buffer_view; + else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_unordered_access_view_cleanup(&uav_vk->v); - wined3d_view_vk_destroy(device, NULL, vk_image_view, &view_vk->command_buffer_id, uav_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1e9a2052ecf..d87a94023d2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1463,6 +1463,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; struct wined3d_resource *resource; + VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; @@ -1472,7 +1473,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer views not implemented.\n"); + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, + desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk); + context_release(&context_vk->c); + + if (!vk_buffer_view) + return; + + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); + + uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + return; } -- 2.20.1

1 0

[PATCH 3/5] wined3d: Create Vulkan image views for unordered access views.
by Henri Verbeet 30 Apr '20

30 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 +++++--- dlls/wined3d/view.c | 64 +++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4f00a5a575e..5a5b51da501 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1388,11 +1388,13 @@ static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_access_view *view) { - struct wined3d_unordered_access_view_vk *view_vk = wined3d_unordered_access_view_vk(view); - struct wined3d_device *device = view_vk->v.resource->device; + struct wined3d_unordered_access_view_vk *uav_vk = wined3d_unordered_access_view_vk(view); + struct wined3d_device *device = uav_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + VkImageView *vk_image_view = NULL; - TRACE("view_vk %p.\n", view_vk); + TRACE("uav_vk %p.\n", uav_vk); /* Take a reference to the device, in case releasing the view's resource * would cause the device to be destroyed. However, swapchain resources @@ -1400,8 +1402,10 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); - wined3d_unordered_access_view_cleanup(&view_vk->v); - wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + if (uav_vk->v.resource->type != WINED3D_RTYPE_BUFFER) + vk_image_view = &view_vk->u.vk_image_info.imageView; + wined3d_unordered_access_view_cleanup(&uav_vk->v); + wined3d_view_vk_destroy(device, NULL, vk_image_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 572fdbd620a..1e9a2052ecf 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1453,14 +1453,76 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +static void wined3d_unordered_access_view_vk_cs_init(void *object) +{ + struct wined3d_unordered_access_view_vk *uav_vk = object; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + struct wined3d_view_desc *desc = &uav_vk->v.desc; + const struct wined3d_format_vk *format_vk; + struct wined3d_texture_vk *texture_vk; + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + struct wined3d_resource *resource; + uint32_t default_flags = 0; + VkImageView vk_image_view; + + resource = uav_vk->v.resource; + device_vk = wined3d_device_vk(resource->device); + format_vk = wined3d_format_vk(uav_vk->v.format); + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer views not implemented.\n"); + return; + } + + texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (texture_vk->t.layer_count > 1) + default_flags |= WINED3D_VIEW_TEXTURE_ARRAY; + + if (resource->format->id == format_vk->f.id && desc->flags == default_flags + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture_vk->t.level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture_vk->t.layer_count + && !(resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && resource->type != WINED3D_RTYPE_TEXTURE_3D) + { + TRACE("Creating identity unordered access view.\n"); + return; + } + + if (texture_vk->t.swapchain && texture_vk->t.swapchain->state.desc.backbuffer_count > 1) + FIXME("Swapchain unordered access views not supported.\n"); + + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_image_view = wined3d_view_vk_create_texture_view(context_vk, desc, + texture_vk, format_vk, format_vk->f.color_fixup, false); + context_release(&context_vk->c); + + if (!vk_image_view) + return; + + TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(vk_image_view)); + + view_vk->u.vk_image_info.imageView = vk_image_view; + view_vk->u.vk_image_info.sampler = VK_NULL_HANDLE; + view_vk->u.vk_image_info.imageLayout = texture_vk->layout; +} + HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { + HRESULT hr; + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - return wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops); + if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops))) + return hr; + + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk); + + return hr; } HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f46690a3518..a65a33ad256 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4670,6 +4670,7 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi struct wined3d_unordered_access_view_vk { struct wined3d_unordered_access_view v; + struct wined3d_view_vk view_vk; }; static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk( -- 2.20.1

1 0

[PATCH 2/5] wined3d: Create Vulkan buffer views for shader resource views.
by Henri Verbeet 30 Apr '20

30 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 43 +++++++++++++++++++++------- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 30 ++++++++++++++++++++ dlls/wined3d/view.c | 52 +++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 16 +++++++++-- 5 files changed, 125 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7958204bb82..4f00a5a575e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1216,6 +1216,7 @@ static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_des struct wined3d_view_vk_destroy_ctx { struct wined3d_device_vk *device_vk; + VkBufferView *vk_buffer_view; VkImageView *vk_image_view; uint64_t *command_buffer_id; void *object; @@ -1227,32 +1228,47 @@ static void wined3d_view_vk_destroy_object(void *object) struct wined3d_view_vk_destroy_ctx *ctx = object; const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + struct wined3d_context *context; device_vk = ctx->device_vk; vk_info = &wined3d_adapter_vk(device_vk->d.adapter)->vk_info; + context = context_acquire(&device_vk->d, NULL, 0); - if (ctx->vk_image_view) + if (ctx->vk_buffer_view) { - struct wined3d_context *context; - - if (!(context = context_acquire(&device_vk->d, NULL, 0))) + if (context) { - VK_CALL(vkDestroyImageView(device_vk->vk_device, *ctx->vk_image_view, NULL)); - TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_image_view)); + wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context), + *ctx->vk_buffer_view, *ctx->command_buffer_id); } else + { + VK_CALL(vkDestroyBufferView(device_vk->vk_device, *ctx->vk_buffer_view, NULL)); + TRACE("Destroyed buffer view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_buffer_view)); + } + } + if (ctx->vk_image_view) + { + if (context) { wined3d_context_vk_destroy_image_view(wined3d_context_vk(context), *ctx->vk_image_view, *ctx->command_buffer_id); - context_release(context); + } + else + { + VK_CALL(vkDestroyImageView(device_vk->vk_device, *ctx->vk_image_view, NULL)); + TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_image_view)); } } + if (context) + context_release(context); + heap_free(ctx->object); heap_free(ctx->free); } -static void wined3d_view_vk_destroy(struct wined3d_device *device, +static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView *vk_buffer_view, VkImageView *vk_image_view, uint64_t *command_buffer_id, void *view_vk) { struct wined3d_view_vk_destroy_ctx *ctx, c; @@ -1260,6 +1276,7 @@ static void wined3d_view_vk_destroy(struct wined3d_device *device, if (!(ctx = heap_alloc(sizeof(*ctx)))) ctx = &c; ctx->device_vk = wined3d_device_vk(device); + ctx->vk_buffer_view = vk_buffer_view; ctx->vk_image_view = vk_image_view; ctx->command_buffer_id = command_buffer_id; ctx->object = view_vk; @@ -1285,7 +1302,7 @@ static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_vk->v); - wined3d_view_vk_destroy(device, &view_vk->vk_image_view, &view_vk->command_buffer_id, view_vk); + wined3d_view_vk_destroy(device, NULL, &view_vk->vk_image_view, &view_vk->command_buffer_id, view_vk); if (swapchain_count) wined3d_device_decref(device); } @@ -1322,6 +1339,8 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour struct wined3d_device *device = srv_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; struct wined3d_view_vk *view_vk = &srv_vk->view_vk; + VkBufferView *vk_buffer_view = NULL; + VkImageView *vk_image_view = NULL; TRACE("srv_vk %p.\n", srv_vk); @@ -1331,8 +1350,12 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); + if (srv_vk->v.resource->type == WINED3D_RTYPE_BUFFER) + vk_buffer_view = &view_vk->u.vk_buffer_view; + else + vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_shader_resource_view_cleanup(&srv_vk->v); - wined3d_view_vk_destroy(device, &view_vk->vk_image_info.imageView, &view_vk->command_buffer_id, srv_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, srv_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 703a8aee70e..4d1db98b884 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -598,7 +598,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined heap_free(data); } -static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, +BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { return buffer->buffer_ops->buffer_prepare_location(buffer, context, location); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e8fcc391782..35b2b7eb7c7 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -469,6 +469,31 @@ void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, o->command_buffer_id = command_buffer_id; } +void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk, + VkBufferView vk_view, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroyBufferView(device_vk->vk_device, vk_view, NULL)); + TRACE("Destroyed buffer view 0x%s.\n", wine_dbgstr_longlong(vk_view)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking buffer view 0x%s.\n", wine_dbgstr_longlong(vk_view)); + return; + } + + o->type = WINED3D_RETIRED_BUFFER_VIEW_VK; + o->u.vk_buffer_view = vk_view; + o->command_buffer_id = command_buffer_id; +} + void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk, VkImageView vk_view, uint64_t command_buffer_id) { @@ -592,6 +617,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Destroyed image 0x%s.\n", wine_dbgstr_longlong(o->u.vk_image)); break; + case WINED3D_RETIRED_BUFFER_VIEW_VK: + VK_CALL(vkDestroyBufferView(device_vk->vk_device, o->u.vk_buffer_view, NULL)); + TRACE("Destroyed buffer view 0x%s.\n", wine_dbgstr_longlong(o->u.vk_buffer_view)); + break; + case WINED3D_RETIRED_IMAGE_VIEW_VK: VK_CALL(vkDestroyImageView(device_vk->vk_device, o->u.vk_image_view, NULL)); TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(o->u.vk_image_view)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f131f77f555..572fdbd620a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -653,6 +653,38 @@ VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, } } +static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk *context_vk, + const struct wined3d_view_desc *desc, struct wined3d_buffer_vk *buffer_vk, + const struct wined3d_format_vk *view_format_vk) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkBufferViewCreateInfo create_info; + struct wined3d_device_vk *device_vk; + VkBufferView vk_buffer_view; + unsigned int offset, size; + VkResult vr; + + get_buffer_view_range(&buffer_vk->b, desc, &view_format_vk->f, &offset, &size); + wined3d_buffer_prepare_location(&buffer_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.buffer = buffer_vk->bo.vk_buffer; + create_info.format = view_format_vk->vk_format; + create_info.offset = buffer_vk->bo.buffer_offset + offset; + create_info.range = size; + + device_vk = wined3d_device_vk(buffer_vk->b.resource.device); + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, &create_info, NULL, &vk_buffer_view))) < 0) + { + ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + return vk_buffer_view; +} + static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) @@ -987,6 +1019,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) const struct wined3d_format *format; struct wined3d_resource *resource; struct wined3d_context *context; + VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; @@ -995,7 +1028,18 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer views not implemented.\n"); + context = context_acquire(resource->device, NULL, 0); + vk_buffer_view = wined3d_view_vk_create_buffer_view(wined3d_context_vk(context), + desc, wined3d_buffer_vk(buffer_from_resource(resource)), wined3d_format_vk(format)); + context_release(context); + + if (!vk_buffer_view) + return; + + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); + + srv_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + return; } @@ -1026,9 +1070,9 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(vk_image_view)); - srv_vk->view_vk.vk_image_info.imageView = vk_image_view; - srv_vk->view_vk.vk_image_info.sampler = VK_NULL_HANDLE; - srv_vk->view_vk.vk_image_info.imageLayout = texture_vk->layout; + srv_vk->view_vk.u.vk_image_info.imageView = vk_image_view; + srv_vk->view_vk.u.vk_image_info.sampler = VK_NULL_HANDLE; + srv_vk->view_vk.u.vk_image_info.imageLayout = texture_vk->layout; } HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a15b4826e2e..f46690a3518 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2230,6 +2230,7 @@ enum wined3d_retired_object_type_vk WINED3D_RETIRED_BO_SLAB_SLICE_VK, WINED3D_RETIRED_BUFFER_VK, WINED3D_RETIRED_IMAGE_VK, + WINED3D_RETIRED_BUFFER_VIEW_VK, WINED3D_RETIRED_IMAGE_VIEW_VK, }; @@ -2249,6 +2250,7 @@ struct wined3d_retired_object_vk } slice; VkBuffer vk_buffer; VkImage vk_image; + VkBufferView vk_buffer_view; VkImageView vk_image_view; } u; uint64_t command_buffer_id; @@ -2322,6 +2324,8 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte struct wined3d_allocator_block *block, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk, + VkBufferView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_vk, VkFramebuffer vk_framebuffer, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, @@ -4434,6 +4438,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc } void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; @@ -4442,8 +4448,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, - struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; +BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; @@ -4596,7 +4602,11 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view struct wined3d_view_vk { - VkDescriptorImageInfo vk_image_info; + union + { + VkBufferView vk_buffer_view; + VkDescriptorImageInfo vk_image_info; + } u; uint64_t command_buffer_id; }; -- 2.20.1

1 0

[PATCH 1/5] wined3d: Create Vulkan image views for shader resource views.
by Henri Verbeet 30 Apr '20

30 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 11 +- dlls/wined3d/texture.c | 18 +++ dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 204 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++ 5 files changed, 194 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f9b3e4721a2..7958204bb82 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1318,11 +1318,12 @@ static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resource_view *view) { - struct wined3d_shader_resource_view_vk *view_vk = wined3d_shader_resource_view_vk(view); - struct wined3d_device *device = view_vk->v.resource->device; + struct wined3d_shader_resource_view_vk *srv_vk = wined3d_shader_resource_view_vk(view); + struct wined3d_device *device = srv_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; + struct wined3d_view_vk *view_vk = &srv_vk->view_vk; - TRACE("view_vk %p.\n", view_vk); + TRACE("srv_vk %p.\n", srv_vk); /* Take a reference to the device, in case releasing the view's resource * would cause the device to be destroyed. However, swapchain resources @@ -1330,8 +1331,8 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); - wined3d_shader_resource_view_cleanup(&view_vk->v); - wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + wined3d_shader_resource_view_cleanup(&srv_vk->v); + wined3d_view_vk_destroy(device, &view_vk->vk_image_info.imageView, &view_vk->command_buffer_id, srv_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4f55abb5e2b..b8b90c95c5e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4484,6 +4484,24 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w flags, device, parent, parent_ops, &texture_no3d[1], &wined3d_texture_no3d_ops); } +void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) +{ + static const VkComponentSwizzle swizzle_source[] = + { + VK_COMPONENT_SWIZZLE_ZERO, /* CHANNEL_SOURCE_ZERO */ + VK_COMPONENT_SWIZZLE_ONE, /* CHANNEL_SOURCE_ONE */ + VK_COMPONENT_SWIZZLE_R, /* CHANNEL_SOURCE_X */ + VK_COMPONENT_SWIZZLE_G, /* CHANNEL_SOURCE_Y */ + VK_COMPONENT_SWIZZLE_B, /* CHANNEL_SOURCE_Z */ + VK_COMPONENT_SWIZZLE_A, /* CHANNEL_SOURCE_W */ + }; + + mapping->r = swizzle_source[fixup.x_source]; + mapping->g = swizzle_source[fixup.y_source]; + mapping->b = swizzle_source[fixup.z_source]; + mapping->a = swizzle_source[fixup.w_source]; +} + const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e9673f2c76..2108eb65ba3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4229,6 +4229,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } format->vk_format = vk_format; + format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fee64bd47d2..f131f77f555 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -653,19 +653,111 @@ VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, } } +static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, + const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool srv) +{ + const struct wined3d_resource *resource = &texture_vk->t.resource; + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + const struct wined3d_format_vk *format_vk; + struct wined3d_device_vk *device_vk; + VkImageViewCreateInfo create_info; + VkImageView vk_image_view; + VkResult vr; + + device_vk = wined3d_device_vk(resource->device); + + if (!wined3d_texture_vk_prepare_texture(texture_vk, context_vk)) + { + ERR("Failed to prepare texture.\n"); + return VK_NULL_HANDLE; + } + + /* Depth formats are a little complicated. For example, the typeless + * format corresponding to depth/stencil view format WINED3DFMT_D32_FLOAT + * is WINED3DFMT_R32_TYPELESS, and the corresponding shader resource view + * format would be WINED3DFMT_R32_FLOAT. Vulkan depth/stencil formats are + * only compatible with themselves, so it's not possible to create e.g. a + * VK_FORMAT_R32_SFLOAT view on a VK_FORMAT_D32_SFLOAT image. In order to + * make it work, we create Vulkan images for WINED3DFMT_R32_TYPELESS + * resources with either a depth format (VK_FORMAT_D32_SFLOAT) or a colour + * format, depending on whether the bind flags include + * WINED3D_BIND_DEPTH_STENCIL or not. In order to then create a Vulkan + * view on the image, we then replace the view format here with the + * underlying resource format. However, that means it's still not possible + * to create e.g. a WINED3DFMT_R32_UINT view on a WINED3DFMT_R32_TYPELESS + * depth/stencil resource. */ + if (resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + format_vk = wined3d_format_vk(resource->format); + else + format_vk = view_format_vk; + + create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.image = texture_vk->vk_image; + create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); + if (!srv && create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + { + if (desc->u.texture.layer_count > 1) + create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + else + create_info.viewType = VK_IMAGE_VIEW_TYPE_2D; + } + create_info.format = format_vk->vk_format; + if (is_stencil_view_format(&view_format_vk->f)) + { + create_info.components.r = VK_COMPONENT_SWIZZLE_ZERO; + create_info.components.g = VK_COMPONENT_SWIZZLE_R; + create_info.components.b = VK_COMPONENT_SWIZZLE_ZERO; + create_info.components.a = VK_COMPONENT_SWIZZLE_ZERO; + } + else if (is_identity_fixup(fixup) || !can_use_texture_swizzle(context_vk->c.d3d_info, &format_vk->f)) + { + create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + } + else + { + wined3d_vk_swizzle_from_color_fixup(&create_info.components, fixup); + } + if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && (view_format_vk->f.red_size || view_format_vk->f.green_size)) + { + create_info.subresourceRange.aspectMask = 0; + if (view_format_vk->f.red_size) + create_info.subresourceRange.aspectMask |= VK_IMAGE_ASPECT_DEPTH_BIT; + if (view_format_vk->f.green_size) + create_info.subresourceRange.aspectMask |= VK_IMAGE_ASPECT_STENCIL_BIT; + } + else + { + create_info.subresourceRange.aspectMask = vk_aspect_mask_from_format(&format_vk->f); + } + create_info.subresourceRange.baseMipLevel = desc->u.texture.level_idx; + create_info.subresourceRange.levelCount = desc->u.texture.level_count; + create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; + create_info.subresourceRange.layerCount = desc->u.texture.layer_count; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &create_info, NULL, &vk_image_view))) < 0) + { + ERR("Failed to create Vulkan image view, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + return vk_image_view; +} + static void wined3d_render_target_view_vk_cs_init(void *object) { struct wined3d_rendertarget_view_vk *view_vk = object; struct wined3d_view_desc *desc = &view_vk->v.desc; const struct wined3d_format_vk *format_vk; - struct VkImageViewCreateInfo create_info; - const struct wined3d_vk_info *vk_info; struct wined3d_texture_vk *texture_vk; - struct wined3d_device_vk *device_vk; struct wined3d_resource *resource; struct wined3d_context *context; uint32_t default_flags = 0; - VkResult vr; resource = view_vk->v.resource; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -696,48 +788,15 @@ static void wined3d_render_target_view_vk_cs_init(void *object) return; } - device_vk = wined3d_device_vk(resource->device); - context = context_acquire(&device_vk->d, NULL, 0); - vk_info = wined3d_context_vk(context)->vk_info; + context = context_acquire(resource->device, NULL, 0); + view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, false); + context_release(context); - if (!wined3d_texture_vk_prepare_texture(texture_vk, wined3d_context_vk(context))) - { - ERR("Failed to prepare texture.\n"); - context_release(context); + if (!view_vk->vk_image_view) return; - } - create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; - create_info.pNext = NULL; - create_info.flags = 0; - create_info.image = texture_vk->vk_image; - create_info.viewType = vk_image_view_type_from_wined3d(resource->type, desc->flags); - if (create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) - { - if (desc->u.texture.layer_count > 1) - create_info.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - else - create_info.viewType = VK_IMAGE_VIEW_TYPE_2D; - } - create_info.format = format_vk->vk_format; - create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.subresourceRange.aspectMask = vk_aspect_mask_from_format(&format_vk->f); - create_info.subresourceRange.baseMipLevel = desc->u.texture.level_idx; - create_info.subresourceRange.levelCount = desc->u.texture.level_count; - create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; - create_info.subresourceRange.layerCount = desc->u.texture.layer_count; - if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &create_info, NULL, &view_vk->vk_image_view))) < 0) - { - ERR("Failed to create Vulkan image view, vr %d.\n", vr); - context_release(context); - return; - } TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(view_vk->vk_image_view)); - - context_release(context); } HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *view_vk, @@ -920,14 +979,73 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view return hr; } +static void wined3d_shader_resource_view_vk_cs_init(void *object) +{ + struct wined3d_shader_resource_view_vk *srv_vk = object; + struct wined3d_view_desc *desc = &srv_vk->v.desc; + struct wined3d_texture_vk *texture_vk; + const struct wined3d_format *format; + struct wined3d_resource *resource; + struct wined3d_context *context; + uint32_t default_flags = 0; + VkImageView vk_image_view; + + resource = srv_vk->v.resource; + format = srv_vk->v.format; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer views not implemented.\n"); + return; + } + + texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (texture_vk->t.layer_count > 1) + default_flags |= WINED3D_VIEW_TEXTURE_ARRAY; + + if (resource->format->id == format->id && desc->flags == default_flags + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture_vk->t.level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture_vk->t.layer_count + && !(resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + TRACE("Creating identity shader resource view.\n"); + return; + } + + if (texture_vk->t.swapchain && texture_vk->t.swapchain->state.desc.backbuffer_count > 1) + FIXME("Swapchain shader resource views not supported.\n"); + + context = context_acquire(resource->device, NULL, 0); + vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, true); + context_release(context); + + if (!vk_image_view) + return; + + TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(vk_image_view)); + + srv_vk->view_vk.vk_image_info.imageView = vk_image_view; + srv_vk->view_vk.vk_image_info.sampler = VK_NULL_HANDLE; + srv_vk->view_vk.vk_image_info.imageLayout = texture_vk->layout; +} + HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { + HRESULT hr; + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - return wined3d_shader_resource_view_init(&view_vk->v, desc, resource, parent, parent_ops); + if (FAILED(hr = wined3d_shader_resource_view_init(&view_vk->v, desc, resource, parent, parent_ops))) + return hr; + + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_vk_cs_init, view_vk); + + return hr; } HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7983b31b7d..a15b4826e2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3946,6 +3946,7 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; +void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN; struct gl_texture { @@ -4593,9 +4594,16 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_view_vk +{ + VkDescriptorImageInfo vk_image_info; + uint64_t command_buffer_id; +}; + struct wined3d_shader_resource_view_vk { struct wined3d_shader_resource_view v; + struct wined3d_view_vk view_vk; }; static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_view_vk( -- 2.20.1

1 0

[PATCH 1/2] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Added more checks and tests >From : Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

3 5

[PATCH 1/2] winmm-wave: fixed waveOutGetDevCaps and waveInGetDevCaps
by dead ash 30 Apr '20

30 Apr '20

2 1

[PATCH 2/2] ntoskrnl.exe: Add KeIpiGenericCall stub function
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48989 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 4

[PATCH 1/2] ntoskrnl.exe: Add wcscat_s and wcscpy_s to spec file
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48987 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] ntoskrnl.exe: Add wcscat_s and wcscpy_s to spec file
by Vijay Kiran Kamuju 30 Apr '20

30 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48987 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] Add RtlQueryEnvironmentVariable implementation
by Alon Barzilai 30 Apr '20

30 Apr '20

--- dlls/ntdll/env.c | 44 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/env.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 71ae48681d..61c4d56baa 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,6 +38,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -990,6 +991,49 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, return nts; } + +/****************************************************************** + * RtlQueryEnvironmentVariable [NTDLL.@] + * + */ +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env, + PWSTR name, + size_t name_length, + PWSTR value, + size_t value_length, + size_t* return_length) +{ + UNICODE_STRING name_u; + UNICODE_STRING value_u; + NTSTATUS nts; + + name_u.Length = name_length * sizeof(WCHAR); + name_u.MaximumLength = name_u.Length; + name_u.Buffer = name; + + value_u.Length = 0; + value_u.MaximumLength = value_length * sizeof(WCHAR); + value_u.Buffer = value; + + nts = RtlQueryEnvironmentVariable_U(env, &name_u, &value_u); + switch (nts) + { + case STATUS_SUCCESS: + *return_length = value_u.Length / sizeof(WCHAR); + break; + + case STATUS_BUFFER_TOO_SMALL: + *return_length = (value_u.Length / sizeof(WCHAR)) + 1; + break; + + case STATUS_VARIABLE_NOT_FOUND: + default: + *return_length = 0; + break; + } + return nts; +} + /****************************************************************** * RtlSetCurrentEnvironment [NTDLL.@] * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cbc43259bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -860,6 +860,7 @@ @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) +@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..e44b980993 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPD static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*); static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR); static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING); +static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(PWSTR, PWSTR, size_t, PWSTR, size_t, size_t*); static void (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*); static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING); static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG); @@ -95,7 +96,13 @@ static void testQuery(void) UNICODE_STRING name; UNICODE_STRING value; NTSTATUS nts; + size_t name_length; + size_t value_length; + size_t return_length; unsigned int i; + DWORD dwVersion; + DWORD dwMajorVersion; + DWORD dwMinorVersion; for (i = 0; tests[i].var; i++) { @@ -130,6 +137,49 @@ static void testQuery(void) break; } } + + //test RtlQueryEnvironmentVariable + dwVersion = GetVersion(); + dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion))); + dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); + printf("RtlQueryEnvironmentVariable windows verion is %d.%d\n", dwMajorVersion, dwMinorVersion); + printf("RtlQueryEnvironmentVariable windows %p\n", pRtlQueryEnvironmentVariable); + if (dwMajorVersion > 6) + ok(pRtlQueryEnvironmentVariable != NULL , "RtlQueryEnvironmentVariable do not exist for windows version %d.%d\n", dwMajorVersion, dwMinorVersion); + + if (pRtlQueryEnvironmentVariable) + { + for (i = 0; tests[i].var; i++) + { + const struct test* test = &tests[i]; + name_length = strlen(test->var); + value_length = test->len; + value.Buffer = bv; + bv[test->len] = '@'; + + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); + nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); + ok(nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", + i, test->var, test->status, nts); + if (nts == test->status) switch (nts) + { + case STATUS_SUCCESS: + pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); + ok(return_length == strlen(test->val), "Wrong length %d for %s\n", + return_length, test->var); + ok((return_length == strlen(test->val) && memcmp(bv, bn, return_length) == 0) || + lstrcmpW(bv, bn) == 0, + "Wrong result for %s/%d\n", test->var, test->len); + ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); + break; + case STATUS_BUFFER_TOO_SMALL: + ok(return_length == (strlen(test->val) + 1), + "Wrong returned length %d (too small buffer) for %s\n", return_length, test->var); + break; + } + } + } } static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) @@ -525,6 +575,7 @@ START_TEST(env) pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment"); pRtlQueryEnvironmentVariable_U = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable_U"); + pRtlQueryEnvironmentVariable = (void*)GetProcAddress(mod, "RtlQueryEnvironmentVariable"); pRtlSetCurrentEnvironment = (void*)GetProcAddress(mod, "RtlSetCurrentEnvironment"); pRtlSetEnvironmentVariable = (void*)GetProcAddress(mod, "RtlSetEnvironmentVariable"); pRtlExpandEnvironmentStrings_U = (void*)GetProcAddress(mod, "RtlExpandEnvironmentStrings_U"); -- 2.17.1

1 0

[PATCH 2/2] include: Use long for LONG type on Windows targets iff not building Wine.
by Jacek Caban 30 Apr '20

30 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Right now we use _MSC_VER to choose between long and int type. We could, however, make any other choice. With patch 1, it's possible to use int with MSVC (or at least clang MSVC target). It's also possible for any other compilers except __LP64__ to use long. This raises some questions and I wouldn't mind changing the patch. For example, I could change headers to always use int. The problem with that is that it makes us incompatible with the rest of Windows world. In the past, the choice of int for LONG was motivated by port to Win64, where we can't use long on UNIX side and it's nice to have the same time on all targets. This patch is a compromise: it always uses int for Wine itself, so as far as building Wine is considered, it's consistent among compilers. Outside Wine, it uses long on Windows targets, where the code is most likely to depend on underlying type. And it keeps using int for non-Windows targets, so nothing changes for non-PE winelib. If there is a need for int LONG on Windows targets, we could introduce a macro to change that choice. I could also imagine revisiting the choice for PE parts of Wine itself, but it would be a lot of work. include/guiddef.h | 2 +- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winnt.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

4 8

[PATCH 3/3] windowsccodecs: Implement DdsDecoder_Dds_GetParameters().
by Ziqing Hui 30 Apr '20

30 Apr '20

Note: get_alpha_mode_from_fourcc(): see https://en.wikipedia.org/wiki/S3_Texture_Compression get_format_from_fourcc(): see https://docs.microsoft.com/zh-cn/windows/win32/direct3d11/texture-block-com… Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 110 ++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 108 insertions(+), 4 deletions(-)

1 0

[PATCH 1/3] windowscodecs/tests: Add tests for IWICDdsDecoder_GetParameters().
by Ziqing Hui 30 Apr '20

30 Apr '20

Note: test_dds_decoder_image_parameters()'s structure is similar to test_dds_decoder_frame_count(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 80 ++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+)

1 0

[PATCH] include/dxgi.idl: add cpu access flags
by Biswapriyo Nath 30 Apr '20

30 Apr '20

1 0

[PATCH 1/4] quartz/vmr9: Remove some dead code.
by Zebediah Figura 30 Apr '20

30 Apr '20

We already check filter->num_surfaces above. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 771e90050da..652705e8430 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -434,11 +434,6 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M info.szNativeSize.cy = filter->bmiheader.biHeight; filter->cur_surface = 0; - if (filter->num_surfaces) - { - ERR("num_surfaces or d3d9_surfaces not 0\n"); - return E_FAIL; - } if (!is_vmr9(filter)) { -- 2.26.2

2 5

[PATCH v2] include: Add dvdif.idl.
by Zebediah Figura 30 Apr '20

30 Apr '20

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/Makefile.in | 1 + include/dvdif.idl | 742 ++++++++++++++++++++++++++++++++++++++++++++ include/strmif.idl | 6 +- 3 files changed, 744 insertions(+), 5 deletions(-) create mode 100644 include/dvdif.idl diff --git a/include/Makefile.in b/include/Makefile.in index 543d41811c..74db5ee151 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -238,6 +238,7 @@ SOURCES = \ dshow.h \ dsound.h \ dsrole.h \ + dvdif.idl \ dvdmedia.h \ dvoice.h \ dwmapi.h \ diff --git a/include/dvdif.idl b/include/dvdif.idl new file mode 100644 index 0000000000..3640a56a55 --- /dev/null +++ b/include/dvdif.idl @@ -0,0 +1,742 @@ +/* + * Copyright (C) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +pragma makedep install +#endif + +import "unknwn.idl"; +import "objidl.idl"; + +cpp_quote("#include <ddraw.h>") + +cpp_quote("#if 0") +interface IGraphBuilder; +cpp_quote("#endif") + +typedef enum tagDVD_DOMAIN +{ + DVD_DOMAIN_FirstPlay = 1, + DVD_DOMAIN_VideoManagerMenu, + DVD_DOMAIN_VideoTitleSetMenu, + DVD_DOMAIN_Title, + DVD_DOMAIN_Stop +} DVD_DOMAIN; + +typedef enum tagDVD_MENU_ID +{ + DVD_MENU_Title = 2, + DVD_MENU_Root = 3, + DVD_MENU_Subpicture = 4, + DVD_MENU_Audio = 5, + DVD_MENU_Angle = 6, + DVD_MENU_Chapter = 7 +} DVD_MENU_ID; + +typedef enum tagDVD_DISC_SIDE +{ + DVD_SIDE_A = 1, + DVD_SIDE_B = 2 +} DVD_DISC_SIDE; + +typedef enum tagDVD_PREFERRED_DISPLAY_MODE +{ + DISPLAY_CONTENT_DEFAULT = 0, + DISPLAY_16x9 = 1, + DISPLAY_4x3_PANSCAN_PREFERRED = 2, + DISPLAY_4x3_LETTERBOX_PREFERRED = 3 +} DVD_PREFERRED_DISPLAY_MODE; + +typedef WORD DVD_REGISTER; +typedef DVD_REGISTER GPRMARRAY[16]; +typedef DVD_REGISTER SPRMARRAY[24]; + +typedef struct tagDVD_ATR +{ + ULONG ulCAT; + BYTE pbATRI[768]; +} DVD_ATR; + +typedef BYTE DVD_VideoATR[2]; +typedef BYTE DVD_AudioATR[8]; +typedef BYTE DVD_SubpictureATR[6]; + +typedef enum tagDVD_FRAMERATE +{ + DVD_FPS_25 = 1, + DVD_FPS_30NonDrop = 3 +} DVD_FRAMERATE; + +cpp_quote("typedef struct tagDVD_TIMECODE") +cpp_quote("{") +cpp_quote(" ULONG Hours1 : 4;") +cpp_quote(" ULONG Hours10 : 4;") +cpp_quote(" ULONG Minutes1 : 4;") +cpp_quote(" ULONG Minutes10 : 4;") +cpp_quote(" ULONG Seconds1 : 4;") +cpp_quote(" ULONG Seconds10 : 4;") +cpp_quote(" ULONG Frames1 : 4;") +cpp_quote(" ULONG Frames10 : 2;") +cpp_quote(" ULONG FrameRateCode : 2;") +cpp_quote("} DVD_TIMECODE;") + +typedef enum tagDVD_NavCmdType +{ + DVD_NavCmdType_Pre = 1, + DVD_NavCmdType_Post = 2, + DVD_NavCmdType_Cell = 3, + DVD_NavCmdType_Button = 4 +} DVD_NavCmdType; + +typedef enum tagDVD_TIMECODE_FLAGS +{ + DVD_TC_FLAG_25fps = 0x00000001, + DVD_TC_FLAG_30fps = 0x00000002, + DVD_TC_FLAG_DropFrame = 0x00000004, + DVD_TC_FLAG_Interpolated = 0x00000008 +} DVD_TIMECODE_FLAGS; + +typedef struct tagDVD_HMSF_TIMECODE +{ + BYTE bHours; + BYTE bMinutes; + BYTE bSeconds; + BYTE bFrames; +} DVD_HMSF_TIMECODE; + +typedef struct tagDVD_PLAYBACK_LOCATION2 +{ + ULONG TitleNum; + ULONG ChapterNum; + DVD_HMSF_TIMECODE TimeCode; + ULONG TimeCodeFlags; +} DVD_PLAYBACK_LOCATION2; + +typedef struct tagDVD_PLAYBACK_LOCATION +{ + ULONG TitleNum; + ULONG ChapterNum; + ULONG TimeCode; +} DVD_PLAYBACK_LOCATION; + +typedef DWORD VALID_UOP_SOMTHING_OR_OTHER; + +typedef enum +{ + UOP_FLAG_Play_Title_Or_AtTime = 0x00000001, + UOP_FLAG_Play_Chapter = 0x00000002, + UOP_FLAG_Play_Title = 0x00000004, + UOP_FLAG_Stop = 0x00000008, + UOP_FLAG_ReturnFromSubMenu = 0x00000010, + UOP_FLAG_Play_Chapter_Or_AtTime = 0x00000020, + UOP_FLAG_PlayPrev_Or_Replay_Chapter = 0x00000040, + UOP_FLAG_PlayNext_Chapter = 0x00000080, + UOP_FLAG_Play_Forwards = 0x00000100, + UOP_FLAG_Play_Backwards = 0x00000200, + UOP_FLAG_ShowMenu_Title = 0x00000400, + UOP_FLAG_ShowMenu_Root = 0x00000800, + UOP_FLAG_ShowMenu_SubPic = 0x00001000, + UOP_FLAG_ShowMenu_Audio = 0x00002000, + UOP_FLAG_ShowMenu_Angle = 0x00004000, + UOP_FLAG_ShowMenu_Chapter = 0x00008000, + UOP_FLAG_Resume = 0x00010000, + UOP_FLAG_Select_Or_Activate_Button = 0x00020000, + UOP_FLAG_Still_Off = 0x00040000, + UOP_FLAG_Pause_On = 0x00080000, + UOP_FLAG_Select_Audio_Stream = 0x00100000, + UOP_FLAG_Select_SubPic_Stream = 0x00200000, + UOP_FLAG_Select_Angle = 0x00400000, + UOP_FLAG_Select_Karaoke_Audio_Presentation_Mode = 0x00800000, + UOP_FLAG_Select_Video_Mode_Preference = 0x01000000 +} VALID_UOP_FLAG; + +typedef enum +{ + DVD_CMD_FLAG_None = 0x00000000, + DVD_CMD_FLAG_Flush = 0x00000001, + DVD_CMD_FLAG_SendEvents = 0x00000002, + DVD_CMD_FLAG_Block = 0x00000004, + DVD_CMD_FLAG_StartWhenRendered = 0x00000008, + DVD_CMD_FLAG_EndAfterRendered = 0x00000010 +} DVD_CMD_FLAGS; + +typedef enum +{ + DVD_ResetOnStop = 1, + DVD_NotifyParentalLevelChange = 2, + DVD_HMSF_TimeCodeEvents = 3, + DVD_AudioDuringFFwdRew = 4, + DVD_EnableNonblockingAPIs = 5, + DVD_CacheSizeInMB = 6, + DVD_EnablePortableBookmarks = 7, + DVD_EnableExtendedCopyProtectErrors = 8, + DVD_NotifyPositionChange = 9, + DVD_IncreaseOutputControl = 10, + DVD_EnableStreaming = 11, + DVD_EnableESOutput = 12, + DVD_EnableTitleLength = 13, + DVD_DisableStillThrottle = 14, + DVD_EnableLoggingEvents = 15, + DVD_MaxReadBurstInKB = 16, + DVD_ReadBurstPeriodInMS = 17, + DVD_RestartDisc = 18, + DVD_EnableCC = 19 +} DVD_OPTION_FLAG; + +typedef enum +{ + DVD_Relative_Upper = 1, + DVD_Relative_Lower = 2, + DVD_Relative_Left = 3, + DVD_Relative_Right = 4 +} DVD_RELATIVE_BUTTON; + +typedef enum tagDVD_PARENTAL_LEVEL +{ + DVD_PARENTAL_LEVEL_8 = 0x8000, + DVD_PARENTAL_LEVEL_7 = 0x4000, + DVD_PARENTAL_LEVEL_6 = 0x2000, + DVD_PARENTAL_LEVEL_5 = 0x1000, + DVD_PARENTAL_LEVEL_4 = 0x0800, + DVD_PARENTAL_LEVEL_3 = 0x0400, + DVD_PARENTAL_LEVEL_2 = 0x0200, + DVD_PARENTAL_LEVEL_1 = 0x0100 +} DVD_PARENTAL_LEVEL; + +typedef enum tagDVD_AUDIO_LANG_EXT +{ + DVD_AUD_EXT_NotSpecified = 0, + DVD_AUD_EXT_Captions = 1, + DVD_AUD_EXT_VisuallyImpaired = 2, + DVD_AUD_EXT_DirectorComments1 = 3, + DVD_AUD_EXT_DirectorComments2 = 4 +} DVD_AUDIO_LANG_EXT; + +typedef enum tagDVD_SUBPICTURE_LANG_EXT +{ + DVD_SP_EXT_NotSpecified = 0, + DVD_SP_EXT_Caption_Normal = 1, + DVD_SP_EXT_Caption_Big = 2, + DVD_SP_EXT_Caption_Children = 3, + DVD_SP_EXT_CC_Normal = 5, + DVD_SP_EXT_CC_Big = 6, + DVD_SP_EXT_CC_Children = 7, + DVD_SP_EXT_Forced = 9, + DVD_SP_EXT_DirectorComments_Normal = 13, + DVD_SP_EXT_DirectorComments_Big = 14, + DVD_SP_EXT_DirectorComments_Children = 15 +} DVD_SUBPICTURE_LANG_EXT; + +typedef enum tagDVD_AUDIO_APPMODE +{ + DVD_AudioMode_None = 0, + DVD_AudioMode_Karaoke = 1, + DVD_AudioMode_Surround = 2, + DVD_AudioMode_Other = 3 +} DVD_AUDIO_APPMODE; + +typedef enum tagDVD_AUDIO_FORMAT +{ + DVD_AudioFormat_AC3 = 0, + DVD_AudioFormat_MPEG1 = 1, + DVD_AudioFormat_MPEG1_DRC = 2, + DVD_AudioFormat_MPEG2 = 3, + DVD_AudioFormat_MPEG2_DRC = 4, + DVD_AudioFormat_LPCM = 5, + DVD_AudioFormat_DTS = 6, + DVD_AudioFormat_SDDS = 7, + DVD_AudioFormat_Other = 8 +} DVD_AUDIO_FORMAT; + +typedef enum tagDVD_KARAOKE_DOWNMIX +{ + DVD_Mix_0to0 = 0x0001, + DVD_Mix_1to0 = 0x0002, + DVD_Mix_2to0 = 0x0004, + DVD_Mix_3to0 = 0x0008, + DVD_Mix_4to0 = 0x0010, + DVD_Mix_Lto0 = 0x0020, + DVD_Mix_Rto0 = 0x0040, + DVD_Mix_0to1 = 0x0100, + DVD_Mix_1to1 = 0x0200, + DVD_Mix_2to1 = 0x0400, + DVD_Mix_3to1 = 0x0800, + DVD_Mix_4to1 = 0x1000, + DVD_Mix_Lto1 = 0x2000, + DVD_Mix_Rto1 = 0x4000 +} DVD_KARAOKE_DOWNMIX; + +typedef enum tagDVD_KARAOKE_CONTENTS +{ + DVD_Karaoke_GuideVocal1 = 0x0001, + DVD_Karaoke_GuideVocal2 = 0x0002, + DVD_Karaoke_GuideMelody1 = 0x0004, + DVD_Karaoke_GuideMelody2 = 0x0008, + DVD_Karaoke_GuideMelodyA = 0x0010, + DVD_Karaoke_GuideMelodyB = 0x0020, + DVD_Karaoke_SoundEffectA = 0x0040, + DVD_Karaoke_SoundEffectB = 0x0080 +} DVD_KARAOKE_CONTENTS; + +typedef enum tagDVD_KARAOKE_ASSIGNMENT +{ + DVD_Assignment_reserved0 = 0, + DVD_Assignment_reserved1 = 1, + DVD_Assignment_LR = 2, + DVD_Assignment_LRM = 3, + DVD_Assignment_LR1 = 4, + DVD_Assignment_LRM1 = 5, + DVD_Assignment_LR12 = 6, + DVD_Assignment_LRM12 = 7 +} DVD_KARAOKE_ASSIGNMENT; + +typedef struct tagDVD_MUA_MixingInfo +{ + BOOL fMixTo0; + BOOL fMixTo1; + BOOL fMix0InPhase; + BOOL fMix1InPhase; + DWORD dwSpeakerPosition; +} DVD_MUA_MixingInfo; + +typedef struct tagDVD_MUA_Coeff +{ + double log2_alpha; + double log2_beta; +} DVD_MUA_Coeff; + +typedef enum tagDVD_VIDEO_COMPRESSION +{ + DVD_VideoCompression_Other = 0, + DVD_VideoCompression_MPEG1 = 1, + DVD_VideoCompression_MPEG2 = 2 +} DVD_VIDEO_COMPRESSION; + +typedef enum tagDVD_SUBPICTURE_TYPE +{ + DVD_SPType_NotSpecified = 0, + DVD_SPType_Language = 1, + DVD_SPType_Other = 2 +} DVD_SUBPICTURE_TYPE; + +typedef enum tagDVD_SUBPICTURE_CODING +{ + DVD_SPCoding_RunLength = 0, + DVD_SPCoding_Extended = 1, + DVD_SPCoding_Other = 2 +} DVD_SUBPICTURE_CODING; + +typedef enum tagDVD_TITLE_APPMODE +{ + DVD_AppMode_Not_Specified = 0, + DVD_AppMode_Karaoke = 1, + DVD_AppMode_Other = 3 +} DVD_TITLE_APPMODE; + +enum DVD_TextStringType +{ + DVD_Struct_Volume = 0x01, + DVD_Struct_Title = 0x02, + DVD_Struct_ParentalID = 0x03, + DVD_Struct_PartOfTitle = 0x04, + DVD_Struct_Cell = 0x05, + DVD_Stream_Audio = 0x10, + DVD_Stream_Subpicture = 0x11, + DVD_Stream_Angle = 0x12, + DVD_Channel_Audio = 0x20, + DVD_General_Name = 0x30, + DVD_General_Comments = 0x31, + DVD_Title_Series = 0x38, + DVD_Title_Movie = 0x39, + DVD_Title_Video = 0x3a, + DVD_Title_Album = 0x3b, + DVD_Title_Song = 0x3c, + DVD_Title_Other = 0x3f, + DVD_Title_Sub_Series = 0x40, + DVD_Title_Sub_Movie = 0x41, + DVD_Title_Sub_Video = 0x42, + DVD_Title_Sub_Album = 0x43, + DVD_Title_Sub_Song = 0x44, + DVD_Title_Sub_Other = 0x47, + DVD_Title_Orig_Series = 0x48, + DVD_Title_Orig_Movie = 0x49, + DVD_Title_Orig_Video = 0x4a, + DVD_Title_Orig_Album = 0x4b, + DVD_Title_Orig_Song = 0x4c, + DVD_Title_Orig_Other = 0x4f, + DVD_Other_Scene = 0x50, + DVD_Other_Cut = 0x51, + DVD_Other_Take = 0x52 +}; + +enum DVD_TextCharSet +{ + DVD_CharSet_Unicode = 0, + DVD_CharSet_ISO646 = 1, + DVD_CharSet_JIS_Roman_Kanji = 2, + DVD_CharSet_ISO8859_1 = 3, + DVD_CharSet_ShiftJIS_Kanji_Roman_Katakana = 4 +}; + +typedef struct tagDVD_AudioAttributes +{ + DVD_AUDIO_APPMODE AppMode; + BYTE AppModeData; + DVD_AUDIO_FORMAT AudioFormat; + LCID Language; + DVD_AUDIO_LANG_EXT LanguageExtension; + BOOL fHasMultichannelInfo; + DWORD dwFrequency; + BYTE bQuantization; + BYTE bNumberOfChannels; + DWORD dwReserved[2]; +} DVD_AudioAttributes; + +typedef struct tagDVD_MultichannelAudioAttributes +{ + DVD_MUA_MixingInfo Info[8]; + DVD_MUA_Coeff Coeff[8]; +} DVD_MultichannelAudioAttributes; + +typedef struct tagDVD_VideoAttributes +{ + BOOL fPanscanPermitted; + BOOL fLetterboxPermitted; + ULONG ulAspectX; + ULONG ulAspectY; + ULONG ulFrameRate; + ULONG ulFrameHeight; + DVD_VIDEO_COMPRESSION Compression; + BOOL fLine21Field1InGOP; + BOOL fLine21Field2InGOP; + ULONG ulSourceResolutionX; + ULONG ulSourceResolutionY; + BOOL fIsSourceLetterboxed; + BOOL fIsFilmMode; +} DVD_VideoAttributes; + +typedef struct tagDVD_SubpictureAttributes +{ + DVD_SUBPICTURE_TYPE Type; + DVD_SUBPICTURE_CODING CodingMode; + LCID Language; + DVD_SUBPICTURE_LANG_EXT LanguageExtension; +} DVD_SubpictureAttributes; + +typedef struct tagDVD_KaraokeAttributes +{ + BYTE bVersion; + BOOL fMasterOfCeremoniesInGuideVocal1; + BOOL fDuet; + DVD_KARAOKE_ASSIGNMENT ChannelAssignment; + WORD wChannelContents[8]; +} DVD_KaraokeAttributes; + +typedef struct tagDVD_TitleMainAttributes +{ + union + { + DVD_TITLE_APPMODE AppMode; + DVD_HMSF_TIMECODE TitleLength; + } DUMMYUNIONNAME; + DVD_VideoAttributes VideoAttributes; + ULONG ulNumberOfAudioStreams; + DVD_AudioAttributes AudioAttributes[8]; + DVD_MultichannelAudioAttributes MultichannelAudioAttributes[8]; + ULONG ulNumberOfSubpictureStreams; + DVD_SubpictureAttributes SubpictureAttributes[32]; +} DVD_TitleAttributes; + +typedef struct tagDVD_MenuAttributes +{ + BOOL fCompatibleRegion[8]; + DVD_VideoAttributes VideoAttributes; + BOOL fAudioPresent; + DVD_AudioAttributes AudioAttributes; + BOOL fSubpicturePresent; + DVD_SubpictureAttributes SubpictureAttributes; +} DVD_MenuAttributes; + +cpp_quote ("#define DVD_TITLE_MENU 0x000") +cpp_quote ("#define DVD_STREAM_DATA_VMGM 0x400") +cpp_quote ("#define DVD_STREAM_DATA_VTSM 0x401") +cpp_quote ("#define DVD_STREAM_DATA_CURRENT 0x800") +cpp_quote ("#define DVD_DEFAULT_AUDIO_STREAM 0x00f") + +cpp_quote ("#define DVD_AUDIO_CAPS_AC3 0x00000001") +cpp_quote ("#define DVD_AUDIO_CAPS_MPEG2 0x00000002") +cpp_quote ("#define DVD_AUDIO_CAPS_LPCM 0x00000004") +cpp_quote ("#define DVD_AUDIO_CAPS_DTS 0x00000008") +cpp_quote ("#define DVD_AUDIO_CAPS_SDDS 0x00000010") + +typedef struct tagDVD_DECODER_CAPS +{ + DWORD dwSize; + DWORD dwAudioCaps; + double dFwdMaxRateVideo; + double dFwdMaxRateAudio; + double dFwdMaxRateSP; + double dBwdMaxRateVideo; + double dBwdMaxRateAudio; + double dBwdMaxRateSP; + DWORD dwRes1; + DWORD dwRes2; + DWORD dwRes3; + DWORD dwRes4; +} DVD_DECODER_CAPS; + +typedef enum _AM_DVD_GRAPH_FLAGS +{ + AM_DVD_HWDEC_PREFER = 0x0001, + AM_DVD_HWDEC_ONLY = 0x0002, + AM_DVD_SWDEC_PREFER = 0x0004, + AM_DVD_SWDEC_ONLY = 0x0008, + AM_DVD_NOVPE = 0x0100, + AM_DVD_DO_NOT_CLEAR = 0x0200, + AM_DVD_VMR9_ONLY = 0x0800, + AM_DVD_EVR_ONLY = 0x1000, + AM_DVD_EVR_QOS = 0x2000, + AM_DVD_ADAPT_GRAPH = 0x4000, + AM_DVD_MASK = 0xffff +} AM_DVD_GRAPH_FLAGS; + +typedef enum _AM_DVD_STREAM_FLAGS +{ + AM_DVD_STREAM_VIDEO = 0x01, + AM_DVD_STREAM_AUDIO = 0x02, + AM_DVD_STREAM_SUBPIC = 0x04 +} AM_DVD_STREAM_FLAGS; + +typedef struct tagAM_DVD_RENDERSTATUS +{ + HRESULT hrVPEStatus; + BOOL bDvdVolInvalid; + BOOL bDvdVolUnknown; + BOOL bNoLine21In; + BOOL bNoLine21Out; + int iNumStreams; + int iNumStreamsFailed; + DWORD dwFailedStreamsFlag; +} AM_DVD_RENDERSTATUS; + +[ + local, + object, + uuid(a70efe61-e2a3-11d0-a9be-00aa0061be93), +] +interface IDvdControl : IUnknown +{ + HRESULT TitlePlay([in] ULONG title); + HRESULT ChapterPlay([in] ULONG title, [in] ULONG chapter); + HRESULT TimePlay([in] ULONG title, [in] ULONG time); + HRESULT StopForResume(); + HRESULT GoUp(); + HRESULT TimeSearch([in] ULONG time); + HRESULT ChapterSearch([in] ULONG chapter); + HRESULT PrevPGSearch(); + HRESULT TopPGSearch(); + HRESULT NextPGSearch(); + HRESULT ForwardScan([in] double speed); + HRESULT BackwardScan([in] double speed); + HRESULT MenuCall([in] DVD_MENU_ID id); + HRESULT Resume(); + HRESULT UpperButtonSelect(); + HRESULT LowerButtonSelect(); + HRESULT LeftButtonSelect(); + HRESULT RightButtonSelect(); + HRESULT ButtonActivate(); + HRESULT ButtonSelectActivate([in] ULONG button); + HRESULT StillOff(); + HRESULT PauseOn(); + HRESULT PauseOff(); + HRESULT MenuLanguageSelect([in] LCID language); + HRESULT AudioStreamChange([in] ULONG audio); + HRESULT SubpictureStreamChange([in] ULONG subpicture, [in] BOOL enable); + HRESULT AngleChange([in] ULONG angle); + HRESULT ParentalLevelSelect([in] ULONG level); + HRESULT ParentalCountrySelect([in] WORD country); + HRESULT KaraokeAudioPresentationModeChange([in] ULONG mode); + HRESULT VideoModePreference([in] ULONG mode); + HRESULT SetRoot([in] const WCHAR *path); + HRESULT MouseActivate([in] POINT point); + HRESULT MouseSelect([in] POINT point); + HRESULT ChapterPlayAutoStop([in] ULONG title, [in] ULONG chapter, [in] ULONG count); +} + +[ + local, + object, + uuid(a70efe60-e2a3-11d0-a9be-00aa0061be93), +] +interface IDvdInfo : IUnknown +{ + HRESULT GetCurrentDomain([out] DVD_DOMAIN *domain); + HRESULT GetCurrentLocation([out] DVD_PLAYBACK_LOCATION *location); + HRESULT GetTotalTitleTime([out] ULONG *time); + HRESULT GetCurrentButton([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAngle([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAudio([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentSubpicture([out] ULONG *count, [out] ULONG *current, [out] BOOL *enable); + HRESULT GetCurrentUOPS([out] VALID_UOP_SOMTHING_OR_OTHER *uops); + HRESULT GetAllSPRMs([out] SPRMARRAY *regs); + HRESULT GetAllGPRMs([out] GPRMARRAY *regs); + HRESULT GetAudioLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetSubpictureLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetTitleAttributes([in] ULONG title, [out] DVD_ATR *attr); + HRESULT GetVMGAttributes([out] DVD_ATR *attr); + HRESULT GetCurrentVideoAttributes([out] DVD_VideoATR *attr); + HRESULT GetCurrentAudioAttributes([out] DVD_AudioATR *attr); + HRESULT GetCurrentSubpictureAttributes([out] DVD_SubpictureATR *attr); + HRESULT GetCurrentVolumeInfo([out] ULONG *volume_count, [out] ULONG *current, [out] DVD_DISC_SIDE *side, [out] ULONG *title_count); + HRESULT GetDVDTextInfo([out, size_is(size)] BYTE *text_manager, [in] ULONG size, [out] ULONG *ret_size); + HRESULT GetPlayerParentalLevel([out] ULONG *level, [out] ULONG *country_code); + HRESULT GetNumberOfChapters([in] ULONG title, [out] ULONG *count); + HRESULT GetTitleParentalLevels([in] ULONG title, [out] ULONG *levels); + HRESULT GetRoot([out, size_is(size)] char *path, [in] ULONG size, [out] ULONG *ret_size); +} + +[ + local, + object, + uuid(5a4a97e4-94ee-4a55-9751-74b5643aa27d), +] +interface IDvdCmd : IUnknown +{ + HRESULT WaitForStart(); + HRESULT WaitForEnd(); +} + +[ + local, + object, + uuid(86303d6d-1c4a-4087-ab42-f711167048ef), +] +interface IDvdState : IUnknown +{ + HRESULT GetDiscID([out] ULONGLONG *id); + HRESULT GetParentalLevel([out] ULONG *level); +} + +[ + local, + object, + uuid(33bc7430-eec0-11d2-8201-00a0c9d74842), +] +interface IDvdControl2 : IUnknown +{ + HRESULT PlayTitle([in] ULONG title, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayChapterInTitle([in] ULONG title, [in] ULONG chapter, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayTimeInTitle([in] ULONG title, [in] DVD_HMSF_TIMECODE *time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT Stop(); + HRESULT ReturnFromSubmenu([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayAtTime([in] DVD_HMSF_TIMECODE *time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayChapter([in] ULONG chapter, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayPrevChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT ReplayChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayNextChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayForwards([in] double speed, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayBackwards([in] double speed, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT ShowMenu([in] DVD_MENU_ID id, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT Resume([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectRelativeButton([in] DVD_RELATIVE_BUTTON button); + HRESULT ActivateButton(); + HRESULT SelectButton([in] ULONG button); + HRESULT SelectAndActivateButton([in] ULONG button); + HRESULT StillOff(); + HRESULT Pause([in] BOOL enable); + HRESULT SelectAudioStream([in] ULONG stream, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectSubpictureStream([in] ULONG stream, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SetSubpictureState([in] BOOL enable, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectAngle([in] ULONG angle, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectParentalLevel([in] ULONG level); + HRESULT SelectParentalCountry([in] BYTE country[2]); + HRESULT SelectKaraokeAudioPresentationMode([in] ULONG mode); + HRESULT SelectVideoModePreference([in] ULONG mode); + HRESULT SetDVDDirectory([in] const WCHAR *path); + HRESULT ActivateAtPosition([in] POINT point); + HRESULT SelectAtPosition([in] POINT point); + HRESULT PlayChaptersAutoStop([in] ULONG title, [in] ULONG chapter, [in] ULONG count, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT AcceptParentalLevelChange([in] BOOL accept); + HRESULT SetOption([in] DVD_OPTION_FLAG flag, [in] BOOL option); + HRESULT SetState([in] IDvdState *state, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayPeriodInTitleAutoStop([in] ULONG title, [in] DVD_HMSF_TIMECODE *start_time, [in] DVD_HMSF_TIMECODE *end_time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SetGRPM([in] ULONG index, [in] WORD value, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectDefaultMenuLanguage([in] LCID language); + HRESULT SelectDefaultAudioLanguage([in] LCID language, [in] DVD_AUDIO_LANG_EXT extension); + HRESULT SelectDefaultSubpictureLanguage([in] LCID language, [in] DVD_SUBPICTURE_LANG_EXT extension); +} + +[ + local, + object, + uuid(34151510-eec0-11d2-8201-00a0c9d74842), +] +interface IDvdInfo2 : IUnknown +{ + HRESULT GetCurrentDomain([out] DVD_DOMAIN *domain); + HRESULT GetCurrentLocation([out] DVD_PLAYBACK_LOCATION2 *location); + HRESULT GetTotalTitleTime([out] DVD_HMSF_TIMECODE *time, [out] ULONG *flags); + HRESULT GetCurrentButton([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAngle([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAudio([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentSubpicture([out] ULONG *count, [out] ULONG *current, [out] BOOL *enable); + HRESULT GetCurrentUOPS([out] ULONG *uops); + HRESULT GetAllSPRMs([out] SPRMARRAY *regs); + HRESULT GetAllGPRMs([out] GPRMARRAY *regs); + HRESULT GetAudioLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetSubpictureLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetTitleAttributes([in] ULONG index, [out] DVD_MenuAttributes *menu, [out] DVD_TitleAttributes *title); + HRESULT GetVMGAttributes([out] DVD_MenuAttributes *attr); + HRESULT GetVideoAttributes([out] DVD_VideoAttributes *attr); + HRESULT GetAudioAttributes([in] ULONG stream, [out] DVD_AudioAttributes *attr); + HRESULT GetKaraokeAttributes([in] ULONG stream, [out] DVD_KaraokeAttributes *attr); + HRESULT GetSubpictureAttributes([in] ULONG stream, [out] DVD_SubpictureAttributes *attr); + HRESULT GetCurrentVolumeInfo([out] ULONG *volume_count, [out] ULONG *current, [out] DVD_DISC_SIDE *side, [out] ULONG *title_count); + HRESULT GetDVDTextNumberOfLanguages([out] ULONG *count); + HRESULT GetDVDTextLanguageInfo([in] ULONG index, [out] ULONG *string_count, [out] LCID *language, [out] enum DVD_TextCharSet *character_set); + HRESULT GetDVDTextStringAsNative([in] ULONG lang_index, [in] ULONG string_index, [out] BYTE *string, [in] ULONG size, [out] ULONG *ret_size, [out] enum DVD_TextStringType *type); + HRESULT GetDVDTextStringAsUnicode([in] ULONG lang_index, [in] ULONG string_index, [out] WCHAR *string, [in] ULONG size, [out] ULONG *ret_size, [out] enum DVD_TextStringType *type); + HRESULT GetPlayerParentalLevel([out] ULONG *level, [out] BYTE country_code[2]); + HRESULT GetNumberOfChapters([in] ULONG title, [out] ULONG *count); + HRESULT GetTitleParentalLevels([in] ULONG title, [out] ULONG *levels); + HRESULT GetDVDDirectory([out, size_is(size)] WCHAR *path, [in] ULONG size, [out] ULONG *ret_size); + HRESULT IsAudioStreamEnabled([in] ULONG stream, [out] BOOL *enable); + HRESULT GetDiscID([in] const WCHAR *path, [out] ULONGLONG *id); + HRESULT GetState([out] IDvdState **state); + HRESULT GetMenuLanguages([out] LCID *languages, [in] ULONG count, [out] ULONG *ret_count); + HRESULT GetButtonAtPosition([in] POINT point, [out] ULONG *button); + HRESULT GetCmdFromEvent([in] LONG_PTR param, [out] IDvdCmd **cmd); + HRESULT GetDefaultMenuLanguage([out] LCID *language); + HRESULT GetDefaultAudioLanguage([out] LCID *language, [out] DVD_AUDIO_LANG_EXT *extension); + HRESULT SelectDefaultSubpictureLanguage([out] LCID *language, [out] DVD_SUBPICTURE_LANG_EXT *extension); + HRESULT GetDecoderCaps([out] DVD_DECODER_CAPS *caps); + HRESULT GetButtonRect([in] ULONG button, [out] RECT *rect); + HRESULT IsSubpictureStreamEnabled([in] ULONG stream, [out] BOOL *enable); +} + +[ + local, + object, + uuid(fcc152b6-f372-11d0-8e00-00c04fd7c08b), +] +interface IDvdGraphBuilder : IUnknown +{ + HRESULT GetFiltergraph([out] IGraphBuilder **graph); + HRESULT GetDvdInterface([in] REFIID iid, [out] void **out); + HRESULT RenderDvdVideoVolume([in] const WCHAR *path, [in] DWORD flags, [out] AM_DVD_RENDERSTATUS *status); +} diff --git a/include/strmif.idl b/include/strmif.idl index a06f99b751..8c140dcbfd 100644 --- a/include/strmif.idl +++ b/include/strmif.idl @@ -20,12 +20,8 @@ import "unknwn.idl"; import "objidl.idl"; #include <devenum.idl> - #include <axcore.idl> - #include <axextend.idl> - #include <dyngraph.idl> - -/* TODO: #include <dvdif.h> */ #include <vmrender.idl> +#include <dvdif.idl> -- 2.26.2

1 0

[PATCH] include: Add dvdif.idl.
by Zebediah Figura 29 Apr '20

29 Apr '20

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/Makefile.in | 1 + include/dvdif.idl | 742 ++++++++++++++++++++++++++++++++++++++++++++ include/strmif.idl | 6 +- 3 files changed, 744 insertions(+), 5 deletions(-) create mode 100644 include/dvdif.idl diff --git a/include/Makefile.in b/include/Makefile.in index 543d41811c..74db5ee151 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -238,6 +238,7 @@ SOURCES = \ dshow.h \ dsound.h \ dsrole.h \ + dvdif.idl \ dvdmedia.h \ dvoice.h \ dwmapi.h \ diff --git a/include/dvdif.idl b/include/dvdif.idl new file mode 100644 index 0000000000..d37815d1db --- /dev/null +++ b/include/dvdif.idl @@ -0,0 +1,742 @@ +/* + * Copyright (C) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +pragma makedep install +#endif + +import "unknwn.idl"; +import "objidl.idl"; + +cpp_quote("#include <ddraw.h>") + +cpp_quote("#if 0") +interface IGraphBuilder; +cpp_quote("#endif") + +typedef enum tagDVD_DOMAIN +{ + DVD_DOMAIN_FirstPlay = 1, + DVD_DOMAIN_VideoManagerMenu, + DVD_DOMAIN_VideoTitleSetMenu, + DVD_DOMAIN_Title, + DVD_DOMAIN_Stop +} DVD_DOMAIN; + +typedef enum tagDVD_MENU_ID +{ + DVD_MENU_Title = 2, + DVD_MENU_Root = 3, + DVD_MENU_Subpicture = 4, + DVD_MENU_Audio = 5, + DVD_MENU_Angle = 6, + DVD_MENU_Chapter = 7 +} DVD_MENU_ID; + +typedef enum tagDVD_DISC_SIDE +{ + DVD_SIDE_A = 1, + DVD_SIDE_B = 2 +} DVD_DISC_SIDE; + +typedef enum tagDVD_PREFERRED_DISPLAY_MODE +{ + DISPLAY_CONTENT_DEFAULT = 0, + DISPLAY_16x9 = 1, + DISPLAY_4x3_PANSCAN_PREFERRED = 2, + DISPLAY_4x3_LETTERBOX_PREFERRED = 3 +} DVD_PREFERRED_DISPLAY_MODE; + +typedef WORD DVD_REGISTER; +typedef DVD_REGISTER GPRMARRAY[16]; +typedef DVD_REGISTER SPRMARRAY[24]; + +typedef struct tagDVD_ATR +{ + ULONG ulCAT; + BYTE pbATRI[768]; +} DVD_ATR; + +typedef BYTE DVD_VideoATR[2]; +typedef BYTE DVD_AudioATR[8]; +typedef BYTE DVD_SubpictureATR[6]; + +typedef enum tagDVD_FRAMERATE +{ + DVD_FPS_25 = 1, + DVD_FPS_30NonDrop = 3 +} DVD_FRAMERATE; + +cpp_quote("typedef struct tagDVD_TIMECODE") +cpp_quote("{") +cpp_quote(" ULONG Hours1 : 4;") +cpp_quote(" ULONG Hours10 : 4;") +cpp_quote(" ULONG Minutes1 : 4;") +cpp_quote(" ULONG Minutes10 : 4;") +cpp_quote(" ULONG Seconds1 : 4;") +cpp_quote(" ULONG Seconds10 : 4;") +cpp_quote(" ULONG Frames1 : 4;") +cpp_quote(" ULONG Frames10 : 2;") +cpp_quote(" ULONG FrameRateCode : 2;") +cpp_quote("} DVD_TIMECODE;") + +typedef enum tagDVD_NavCmdType +{ + DVD_NavCmdType_Pre = 1, + DVD_NavCmdType_Post = 2, + DVD_NavCmdType_Cell = 3, + DVD_NavCmdType_Button = 4 +} DVD_NavCmdType; + +typedef enum tagDVD_TIMECODE_FLAGS +{ + DVD_TC_FLAG_25fps = 0x00000001, + DVD_TC_FLAG_30fps = 0x00000002, + DVD_TC_FLAG_DropFrame = 0x00000004, + DVD_TC_FLAG_Interpolated = 0x00000008 +} DVD_TIMECODE_FLAGS; + +typedef struct tagDVD_HMSF_TIMECODE +{ + BYTE bHours; + BYTE bMinutes; + BYTE bSeconds; + BYTE bFrames; +} DVD_HMSF_TIMECODE; + +typedef struct tagDVD_PLAYBACK_LOCATION2 +{ + ULONG TitleNum; + ULONG ChapterNum; + DVD_HMSF_TIMECODE TimeCode; + ULONG TimeCodeFlags; +} DVD_PLAYBACK_LOCATION2; + +typedef struct tagDVD_PLAYBACK_LOCATION +{ + ULONG TitleNum; + ULONG ChapterNum; + ULONG TimeCode; +} DVD_PLAYBACK_LOCATION; + +typedef DWORD VALID_UOP_SOMTHING_OR_OTHER; + +typedef enum +{ + UOP_FLAG_Play_Title_Or_AtTime = 0x00000001, + UOP_FLAG_Play_Chapter = 0x00000002, + UOP_FLAG_Play_Title = 0x00000004, + UOP_FLAG_Stop = 0x00000008, + UOP_FLAG_ReturnFromSubMenu = 0x00000010, + UOP_FLAG_Play_Chapter_Or_AtTime = 0x00000020, + UOP_FLAG_PlayPrev_Or_Replay_Chapter = 0x00000040, + UOP_FLAG_PlayNext_Chapter = 0x00000080, + UOP_FLAG_Play_Forwards = 0x00000100, + UOP_FLAG_Play_Backwards = 0x00000200, + UOP_FLAG_ShowMenu_Title = 0x00000400, + UOP_FLAG_ShowMenu_Root = 0x00000800, + UOP_FLAG_ShowMenu_SubPic = 0x00001000, + UOP_FLAG_ShowMenu_Audio = 0x00002000, + UOP_FLAG_ShowMenu_Angle = 0x00004000, + UOP_FLAG_ShowMenu_Chapter = 0x00008000, + UOP_FLAG_Resume = 0x00010000, + UOP_FLAG_Select_Or_Activate_Button = 0x00020000, + UOP_FLAG_Still_Off = 0x00040000, + UOP_FLAG_Pause_On = 0x00080000, + UOP_FLAG_Select_Audio_Stream = 0x00100000, + UOP_FLAG_Select_SubPic_Stream = 0x00200000, + UOP_FLAG_Select_Angle = 0x00400000, + UOP_FLAG_Select_Karaoke_Audio_Presentation_Mode = 0x00800000, + UOP_FLAG_Select_Video_Mode_Preference = 0x01000000 +} VALID_UOP_FLAG; + +typedef enum +{ + DVD_CMD_FLAG_None = 0x00000000, + DVD_CMD_FLAG_Flush = 0x00000001, + DVD_CMD_FLAG_SendEvents = 0x00000002, + DVD_CMD_FLAG_Block = 0x00000004, + DVD_CMD_FLAG_StartWhenRendered = 0x00000008, + DVD_CMD_FLAG_EndAfterRendered = 0x00000010 +} DVD_CMD_FLAGS; + +typedef enum +{ + DVD_ResetOnStop = 1, + DVD_NotifyParentalLevelChange = 2, + DVD_HMSF_TimeCodeEvents = 3, + DVD_AudioDuringFFwdRew = 4, + DVD_EnableNonblockingAPIs = 5, + DVD_CacheSizeInMB = 6, + DVD_EnablePortableBookmarks = 7, + DVD_EnableExtendedCopyProtectErrors = 8, + DVD_NotifyPositionChange = 9, + DVD_IncreaseOutputControl = 10, + DVD_EnableStreaming = 11, + DVD_EnableESOutput = 12, + DVD_EnableTitleLength = 13, + DVD_DisableStillThrottle = 14, + DVD_EnableLoggingEvents = 15, + DVD_MaxReadBurstInKB = 16, + DVD_ReadBurstPeriodInMS = 17, + DVD_RestartDisc = 18, + DVD_EnableCC = 19 +} DVD_OPTION_FLAG; + +typedef enum +{ + DVD_Relative_Upper = 1, + DVD_Relative_Lower = 2, + DVD_Relative_Left = 3, + DVD_Relative_Right = 4 +} DVD_RELATIVE_BUTTON; + +typedef enum tagDVD_PARENTAL_LEVEL +{ + DVD_PARENTAL_LEVEL_8 = 0x8000, + DVD_PARENTAL_LEVEL_7 = 0x4000, + DVD_PARENTAL_LEVEL_6 = 0x2000, + DVD_PARENTAL_LEVEL_5 = 0x1000, + DVD_PARENTAL_LEVEL_4 = 0x0800, + DVD_PARENTAL_LEVEL_3 = 0x0400, + DVD_PARENTAL_LEVEL_2 = 0x0200, + DVD_PARENTAL_LEVEL_1 = 0x0100 +} DVD_PARENTAL_LEVEL; + +typedef enum tagDVD_AUDIO_LANG_EXT +{ + DVD_AUD_EXT_NotSpecified = 0, + DVD_AUD_EXT_Captions = 1, + DVD_AUD_EXT_VisuallyImpaired = 2, + DVD_AUD_EXT_DirectorComments1 = 3, + DVD_AUD_EXT_DirectorComments2 = 4 +} DVD_AUDIO_LANG_EXT; + +typedef enum tagDVD_SUBPICTURE_LANG_EXT +{ + DVD_SP_EXT_NotSpecified = 0, + DVD_SP_EXT_Caption_Normal = 1, + DVD_SP_EXT_Caption_Big = 2, + DVD_SP_EXT_Caption_Children = 3, + DVD_SP_EXT_CC_Normal = 5, + DVD_SP_EXT_CC_Big = 6, + DVD_SP_EXT_CC_Children = 7, + DVD_SP_EXT_Forced = 9, + DVD_SP_EXT_DirectorComments_Normal = 13, + DVD_SP_EXT_DirectorComments_Big = 14, + DVD_SP_EXT_DirectorComments_Children = 15 +} DVD_SUBPICTURE_LANG_EXT; + +typedef enum tagDVD_AUDIO_APPMODE +{ + DVD_AudioMode_None = 0, + DVD_AudioMode_Karaoke = 1, + DVD_AudioMode_Surround = 2, + DVD_AudioMode_Other = 3 +} DVD_AUDIO_APPMODE; + +typedef enum tagDVD_AUDIO_FORMAT +{ + DVD_AudioFormat_AC3 = 0, + DVD_AudioFormat_MPEG1 = 1, + DVD_AudioFormat_MPEG1_DRC = 2, + DVD_AudioFormat_MPEG2 = 3, + DVD_AudioFormat_MPEG2_DRC = 4, + DVD_AudioFormat_LPCM = 5, + DVD_AudioFormat_DTS = 6, + DVD_AudioFormat_SDDS = 7, + DVD_AudioFormat_Other = 8 +} DVD_AUDIO_FORMAT; + +typedef enum tagDVD_KARAOKE_DOWNMIX +{ + DVD_Mix_0to0 = 0x0001, + DVD_Mix_1to0 = 0x0002, + DVD_Mix_2to0 = 0x0004, + DVD_Mix_3to0 = 0x0008, + DVD_Mix_4to0 = 0x0010, + DVD_Mix_Lto0 = 0x0020, + DVD_Mix_Rto0 = 0x0040, + DVD_Mix_0to1 = 0x0100, + DVD_Mix_1to1 = 0x0200, + DVD_Mix_2to1 = 0x0400, + DVD_Mix_3to1 = 0x0800, + DVD_Mix_4to1 = 0x1000, + DVD_Mix_Lto1 = 0x2000, + DVD_Mix_Rto1 = 0x4000 +} DVD_KARAOKE_DOWNMIX; + +typedef enum tagDVD_KARAOKE_CONTENTS +{ + DVD_Karaoke_GuideVocal1 = 0x0001, + DVD_Karaoke_GuideVocal2 = 0x0002, + DVD_Karaoke_GuideMelody1 = 0x0004, + DVD_Karaoke_GuideMelody2 = 0x0008, + DVD_Karaoke_GuideMelodyA = 0x0010, + DVD_Karaoke_GuideMelodyB = 0x0020, + DVD_Karaoke_SoundEffectA = 0x0040, + DVD_Karaoke_SoundEffectB = 0x0080 +} DVD_KARAOKE_CONTENTS; + +typedef enum tagDVD_KARAOKE_ASSIGNMENT +{ + DVD_Assignment_reserved0 = 0, + DVD_Assignment_reserved1 = 1, + DVD_Assignment_LR = 2, + DVD_Assignment_LRM = 3, + DVD_Assignment_LR1 = 4, + DVD_Assignment_LRM1 = 5, + DVD_Assignment_LR12 = 6, + DVD_Assignment_LRM12 = 7 +} DVD_KARAOKE_ASSIGNMENT; + +typedef struct tagDVD_MUA_MixingInfo +{ + BOOL fMixTo0; + BOOL fMixTo1; + BOOL fMix0InPhase; + BOOL fMix1InPhase; + DWORD dwSpeakerPosition; +} DVD_MUA_MixingInfo; + +typedef struct tagDVD_MUA_Coeff +{ + double log2_alpha; + double log2_beta; +} DVD_MUA_Coeff; + +typedef enum tagDVD_VIDEO_COMPRESSION +{ + DVD_VideoCompression_Other = 0, + DVD_VideoCompression_MPEG1 = 1, + DVD_VideoCompression_MPEG2 = 2 +} DVD_VIDEO_COMPRESSION; + +typedef enum tagDVD_SUBPICTURE_TYPE +{ + DVD_SPType_NotSpecified = 0, + DVD_SPType_Language = 1, + DVD_SPType_Other = 2 +} DVD_SUBPICTURE_TYPE; + +typedef enum tagDVD_SUBPICTURE_CODING +{ + DVD_SPCoding_RunLength = 0, + DVD_SPCoding_Extended = 1, + DVD_SPCoding_Other = 2 +} DVD_SUBPICTURE_CODING; + +typedef enum tagDVD_TITLE_APPMODE +{ + DVD_AppMode_Not_Specified = 0, + DVD_AppMode_Karaoke = 1, + DVD_AppMode_Other = 3 +} DVD_TITLE_APPMODE; + +enum DVD_TextStringType +{ + DVD_Struct_Volume = 0x01, + DVD_Struct_Title = 0x02, + DVD_Struct_ParentalID = 0x03, + DVD_Struct_PartOfTitle = 0x04, + DVD_Struct_Cell = 0x05, + DVD_Stream_Audio = 0x10, + DVD_Stream_Subpicture = 0x11, + DVD_Stream_Angle = 0x12, + DVD_Channel_Audio = 0x20, + DVD_General_Name = 0x30, + DVD_General_Comments = 0x31, + DVD_Title_Series = 0x38, + DVD_Title_Movie = 0x39, + DVD_Title_Video = 0x3a, + DVD_Title_Album = 0x3b, + DVD_Title_Song = 0x3c, + DVD_Title_Other = 0x3f, + DVD_Title_Sub_Series = 0x40, + DVD_Title_Sub_Movie = 0x41, + DVD_Title_Sub_Video = 0x42, + DVD_Title_Sub_Album = 0x43, + DVD_Title_Sub_Song = 0x44, + DVD_Title_Sub_Other = 0x47, + DVD_Title_Orig_Series = 0x48, + DVD_Title_Orig_Movie = 0x49, + DVD_Title_Orig_Video = 0x4a, + DVD_Title_Orig_Album = 0x4b, + DVD_Title_Orig_Song = 0x4c, + DVD_Title_Orig_Other = 0x4f, + DVD_Other_Scene = 0x50, + DVD_Other_Cut = 0x51, + DVD_Other_Take = 0x52 +}; + +enum DVD_TextCharSet +{ + DVD_CharSet_Unicode = 0, + DVD_CharSet_ISO646 = 1, + DVD_CharSet_JIS_Roman_Kanji = 2, + DVD_CharSet_ISO8859_1 = 3, + DVD_CharSet_ShiftJIS_Kanji_Roman_Katakana = 4 +}; + +typedef struct tagDVD_AudioAttributes +{ + DVD_AUDIO_APPMODE AppMode; + BYTE AppModeData; + DVD_AUDIO_FORMAT AudioFormat; + LCID Language; + DVD_AUDIO_LANG_EXT LanguageExtension; + BOOL fHasMultichannelInfo; + DWORD dwFrequency; + BYTE bQuantization; + BYTE bNumberOfChannels; + DWORD dwReserved[2]; +} DVD_AudioAttributes; + +typedef struct tagDVD_MultichannelAudioAttributes +{ + DVD_MUA_MixingInfo Info[8]; + DVD_MUA_Coeff Coeff[8]; +} DVD_MultichannelAudioAttributes; + +typedef struct tagDVD_VideoAttributes +{ + BOOL fPanscanPermitted; + BOOL fLetterboxPermitted; + ULONG ulAspectX; + ULONG ulAspectY; + ULONG ulFrameRate; + ULONG ulFrameHeight; + DVD_VIDEO_COMPRESSION Compression; + BOOL fLine21Field1InGOP; + BOOL fLine21Field2InGOP; + ULONG ulSourceResolutionX; + ULONG ulSourceResolutionY; + BOOL fIsSourceLetterboxed; + BOOL fIsFilmMode; +} DVD_VideoAttributes; + +typedef struct tagDVD_SubpictureAttributes +{ + DVD_SUBPICTURE_TYPE Type; + DVD_SUBPICTURE_CODING CodingMode; + LCID Language; + DVD_SUBPICTURE_LANG_EXT LanguageExtension; +} DVD_SubpictureAttributes; + +typedef struct tagDVD_KaraokeAttributes +{ + BYTE bVersion; + BOOL fMasterOfCeremoniesInGuideVocal1; + BOOL fDuet; + DVD_KARAOKE_ASSIGNMENT ChannelAssignment; + WORD wChannelContents[8]; +} DVD_KaraokeAttributes; + +typedef struct tagDVD_TitleMainAttributes +{ + union + { + DVD_TITLE_APPMODE AppMode; + DVD_HMSF_TIMECODE TitleLength; + } DUMMYUNIONNAME; + DVD_VideoAttributes VideoAttributes; + ULONG ulNumberOfAudioStreams; + DVD_AudioAttributes AudioAttributes[8]; + DVD_MultichannelAudioAttributes MultichannelAudioAttributes[8]; + ULONG ulNumberOfSubpictureStreams; + DVD_SubpictureAttributes SubpictureAttributes[32]; +} DVD_TitleAttributes; + +typedef struct tagDVD_MenuAttributes +{ + BOOL fCompatibleRegion[8]; + DVD_VideoAttributes VideoAttributes; + BOOL fAudioPresent; + DVD_AudioAttributes AudioAttributes; + BOOL fSubpicturePresent; + DVD_SubpictureAttributes SubpictureAttributes; +} DVD_MenuAttributes; + +cpp_quote ("#define DVD_TITLE_MENU 0x000") +cpp_quote ("#define DVD_STREAM_DATA_VMGM 0x400") +cpp_quote ("#define DVD_STREAM_DATA_VTSM 0x401") +cpp_quote ("#define DVD_STREAM_DATA_CURRENT 0x800") +cpp_quote ("#define DVD_DEFAULT_AUDIO_STREAM 0x00f") + +cpp_quote ("#define DVD_AUDIO_CAPS_AC3 0x00000001") +cpp_quote ("#define DVD_AUDIO_CAPS_MPEG2 0x00000002") +cpp_quote ("#define DVD_AUDIO_CAPS_LPCM 0x00000004") +cpp_quote ("#define DVD_AUDIO_CAPS_DTS 0x00000008") +cpp_quote ("#define DVD_AUDIO_CAPS_SDDS 0x00000010") + +typedef struct tagDVD_DECODER_CAPS +{ + DWORD dwSize; + DWORD dwAudioCaps; + double dFwdMaxRateVideo; + double dFwdMaxRateAudio; + double dFwdMaxRateSP; + double dBwdMaxRateVideo; + double dBwdMaxRateAudio; + double dBwdMaxRateSP; + DWORD dwRes1; + DWORD dwRes2; + DWORD dwRes3; + DWORD dwRes4; +} DVD_DECODER_CAPS; + +typedef enum _AM_DVD_GRAPH_FLAGS +{ + AM_DVD_HWDEC_PREFER = 0x0001, + AM_DVD_HWDEC_ONLY = 0x0002, + AM_DVD_SWDEC_PREFER = 0x0004, + AM_DVD_SWDEC_ONLY = 0x0008, + AM_DVD_NOVPE = 0x0100, + AM_DVD_DO_NOT_CLEAR = 0x0200, + AM_DVD_VMR9_ONLY = 0x0800, + AM_DVD_EVR_ONLY = 0x1000, + AM_DVD_EVR_QOS = 0x2000, + AM_DVD_ADAPT_GRAPH = 0x4000, + AM_DVD_MASK = 0xffff +} AM_DVD_GRAPH_FLAGS; + +typedef enum _AM_DVD_STREAM_FLAGS +{ + AM_DVD_STREAM_VIDEO = 0x01, + AM_DVD_STREAM_AUDIO = 0x02, + AM_DVD_STREAM_SUBPIC = 0x04 +} AM_DVD_STREAM_FLAGS; + +typedef struct tagAM_DVD_RENDERSTATUS +{ + HRESULT hrVPEStatus; + BOOL bDvdVolInvalid; + BOOL bDvdVolUnknown; + BOOL bNoLine21In; + BOOL bNoLine21Out; + int iNumStreams; + int iNumStreamsFailed; + DWORD dwFailedStreamsFlag; +} AM_DVD_RENDERSTATUS; + +[ + local, + object, + uuid(a70efe61-e2a3-11d0-a9be-00aa0061be93), +] +interface IDvdControl : IUnknown +{ + HRESULT TitlePlay([in] ULONG title); + HRESULT ChapterPlay([in] ULONG title, [in] ULONG chapter); + HRESULT TimePlay([in] ULONG title, [in] ULONG time); + HRESULT StopForResume(); + HRESULT GoUp(); + HRESULT TimeSearch([in] ULONG time); + HRESULT ChapterSearch([in] ULONG chapter); + HRESULT PrevPGSearch(); + HRESULT TopPGSearch(); + HRESULT NextPGSearch(); + HRESULT ForwardScan([in] double speed); + HRESULT BackwardScan([in] double speed); + HRESULT MenuCall([in] DVD_MENU_ID id); + HRESULT Resume(); + HRESULT UpperButtonSelect(); + HRESULT LowerButtonSelect(); + HRESULT LeftButtonSelect(); + HRESULT RightButtonSelect(); + HRESULT ButtonActivate(); + HRESULT ButtonSelectActivate([in] ULONG button); + HRESULT StillOff(); + HRESULT PauseOn(); + HRESULT PauseOff(); + HRESULT MenuLanguageSelect([in] LCID language); + HRESULT AudioStreamChange([in] ULONG audio); + HRESULT SubpictureStreamChange([in] ULONG subpicture, [in] BOOL enable); + HRESULT AngleChange([in] ULONG angle); + HRESULT ParentalLevelSelect([in] ULONG level); + HRESULT ParentalCountrySelect([in] WORD country); + HRESULT KaraokeAudioPresentationModeChange([in] ULONG mode); + HRESULT VideoModePreference([in] ULONG mode); + HRESULT SetRoot([in] const WCHAR *path); + HRESULT MouseActivate([in] POINT point); + HRESULT MouseSelect([in] POINT point); + HRESULT ChapterPlayAutoStop([in] ULONG title, [in] ULONG chapter, [in] ULONG count); +} + +[ + local, + object, + uuid(a70efe60-e2a3-11d0-a9be-00aa0061be93), +] +interface IDvdInfo : IUnknown +{ + HRESULT GetCurrentDomain([out] DVD_DOMAIN *domain); + HRESULT GetCurrentLocation([out] DVD_PLAYBACK_LOCATION *location); + HRESULT GetTotalTitleTime([out] ULONG *time); + HRESULT GetCurrentButton([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAngle([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAudio([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentSubpicture([out] ULONG *count, [out] ULONG *current, [out] BOOL *enable); + HRESULT GetCurrentUOPS([out] VALID_UOP_SOMTHING_OR_OTHER *uops); + HRESULT GetAllSPRMs([out] SPRMARRAY *regs); + HRESULT GetAllGPRMs([out] GPRMARRAY *regs); + HRESULT GetAudioLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetSubpictureLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetTitleAttributes([in] ULONG title, [out] DVD_ATR *attr); + HRESULT GetVMGAttributes([out] DVD_ATR *attr); + HRESULT GetCurrentVideoAttributes([out] DVD_VideoATR *attr); + HRESULT GetCurrentAudioAttributes([out] DVD_AudioATR *attr); + HRESULT GetCurrentSubpictureAttributes([out] DVD_SubpictureATR *attr); + HRESULT GetCurrentVolumeInfo([out] ULONG *volume_count, [out] ULONG *current, [out] DVD_DISC_SIDE *side, [out] ULONG *title_count); + HRESULT GetDVDTextInfo([out, size_is(size)] BYTE *text_manager, [in] ULONG size, [out] ULONG *ret_size); + HRESULT GetPlayerParentalLevel([out] ULONG *level, [out] ULONG *country_code); + HRESULT GetNumberOfChapters([in] ULONG title, [out] ULONG *count); + HRESULT GetTitleParentalLevels([in] ULONG title, [out] ULONG *levels); + HRESULT GetRoot([out, size_is(size)] char *path, [in] ULONG size, [out] ULONG *ret_size); +} + +[ + local, + object, + uuid(5a4a97e4-94ee-4a55-9751-74b5643aa27d), +] +interface IDvdCmd : IUnknown +{ + HRESULT WaitForStart(); + HRESULT WaitForEnd(); +} + +[ + local, + object, + uuid(86303d6d-1c4a-4087-ab42-f711167048ef), +] +interface IDvdState : IUnknown +{ + HRESULT GetDiscID([out] ULONGLONG *id); + HRESULT GetParentalLevel([out] ULONG *level); +} + +[ + local, + object, + uuid(33bc7430-eec0-11d2-8201-00a0c9d74842), +] +interface IDvdControl2 : IUnknown +{ + HRESULT PlayTitle([in] ULONG title, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayChapterInTitle([in] ULONG title, [in] ULONG chapter, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayTimeInTitle([in] ULONG title, [in] DVD_HMSF_TIMECODE *time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT Stop(); + HRESULT ReturnFromSubmenu([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayAtTime([in] DVD_HMSF_TIMECODE *time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayChapter([in] ULONG chapter, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayPrevChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT ReplayChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayNextChapter([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayForwards([in] double speed, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayBackwards([in] double speed, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT ShowMenu([in] DVD_MENU_ID id, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT Resume([in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectRelativeButton([in] DVD_RELATIVE_BUTTON button); + HRESULT ActivateButton(); + HRESULT SelectButton([in] ULONG button); + HRESULT SelectAndActivateButton([in] ULONG button); + HRESULT StillOff(); + HRESULT Pause([in] BOOL enable); + HRESULT SelectAudioStream([in] ULONG stream, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectSubpictureStream([in] ULONG stream, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SetSubpictureState([in] BOOL enable, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectAngle([in] ULONG angle, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectParentalLevel([in] ULONG level); + HRESULT SelectParentalCountry([in] BYTE country[2]); + HRESULT SelectKaraokeAudioPresentationMode([in] ULONG mode); + HRESULT SelectVideoModePreference([in] ULONG mode); + HRESULT SetDVDDirectory([in] const WCHAR *path); + HRESULT ActivateAtPosition([in] POINT point); + HRESULT SelectAtPosition([in] POINT point); + HRESULT PlayChaptersAutoStop([in] ULONG title, [in] ULONG chapter, [in] ULONG count, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT AcceptParentalLevelChange([in] BOOL accept); + HRESULT SetOption([in] DVD_OPTION_FLAG flag, [in] BOOL option); + HRESULT SetState([in] IDvdState *state, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT PlayPeriodInTitleAutoStop([in] ULONG title, [in] DVD_HMSF_TIMECODE *start_time, [in] DVD_HMSF_TIMECODE *end_time, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SetGRPM([in] ULONG index, [in] WORD value, [in] DWORD flags, [out] IDvdCmd **cmd); + HRESULT SelectDefaultMenuLanguage([in] LCID language); + HRESULT SelectDefaultAudioLanguage([in] LCID language, [in] DVD_AUDIO_LANG_EXT extension); + HRESULT SelectDefaultSubpictureLanguage([in] LCID language, [in] DVD_SUBPICTURE_LANG_EXT extension); +} + +[ + local, + object, + uuid(34151510-eec0-11d2-8201-00a0c9d74842), +] +interface IDvdInfo2 : IUnknown +{ + HRESULT GetCurrentDomain([out] DVD_DOMAIN *domain); + HRESULT GetCurrentLocation([out] DVD_PLAYBACK_LOCATION2 *location); + HRESULT GetTotalTitleTime([out] DVD_HMSF_TIMECODE *time, [out] ULONG *flags); + HRESULT GetCurrentButton([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAngle([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentAudio([out] ULONG *count, [out] ULONG *current); + HRESULT GetCurrentSubpicture([out] ULONG *count, [out] ULONG *current, [out] BOOL *enable); + HRESULT GetCurrentUOPS([out] ULONG *uops); + HRESULT GetAllSPRMs([out] SPRMARRAY *regs); + HRESULT GetAllGPRMs([out] GPRMARRAY *regs); + HRESULT GetAudioLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetSubpictureLanguage([in] ULONG stream, [out] LCID *language); + HRESULT GetTitleAttributes([in] ULONG title, [out] DVD_MenuAttributes *menu, [out] DVD_TitleAttributes *title); + HRESULT GetVMGAttributes([out] DVD_MenuAttributes *attr); + HRESULT GetVideoAttributes([out] DVD_VideoAttributes *attr); + HRESULT GetAudioAttributes([in] ULONG stream, [out] DVD_AudioAttributes *attr); + HRESULT GetKaraokeAttributes([in] ULONG stream, [out] DVD_KaraokeAttributes *attr); + HRESULT GetSubpictureAttributes([in] ULONG stream, [out] DVD_SubpictureAttributes *attr); + HRESULT GetCurrentVolumeInfo([out] ULONG *volume_count, [out] ULONG *current, [out] DVD_DISC_SIDE *side, [out] ULONG *title_count); + HRESULT GetDVDTextNumberOfLanguages([out] ULONG *count); + HRESULT GetDVDTextLanguageInfo([in] ULONG index, [out] ULONG *string_count, [out] LCID *language, [out] enum DVD_TextCharSet *character_set); + HRESULT GetDVDTextStringAsNative([in] ULONG lang_index, [in] ULONG string_index, [out] BYTE *string, [in] ULONG size, [out] ULONG *ret_size, [out] enum DVD_TextStringType *type); + HRESULT GetDVDTextStringAsUnicode([in] ULONG lang_index, [in] ULONG string_index, [out] WCHAR *string, [in] ULONG size, [out] ULONG *ret_size, [out] enum DVD_TextStringType *type); + HRESULT GetPlayerParentalLevel([out] ULONG *level, [out] BYTE country_code[2]); + HRESULT GetNumberOfChapters([in] ULONG title, [out] ULONG *count); + HRESULT GetTitleParentalLevels([in] ULONG title, [out] ULONG *levels); + HRESULT GetDVDDirectory([out, size_is(size)] WCHAR *path, [in] ULONG size, [out] ULONG *ret_size); + HRESULT IsAudioStreamEnabled([in] ULONG stream, [out] BOOL *enable); + HRESULT GetDiscID([in] const WCHAR *path, [out] ULONGLONG *id); + HRESULT GetState([out] IDvdState **state); + HRESULT GetMenuLanguages([out] LCID *languages, [in] ULONG count, [out] ULONG *ret_count); + HRESULT GetButtonAtPosition([in] POINT point, [out] ULONG *button); + HRESULT GetCmdFromEvent([in] LONG_PTR param, [out] IDvdCmd **cmd); + HRESULT GetDefaultMenuLanguage([out] LCID *language); + HRESULT GetDefaultAudioLanguage([out] LCID *language, [out] DVD_AUDIO_LANG_EXT *extension); + HRESULT SelectDefaultSubpictureLanguage([out] LCID *language, [out] DVD_SUBPICTURE_LANG_EXT *extension); + HRESULT GetDecoderCaps([out] DVD_DECODER_CAPS *caps); + HRESULT GetButtonRect([in] ULONG button, [out] RECT *rect); + HRESULT IsSubpictureStreamEnabled([in] ULONG stream, [out] BOOL *enable); +} + +[ + local, + object, + uuid(fcc152b6-f372-11d0-8e00-00c04fd7c08b), +] +interface IDvdGraphBuilder : IUnknown +{ + HRESULT GetFiltergraph([out] IGraphBuilder **graph); + HRESULT GetDvdInterface([in] REFIID iid, [out] void **out); + HRESULT RenderDvdVideoVolume([in] const WCHAR *path, [in] DWORD flags, [out] AM_DVD_RENDERSTATUS *status); +} diff --git a/include/strmif.idl b/include/strmif.idl index a06f99b751..8c140dcbfd 100644 --- a/include/strmif.idl +++ b/include/strmif.idl @@ -20,12 +20,8 @@ import "unknwn.idl"; import "objidl.idl"; #include <devenum.idl> - #include <axcore.idl> - #include <axextend.idl> - #include <dyngraph.idl> - -/* TODO: #include <dvdif.h> */ #include <vmrender.idl> +#include <dvdif.idl> -- 2.26.2

2 1

Preparing Wine 5.0.1 for GCC 10
by Gerald Pfeifer 29 Apr '20

29 Apr '20

Hi Alexandre, can you please push the patches to the Wine 5.0 branch for the 5.0.1 release? That'll allow the stable release branch to build on rolling distros with newer compilers over the coming months/year. commit 1d785798605c01dcfc8a2f9f6ecc24bc21351029 Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 15 21:43:42 2020 +0800 schedsvc/tests: Fix compilation with recent gcc/clang versions. commit ea032bb7f8daddfe308f86f52c54db5f657b658a Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 28 22:40:25 2020 +0100 msi: Properly declare variables in msi/tests/utils.h as extern. Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. commit c13d58780f78393571dfdeb5b4952e3dcd7ded90 Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:24 2020 -0600 sane.ds: Global variable compatibility update for gcc 10. commit 453980e13015e20dd551531be69b3361b63f22b1 Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:21 2020 -0600 gphoto2.ds: Global variable compatibility update for gcc 10. commit bc51c5d589de709e1d393b58b0cc5985c78061ac Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:28 2020 -0600 webservices: Global variable compatibility update for gcc 10. commit cc7f698b8245a48669d248569e7589ff824f2c70 Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:23 2020 -0600 msi: Global variable compatibility update for gcc 10. Thank you, Gerald

4 5

[PATCH 2/3] msasn1: Add ASN1_CreateModule stub implementation
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 4

[PATCH v2 2/3] msasn1: Add ASN1_CreateModule stub implementation
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

based on previous patch from Austin English. https://source.winehq.org/patches/data/115834 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/3] msasn1/tests: Add initial tests
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] include: Add related ASN1encoding_s and ASN1decoding_s structs
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] gdiplus: Include palette when writing PNG indexed formats.
by Jeff Smith 29 Apr '20

29 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/image.c | 32 +++++++++++++++-- dlls/gdiplus/tests/image.c | 70 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f33e2328bf..ace27cd342 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -53,11 +53,11 @@ static const struct WICBitmapPaletteType palette_type; } pixel_formats[] = { - { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, - { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, @@ -126,6 +126,31 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT return palette; } +static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) + return hr; + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + IWICImagingFactory_Release(factory); + if (SUCCEEDED(hr)) + { + hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count); + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette); + + IWICPalette_Release(wic_palette); + } + + return hr; +} + GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) { @@ -4566,6 +4591,9 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) } } + if (SUCCEEDED(hr) && IsIndexedPixelFormat(gdipformat)) + hr = set_palette(frameencode, image->palette); + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 145eadbfd3..56727ce63c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5622,6 +5622,75 @@ static void test_png_color_formats(void) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +static void test_png_save_palette(void) +{ + GpStatus status; + GpBitmap *bitmap; + HGLOBAL hglob; + BOOL result; + IStream *stream; + GUID enc_format, clsid; + LARGE_INTEGER seek; + ULARGE_INTEGER pos; + UINT i, ptr; + BYTE *data; + + PixelFormat formats[] = { + PixelFormat1bppIndexed, + PixelFormat4bppIndexed, + PixelFormat8bppIndexed, + PixelFormat16bppGrayScale, + PixelFormat16bppRGB555, + PixelFormat16bppRGB565, + PixelFormat16bppARGB1555, + PixelFormat24bppRGB, + PixelFormat32bppRGB, + PixelFormat32bppARGB, + PixelFormat32bppPARGB, + }; + + result = get_encoder_clsid(L"image/png", &enc_format, &clsid); + ok(result, "getting PNG encoding clsid failed"); + + hglob = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_ZEROINIT, 1024); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + status = GdipCreateBitmapFromScan0(8, 8, 0, formats[i], NULL, &bitmap); + ok(status == Ok, "Unexpected return value %d creating bitmap for PixelFormat %#x\n", status, formats[i]); + + CreateStreamOnHGlobal(hglob, FALSE, &stream); + status = GdipSaveImageToStream((GpImage *)bitmap, stream, &clsid, NULL); + GdipDisposeImage((GpImage*)bitmap); + + todo_wine_if(formats[i] == PixelFormat16bppGrayScale) + ok(formats[i] == PixelFormat16bppGrayScale ? + (status == GenericError || status == Win32Error) : status == Ok, + "Unexpected return value %d saving image for PixelFormat %#x\n", status, formats[i]); + + if (status == Ok) + { + data = GlobalLock(hglob); + seek.QuadPart = 0; + IStream_Seek(stream, seek, STREAM_SEEK_CUR, &pos); + for (ptr = 0; ptr < pos.QuadPart - 4; ptr++) + if (!memcmp(data + ptr, "PLTE", 4)) + break; + memset(data, 0, 1024); + GlobalUnlock(hglob); + + if (IsIndexedPixelFormat(formats[i])) + ok(ptr < pos.QuadPart - 4, "Expected palette not found for PixelFormat %#x\n", formats[i]); + else + ok(ptr >= pos.QuadPart - 4, "Unexpected palette found for PixelFormat %#x\n", formats[i]); + } + + IStream_Release(stream); + } + + GlobalFree(hglob); +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -5865,6 +5934,7 @@ START_TEST(image) test_GdipInitializePalette(); test_png_color_formats(); + test_png_save_palette(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); -- 2.23.0

2 4

[PATCH v2 1/3] server: Abort waiting on a completion port when closing it.
by Alexey Prokhin 29 Apr '20

29 Apr '20

Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: Update kernelbase patch. Supersedes 184510 --- server/completion.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/server/completion.c b/server/completion.c index db04727b93..9e15c1ca07 100644 --- a/server/completion.c +++ b/server/completion.c @@ -48,12 +48,14 @@ struct completion struct object obj; struct list queue; unsigned int depth; + int abandoned; }; static void completion_dump( struct object*, int ); static struct object_type *completion_get_type( struct object *obj ); static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int completion_map_access( struct object *obj, unsigned int access ); +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -75,7 +77,7 @@ static const struct object_ops completion_ops = default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ + completion_close, /* close_handle */ completion_destroy /* destroy */ }; @@ -88,6 +90,22 @@ struct comp_msg unsigned int status; }; +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct completion *completion = (struct completion *) obj; + struct wait_queue_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &obj->wait_queue, struct wait_queue_entry, entry ) + { + make_wait_abandoned( entry ); + } + + completion->abandoned = 1; + wake_up( &completion->obj, 0 ); + + return 1; +} + static void completion_destroy( struct object *obj) { struct completion *completion = (struct completion *) obj; @@ -118,7 +136,7 @@ static int completion_signaled( struct object *obj, struct wait_queue_entry *ent { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + return !list_empty( &completion->queue ) || completion->abandoned; } static unsigned int completion_map_access( struct object *obj, unsigned int access ) @@ -141,6 +159,7 @@ static struct completion *create_completion( struct object *root, const struct u if (get_error() != STATUS_OBJECT_NAME_EXISTS) { list_init( &completion->queue ); + completion->abandoned = 0; completion->depth = 0; } } @@ -224,7 +243,7 @@ DECL_HANDLER(remove_completion) entry = list_head( &completion->queue ); if (!entry) - set_error( STATUS_PENDING ); + set_error( completion->abandoned ? STATUS_ABANDONED_WAIT_0 : STATUS_PENDING ); else { list_remove( entry ); -- 2.26.2

1 1

[PATCH] gdiplus/tests: Indicate which encoder failed when attempting to save image.
by Jeff Smith 29 Apr '20

29 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/image.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9a62cd505e..f63346e1db 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5106,22 +5106,17 @@ static void test_CloneBitmapArea(void) static void test_supported_encoders(void) { - static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; - static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; - static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; - static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; - static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; static const struct test_data { LPCWSTR mime; const GUID *format; } td[] = { - { bmp_mimetype, &ImageFormatBMP }, - { jpeg_mimetype, &ImageFormatJPEG }, - { gif_mimetype, &ImageFormatGIF }, - { tiff_mimetype, &ImageFormatTIFF }, - { png_mimetype, &ImageFormatPNG } + { L"image/bmp", &ImageFormatBMP }, + { L"image/jpeg", &ImageFormatJPEG }, + { L"image/gif", &ImageFormatGIF }, + { L"image/tiff", &ImageFormatTIFF }, + { L"image/png", &ImageFormatPNG } }; GUID format, clsid; BOOL ret; @@ -5147,7 +5142,7 @@ static void test_supported_encoders(void) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); - ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + ok(status == Ok, "%s encoder, GdipSaveImageToStream error %d\n", wine_dbgstr_w(td[i].mime), status); IStream_Release(stream); } -- 2.23.0

2 1

[PATCH v2 2/3] kernelbase: Set the proper error code in GetQueuedCompletionStatus{Ex} when the handle is closed.
by Alexey Prokhin 29 Apr '20

29 Apr '20

Planet Zoo relies on it being ERROR_ABANDONED_WAIT_0. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: ERROR_WAIT_NO_CHILDREN -> STATUS_ABANDONED_WAIT_0. Supersedes 184511 --- dlls/kernelbase/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index c0db4679e9..ca8bb691cc 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -959,6 +959,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatus( HANDLE port, LPDWORD co } if (status == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); + else if (status == STATUS_ABANDONED_WAIT_0) SetLastError( ERROR_ABANDONED_WAIT_0 ); else SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } @@ -980,6 +981,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatusEx( HANDLE port, OVERLAPP if (ret == STATUS_SUCCESS) return TRUE; else if (ret == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); else if (ret == STATUS_USER_APC) SetLastError( WAIT_IO_COMPLETION ); + else if (ret == STATUS_ABANDONED_WAIT_0) SetLastError( ERROR_ABANDONED_WAIT_0 ); else SetLastError( RtlNtStatusToDosError(ret) ); return FALSE; } -- 2.26.2

1 0

[PATCH] devenum: Use free for memory allocated with wcsdup.
by Rémi Bernon 29 Apr '20

29 Apr '20

The memory is otherwise released to the process heap, although msvcrt allocated it from its internal heap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index c0006ad53efa..9176d8470dbf 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -323,7 +323,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + free(This->name); free(This); DEVENUM_UnlockModule(); } -- 2.26.1

2 1

[PATCH v2] include: Add IWbemRefresher related interfaces
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49044 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] include: Add IWbemRefresher related interfaces
by Vijay Kiran Kamuju 29 Apr '20

29 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49044 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/3] server: Abort waiting on a completion port when closing it.
by Alexey Prokhin 29 Apr '20

29 Apr '20

Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- server/completion.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/server/completion.c b/server/completion.c index db04727b93..9e15c1ca07 100644 --- a/server/completion.c +++ b/server/completion.c @@ -48,12 +48,14 @@ struct completion struct object obj; struct list queue; unsigned int depth; + int abandoned; }; static void completion_dump( struct object*, int ); static struct object_type *completion_get_type( struct object *obj ); static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int completion_map_access( struct object *obj, unsigned int access ); +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -75,7 +77,7 @@ static const struct object_ops completion_ops = default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ + completion_close, /* close_handle */ completion_destroy /* destroy */ }; @@ -88,6 +90,22 @@ struct comp_msg unsigned int status; }; +static int completion_close( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct completion *completion = (struct completion *) obj; + struct wait_queue_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &obj->wait_queue, struct wait_queue_entry, entry ) + { + make_wait_abandoned( entry ); + } + + completion->abandoned = 1; + wake_up( &completion->obj, 0 ); + + return 1; +} + static void completion_destroy( struct object *obj) { struct completion *completion = (struct completion *) obj; @@ -118,7 +136,7 @@ static int completion_signaled( struct object *obj, struct wait_queue_entry *ent { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + return !list_empty( &completion->queue ) || completion->abandoned; } static unsigned int completion_map_access( struct object *obj, unsigned int access ) @@ -141,6 +159,7 @@ static struct completion *create_completion( struct object *root, const struct u if (get_error() != STATUS_OBJECT_NAME_EXISTS) { list_init( &completion->queue ); + completion->abandoned = 0; completion->depth = 0; } } @@ -224,7 +243,7 @@ DECL_HANDLER(remove_completion) entry = list_head( &completion->queue ); if (!entry) - set_error( STATUS_PENDING ); + set_error( completion->abandoned ? STATUS_ABANDONED_WAIT_0 : STATUS_PENDING ); else { list_remove( entry ); -- 2.26.2

2 3

[PATCH rebase 1/2] winemenubuilder: Blacklist desktop integration for certain associations
by Alex Henrie 29 Apr '20

29 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/mshtml.inf | 6 +++ loader/wine.inf.in | 10 ++++ programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++--- 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444f..548739f432 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -111,6 +111,7 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.gif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; GZIP HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" @@ -158,6 +159,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpe,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPEG HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" @@ -173,6 +175,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpeg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPG HKCR,".jpg",,2,"jpegfile" @@ -184,6 +187,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" @@ -221,6 +225,7 @@ HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jfif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" @@ -234,6 +239,7 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.png,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e602546da8..5a229312ab 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -501,6 +501,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.ini,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.pdf,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.rtf,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.txt,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.url,"ieframe",,"rundll32.exe ieframe.dll,OpenURL %l" +HKCU,Software\Wine\FileOpenBlacklist\.wri,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.xml,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e2923..64e1dbdf20 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_hard_blacklisted(const WCHAR *extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2484,6 +2484,42 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static BOOL is_soft_blacklisted(const WCHAR *extension, const WCHAR *command) +{ + static const WCHAR FileOpenBlacklistW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'F','i','l','e','O','p','e','n','B','l','a','c','k','l','i','s','t','\\',0}; + WCHAR blacklist_key_path[MAX_PATH]; + HKEY blacklist_key; + WCHAR program_name[MAX_PATH], *blacklisted_command; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (ARRAY_SIZE(FileOpenBlacklistW) + lstrlenW(extension) > ARRAY_SIZE(blacklist_key_path)) + return FALSE; + + lstrcpyW(blacklist_key_path, FileOpenBlacklistW); + lstrcatW(blacklist_key_path, extension); + + if (RegOpenKeyExW(HKEY_CURRENT_USER, blacklist_key_path, 0, KEY_QUERY_VALUE, &blacklist_key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(blacklist_key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + blacklisted_command = reg_get_valW(HKEY_CURRENT_USER, blacklist_key_path, program_name); + if (strcmpW(command, blacklisted_command) == 0) + { + RegCloseKey(blacklist_key); + return TRUE; + } + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(blacklist_key); + return FALSE; +} + static const char* get_special_mime_type(LPCWSTR extension) { static const WCHAR lnkW[] = {'.','l','n','k',0}; @@ -2564,7 +2600,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_hard_blacklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; @@ -2582,6 +2618,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *progIdA = NULL; char *mimeProgId = NULL; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (is_soft_blacklisted(extensionW, commandW)) + /* command is on the blacklist => desktop integration is not desirable */ + goto end; + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { @@ -2650,11 +2695,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); -- 2.26.2

1 1

[PATCH] advapi32: Move service functions into sechost.
by Zebediah Figura 29 Apr '20

29 Apr '20

Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 70 +- dlls/advapi32/service.c | 2370 +------------------------ dlls/sechost/Makefile.in | 5 + dlls/sechost/sechost.spec | 70 +- dlls/sechost/service.c | 1969 ++++++++++++++++++++ dlls/{advapi32 => sechost}/svcctl.idl | 0 7 files changed, 2089 insertions(+), 2396 deletions(-) create mode 100644 dlls/sechost/service.c rename dlls/{advapi32 => sechost}/svcctl.idl (100%) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 33dbe851c9f..e70b1a7a07a 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -19,6 +19,5 @@ C_SRCS = \ service.c \ wmi.c -IDL_SRCS = svcctl.idl RC_SRCS = version.rc diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cb3e856ce98..cd4dedac74d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -89,10 +89,10 @@ @ stdcall BuildTrusteeWithSidA(ptr ptr) @ stdcall BuildTrusteeWithSidW(ptr ptr) # @ stub CancelOverlappedAccess -@ stdcall ChangeServiceConfig2A(long long ptr) -@ stdcall ChangeServiceConfig2W(long long ptr) -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) -@ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) +@ stdcall -import ChangeServiceConfig2A(long long ptr) +@ stdcall -import ChangeServiceConfig2W(long long ptr) +@ stdcall -import ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall -import ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @ stdcall ClearEventLogA (long str) @@ -100,12 +100,12 @@ # @ stub CloseCodeAuthzLevel @ stdcall CloseEncryptedFileRaw(ptr) @ stdcall CloseEventLog (long) -@ stdcall CloseServiceHandle(long) +@ stdcall -import CloseServiceHandle(long) # @ stub CloseThreadWaitChainSession @ stdcall -import CloseTrace(int64) @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel -@ stdcall ControlService(long long ptr) +@ stdcall -import ControlService(long long ptr) # @ stub ControlServiceExA # @ stub ControlServiceExW @ stdcall -import ControlTraceA(int64 str ptr long) @@ -143,8 +143,8 @@ @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateProcessWithTokenW(long long wstr wstr long ptr wstr ptr ptr) @ stdcall -import CreateRestrictedToken(long long long ptr long ptr long ptr ptr) -@ stdcall CreateServiceA(long str str long long long long str str ptr str str str) -@ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) +@ stdcall -import CreateServiceA(long str str long long long long str str ptr str str str) +@ stdcall -import CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) # @ stub CreateTraceInstanceId @ stdcall -import CreateWellKnownSid(long ptr ptr ptr) # @ stub CredBackupCredentials @@ -235,7 +235,7 @@ @ stdcall DecryptFileA(str long) @ stdcall DecryptFileW(wstr long) @ stdcall -import DeleteAce(ptr long) -@ stdcall DeleteService(long) +@ stdcall -import DeleteService(long) @ stdcall DeregisterEventSource(long) @ stdcall -import DestroyPrivateObjectSecurity(ptr) # @ stub DuplicateEncryptionInfoFile @@ -271,13 +271,13 @@ # @ stub EncryptedFileKeyInfo # @ stub EncryptionDisable @ stdcall EnumDependentServicesA(long long ptr long ptr ptr) -@ stdcall EnumDependentServicesW(long long ptr long ptr ptr) +@ stdcall -import EnumDependentServicesW(long long ptr long ptr ptr) @ stdcall -import EnumDynamicTimeZoneInformation(long ptr) @ stub EnumServiceGroupA @ stub EnumServiceGroupW @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) -@ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) +@ stdcall -import EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) @ stdcall EnumerateTraceGuids(ptr long ptr) # @ stub EnumerateTraceGuidsEx @@ -361,9 +361,9 @@ @ stdcall GetSecurityInfoExA (long long long str str ptr ptr ptr ptr) @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) -@ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) +@ stdcall -import GetServiceDisplayNameW(ptr wstr ptr ptr) @ stdcall GetServiceKeyNameA(long str ptr ptr) -@ stdcall GetServiceKeyNameW(long wstr ptr ptr) +@ stdcall -import GetServiceKeyNameW(long wstr ptr ptr) @ stdcall -import GetSidIdentifierAuthority(ptr) @ stdcall -import GetSidLengthRequired(long) @ stdcall -import GetSidSubAuthority(ptr long) @@ -526,7 +526,7 @@ @ stdcall NotifyChangeEventLog (long long) # @ stub NotifyServiceStatusChange # @ stub NotifyServiceStatusChangeA -@ stdcall NotifyServiceStatusChangeW(ptr long ptr) +@ stdcall -import NotifyServiceStatusChangeW(ptr long ptr) # @ stub NpGetUserName @ stdcall ObjectCloseAuditAlarmA(str ptr long) @ stdcall -import ObjectCloseAuditAlarmW(wstr ptr long) @@ -543,10 +543,10 @@ @ stdcall OpenEventLogA (str str) @ stdcall OpenEventLogW (wstr wstr) @ stdcall -import OpenProcessToken(long long ptr) -@ stdcall OpenSCManagerA(str str long) -@ stdcall OpenSCManagerW(wstr wstr long) -@ stdcall OpenServiceA(long str long) -@ stdcall OpenServiceW(long wstr long) +@ stdcall -import OpenSCManagerA(str str long) +@ stdcall -import OpenSCManagerW(wstr wstr long) +@ stdcall -import OpenServiceA(long str long) +@ stdcall -import OpenServiceW(long wstr long) @ stdcall -import OpenThreadToken(long long long ptr) # @ stub OpenThreadWaitChainSession @ stdcall -ret64 OpenTraceA(ptr) @@ -593,16 +593,16 @@ # @ stub QueryLocalUserServiceName # @ stub QueryRecoveryAgentsOnEncryptedFile # @ stub QuerySecurityAccessMask -@ stdcall QueryServiceConfig2A(long long ptr long ptr) -@ stdcall QueryServiceConfig2W(long long ptr long ptr) -@ stdcall QueryServiceConfigA(long ptr long ptr) -@ stdcall QueryServiceConfigW(long ptr long ptr) +@ stdcall -import QueryServiceConfig2A(long long ptr long ptr) +@ stdcall -import QueryServiceConfig2W(long long ptr long ptr) +@ stdcall -import QueryServiceConfigA(long ptr long ptr) +@ stdcall -import QueryServiceConfigW(long ptr long ptr) # @ stub QueryServiceDynamicInformation @ stdcall QueryServiceLockStatusA(long ptr long ptr) @ stdcall QueryServiceLockStatusW(long ptr long ptr) -@ stdcall QueryServiceObjectSecurity(long long ptr long ptr) -@ stdcall QueryServiceStatus(long ptr) -@ stdcall QueryServiceStatusEx (long long ptr long ptr) +@ stdcall -import QueryServiceObjectSecurity(long long ptr long ptr) +@ stdcall -import QueryServiceStatus(long ptr) +@ stdcall -import QueryServiceStatusEx (long long ptr long ptr) # @ stub QueryTraceA @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUserServiceName @@ -697,10 +697,10 @@ @ stdcall RegisterEventSourceA(str str) @ stdcall RegisterEventSourceW(wstr wstr) # @ stub RegisterIdleTask -@ stdcall RegisterServiceCtrlHandlerA(str ptr) -@ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) -@ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) -@ stdcall RegisterServiceCtrlHandlerW(wstr ptr) +@ stdcall -import RegisterServiceCtrlHandlerA(str ptr) +@ stdcall -import RegisterServiceCtrlHandlerExA(str ptr ptr) +@ stdcall -import RegisterServiceCtrlHandlerExW(wstr ptr ptr) +@ stdcall -import RegisterServiceCtrlHandlerW(wstr ptr) @ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA @ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW @ stdcall RegisterWaitChainCOMCallback(ptr ptr) @@ -761,17 +761,17 @@ # @ stub SetSecurityInfoExA # @ stub SetSecurityInfoExW @ stdcall SetServiceBits(long long long long) -@ stdcall SetServiceObjectSecurity(long long ptr) -@ stdcall SetServiceStatus(long ptr) +@ stdcall -import SetServiceObjectSecurity(long long ptr) +@ stdcall -import SetServiceStatus(long ptr) @ stdcall -import SetThreadToken(ptr ptr) @ stdcall -import SetTokenInformation(long long ptr long) # @ stub SetTraceCallback # @ stub SetUserFileEncryptionKey # @ stub SetUserFileEncryptionKeyEx -@ stdcall StartServiceA(long long ptr) -@ stdcall StartServiceCtrlDispatcherA(ptr) -@ stdcall StartServiceCtrlDispatcherW(ptr) -@ stdcall StartServiceW(long long ptr) +@ stdcall -import StartServiceA(long long ptr) +@ stdcall -import StartServiceCtrlDispatcherA(ptr) +@ stdcall -import StartServiceCtrlDispatcherW(ptr) +@ stdcall -import StartServiceW(long long ptr) @ stdcall -import StartTraceA(ptr str ptr) @ stdcall -import StartTraceW(ptr wstr ptr) @ stdcall StopTraceA(int64 str ptr) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index eb195d84d05..2146ddfb186 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -20,1661 +20,34 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <string.h> -#include <time.h> -#include <assert.h> - -#define NONAMELESSUNION - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winsvc.h" -#include "winerror.h" -#include "winreg.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winternl.h" -#include "lmcons.h" -#include "lmserver.h" - -#include "svcctl.h" - -#include "advapi32_misc.h" - -#include "wine/exception.h" -#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(service); - -void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) -{ - return heap_alloc(len); -} - -void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) -{ - heap_free(ptr); -} - -typedef struct service_data_t -{ - LPHANDLER_FUNCTION_EX handler; - LPVOID context; - HANDLE thread; - SC_HANDLE handle; - SC_HANDLE full_access_handle; - BOOL unicode : 1; - union { - LPSERVICE_MAIN_FUNCTIONA a; - LPSERVICE_MAIN_FUNCTIONW w; - } proc; - LPWSTR args; - WCHAR name[1]; -} service_data; - -typedef struct dispatcher_data_t -{ - SC_HANDLE manager; - HANDLE pipe; -} dispatcher_data; - -typedef struct notify_data_t { - SC_HANDLE service; - SC_RPC_NOTIFY_PARAMS params; - SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 cparams; - SC_NOTIFY_RPC_HANDLE notify_handle; - SERVICE_NOTIFYW *notify_buffer; - HANDLE calling_thread, ready_evt; - struct list entry; -} notify_data; - -static struct list notify_list = LIST_INIT(notify_list); - -static CRITICAL_SECTION service_cs; -static CRITICAL_SECTION_DEBUG service_cs_debug = -{ - 0, 0, &service_cs, - { &service_cs_debug.ProcessLocksList, - &service_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": service_cs") } -}; -static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; - -static service_data **services; -static unsigned int nb_services; -static HANDLE service_event; -static BOOL stop_service; - -extern HANDLE CDECL __wine_make_process_system(void); - -static inline LPWSTR SERV_dupmulti(LPCSTR str) -{ - UINT len = 0, n = 0; - LPWSTR wstr; - - if( !str ) - return NULL; - do { - len += MultiByteToWideChar( CP_ACP, 0, &str[n], -1, NULL, 0 ); - n += (strlen( &str[n] ) + 1); - } while (str[n]); - len++; - n++; - - wstr = heap_alloc( len*sizeof (WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, str, n, wstr, len ); - return wstr; -} - -static inline DWORD multisz_cb(LPCWSTR wmultisz) -{ - const WCHAR *wptr = wmultisz; - - if (wmultisz == NULL) - return 0; - - while (*wptr) - wptr += lstrlenW(wptr)+1; - return (wptr - wmultisz + 1)*sizeof(WCHAR); -} - -/****************************************************************************** - * RPC connection with services.exe - */ -static handle_t rpc_wstr_bind(RPC_WSTR str) -{ - WCHAR transport[] = SVCCTL_TRANSPORT; - WCHAR endpoint[] = SVCCTL_ENDPOINT; - RPC_WSTR binding_str; - RPC_STATUS status; - handle_t rpc_handle; - - status = RpcStringBindingComposeW(NULL, transport, str, endpoint, NULL, &binding_str); - if (status != RPC_S_OK) - { - ERR("RpcStringBindingComposeW failed (%d)\n", (DWORD)status); - return NULL; - } - - status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - RpcStringFreeW(&binding_str); - - if (status != RPC_S_OK) - { - ERR("Couldn't connect to services.exe: error code %u\n", (DWORD)status); - return NULL; - } - - return rpc_handle; -} - -static handle_t rpc_cstr_bind(RPC_CSTR str) -{ - RPC_CSTR transport = (RPC_CSTR)SVCCTL_TRANSPORTA; - RPC_CSTR endpoint = (RPC_CSTR)SVCCTL_ENDPOINTA; - RPC_CSTR binding_str; - RPC_STATUS status; - handle_t rpc_handle; - - status = RpcStringBindingComposeA(NULL, transport, str, endpoint, NULL, &binding_str); - if (status != RPC_S_OK) - { - ERR("RpcStringBindingComposeW failed (%d)\n", (DWORD)status); - return NULL; - } - - status = RpcBindingFromStringBindingA(binding_str, &rpc_handle); - RpcStringFreeA(&binding_str); - - if (status != RPC_S_OK) - { - ERR("Couldn't connect to services.exe: error code %u\n", (DWORD)status); - return NULL; - } - - return rpc_handle; -} - -DECLSPEC_HIDDEN handle_t __RPC_USER MACHINE_HANDLEA_bind(MACHINE_HANDLEA MachineName) -{ - return rpc_cstr_bind((RPC_CSTR)MachineName); -} - -DECLSPEC_HIDDEN void __RPC_USER MACHINE_HANDLEA_unbind(MACHINE_HANDLEA MachineName, handle_t h) -{ - RpcBindingFree(&h); -} - -DECLSPEC_HIDDEN handle_t __RPC_USER MACHINE_HANDLEW_bind(MACHINE_HANDLEW MachineName) -{ - return rpc_wstr_bind((RPC_WSTR)MachineName); -} - -DECLSPEC_HIDDEN void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) -{ - RpcBindingFree(&h); -} - -DECLSPEC_HIDDEN handle_t __RPC_USER SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW MachineName) -{ - return rpc_wstr_bind((RPC_WSTR)MachineName); -} - -DECLSPEC_HIDDEN void __RPC_USER SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW MachineName, handle_t h) -{ - RpcBindingFree(&h); -} - -static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) -{ - return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); -} - -static DWORD map_exception_code(DWORD exception_code) -{ - switch (exception_code) - { - case RPC_X_NULL_REF_POINTER: - return ERROR_INVALID_ADDRESS; - case RPC_X_ENUM_VALUE_OUT_OF_RANGE: - case RPC_X_BYTE_COUNT_TOO_SMALL: - return ERROR_INVALID_PARAMETER; - case RPC_S_INVALID_BINDING: - case RPC_X_SS_IN_NULL_CONTEXT: - return ERROR_INVALID_HANDLE; - default: - return exception_code; - } -} - -/****************************************************************************** - * Service IPC functions - */ -static LPWSTR service_get_pipe_name(void) -{ - static const WCHAR format[] = { '\\','\\','.','\\','p','i','p','e','\\', - 'n','e','t','\\','N','t','C','o','n','t','r','o','l','P','i','p','e','%','u',0}; - static const WCHAR service_current_key_str[] = { 'S','Y','S','T','E','M','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0}; - LPWSTR name; - DWORD len; - HKEY service_current_key; - DWORD service_current; - LONG ret; - DWORD type; - - ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0, - KEY_QUERY_VALUE, &service_current_key); - if (ret != ERROR_SUCCESS) - return NULL; - len = sizeof(service_current); - ret = RegQueryValueExW(service_current_key, NULL, NULL, &type, - (BYTE *)&service_current, &len); - RegCloseKey(service_current_key); - if (ret != ERROR_SUCCESS || type != REG_DWORD) - return NULL; - len = ARRAY_SIZE(format) + 10 /* strlenW("4294967295") */; - name = heap_alloc(len * sizeof(WCHAR)); - if (!name) - return NULL; - snprintfW(name, len, format, service_current); - return name; -} - -static HANDLE service_open_pipe(void) -{ - LPWSTR szPipe = service_get_pipe_name(); - HANDLE handle = INVALID_HANDLE_VALUE; - - do { - handle = CreateFileW(szPipe, GENERIC_READ|GENERIC_WRITE, - 0, NULL, OPEN_ALWAYS, 0, NULL); - if (handle != INVALID_HANDLE_VALUE) - break; - if (GetLastError() != ERROR_PIPE_BUSY) - break; - } while (WaitNamedPipeW(szPipe, NMPWAIT_USE_DEFAULT_WAIT)); - heap_free(szPipe); - - return handle; -} - -static service_data *find_service_by_name( const WCHAR *name ) -{ - unsigned int i; - - if (nb_services == 1) /* only one service (FIXME: should depend on OWN_PROCESS etc.) */ - return services[0]; - for (i = 0; i < nb_services; i++) - if (!strcmpiW( name, services[i]->name )) return services[i]; - return NULL; -} - -/****************************************************************************** - * service_thread - * - * Call into the main service routine provided by StartServiceCtrlDispatcher. - */ -static DWORD WINAPI service_thread(LPVOID arg) -{ - service_data *info = arg; - LPWSTR str = info->args; - DWORD argc = 0, len = 0; - - TRACE("%p\n", arg); - - while (str[len]) - { - len += strlenW(&str[len]) + 1; - argc++; - } - len++; - - if (info->unicode) - { - LPWSTR *argv, p; - - argv = heap_alloc((argc+1)*sizeof(LPWSTR)); - for (argc=0, p=str; *p; p += strlenW(p) + 1) - argv[argc++] = p; - argv[argc] = NULL; - - info->proc.w(argc, argv); - heap_free(argv); - } - else - { - LPSTR strA, *argv, p; - DWORD lenA; - - lenA = WideCharToMultiByte(CP_ACP,0, str, len, NULL, 0, NULL, NULL); - strA = heap_alloc(lenA); - WideCharToMultiByte(CP_ACP,0, str, len, strA, lenA, NULL, NULL); - - argv = heap_alloc((argc+1)*sizeof(LPSTR)); - for (argc=0, p=strA; *p; p += strlen(p) + 1) - argv[argc++] = p; - argv[argc] = NULL; - - info->proc.a(argc, argv); - heap_free(argv); - heap_free(strA); - } - return 0; -} - -/****************************************************************************** - * service_handle_start - */ -static DWORD service_handle_start(service_data *service, const void *data, DWORD data_size) -{ - DWORD count = data_size / sizeof(WCHAR); - - if (service->thread) - { - WARN("service is not stopped\n"); - return ERROR_SERVICE_ALREADY_RUNNING; - } - - heap_free(service->args); - service->args = heap_alloc((count + 2) * sizeof(WCHAR)); - if (count) memcpy( service->args, data, count * sizeof(WCHAR) ); - service->args[count++] = 0; - service->args[count++] = 0; - - service->thread = CreateThread( NULL, 0, service_thread, - service, 0, NULL ); - SetEvent( service_event ); /* notify the main loop */ - return 0; -} - -/****************************************************************************** - * service_handle_control - */ -static DWORD service_handle_control(service_data *service, DWORD control, const void *data, DWORD data_size) -{ - DWORD ret = ERROR_INVALID_SERVICE_CONTROL; - - TRACE("%s control %u data %p data_size %u\n", debugstr_w(service->name), control, data, data_size); - - if (control == SERVICE_CONTROL_START) - ret = service_handle_start(service, data, data_size); - else if (service->handler) - ret = service->handler(control, 0, (void *)data, service->context); - return ret; -} - -/****************************************************************************** - * service_control_dispatcher - */ -static DWORD WINAPI service_control_dispatcher(LPVOID arg) -{ - dispatcher_data *disp = arg; - - /* dispatcher loop */ - while (1) - { - service_data *service; - service_start_info info; - BYTE *data = NULL; - WCHAR *name; - BOOL r; - DWORD data_size = 0, count, result; - - r = ReadFile( disp->pipe, &info, FIELD_OFFSET(service_start_info,data), &count, NULL ); - if (!r) - { - if (GetLastError() != ERROR_BROKEN_PIPE) - ERR( "pipe read failed error %u\n", GetLastError() ); - break; - } - if (count != FIELD_OFFSET(service_start_info,data)) - { - ERR( "partial pipe read %u\n", count ); - break; - } - if (count < info.total_size) - { - data_size = info.total_size - FIELD_OFFSET(service_start_info,data); - data = heap_alloc( data_size ); - r = ReadFile( disp->pipe, data, data_size, &count, NULL ); - if (!r) - { - if (GetLastError() != ERROR_BROKEN_PIPE) - ERR( "pipe read failed error %u\n", GetLastError() ); - heap_free( data ); - break; - } - if (count != data_size) - { - ERR( "partial pipe read %u/%u\n", count, data_size ); - heap_free( data ); - break; - } - } - - EnterCriticalSection( &service_cs ); - - /* validate service name */ - name = (WCHAR *)data; - if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) - { - ERR( "got request without valid service name\n" ); - result = ERROR_INVALID_PARAMETER; - goto done; - } - - if (info.magic != SERVICE_PROTOCOL_MAGIC) - { - ERR( "received invalid request for service %s\n", debugstr_w(name) ); - result = ERROR_INVALID_PARAMETER; - goto done; - } - - /* find the service */ - if (!(service = find_service_by_name( name ))) - { - FIXME( "got request for unknown service %s\n", debugstr_w(name) ); - result = ERROR_INVALID_PARAMETER; - goto done; - } - - if (!service->handle) - { - if (!(service->handle = OpenServiceW( disp->manager, name, SERVICE_SET_STATUS )) || - !(service->full_access_handle = OpenServiceW( disp->manager, name, - GENERIC_READ|GENERIC_WRITE ))) - FIXME( "failed to open service %s\n", debugstr_w(name) ); - } - - data_size -= info.name_size * sizeof(WCHAR); - result = service_handle_control(service, info.control, data_size ? - &data[info.name_size * sizeof(WCHAR)] : NULL, data_size); - - done: - LeaveCriticalSection( &service_cs ); - WriteFile( disp->pipe, &result, sizeof(result), &count, NULL ); - heap_free( data ); - } - - CloseHandle( disp->pipe ); - CloseServiceHandle( disp->manager ); - heap_free( disp ); - return 1; -} - -/* wait for services which accept this type of message to become STOPPED */ -static void handle_shutdown_msg(DWORD msg, DWORD accept) -{ - SERVICE_STATUS st; - SERVICE_PRESHUTDOWN_INFO spi; - DWORD i, n = 0, sz, timeout = 2000; - ULONGLONG stop_time; - BOOL res, done = TRUE; - SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); - - EnterCriticalSection( &service_cs ); - for (i = 0; i < nb_services; i++) - { - res = QueryServiceStatus( services[i]->full_access_handle, &st ); - if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) - continue; - - done = FALSE; - - if (accept == SERVICE_ACCEPT_PRESHUTDOWN) - { - res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, - (LPBYTE)&spi, sizeof(spi), &sz ); - if (res) - { - FIXME( "service should be able to delay shutdown\n" ); - timeout = max( spi.dwPreshutdownTimeout, timeout ); - } - } - - service_handle_control( services[i], msg, NULL, 0 ); - wait_handles[n++] = services[i]->full_access_handle; - } - LeaveCriticalSection( &service_cs ); - - /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ - timeout = min( timeout, 3000 ); - stop_time = GetTickCount64() + timeout; - - while (!done && GetTickCount64() < stop_time) - { - done = TRUE; - for (i = 0; i < n; i++) - { - res = QueryServiceStatus( wait_handles[i], &st ); - if (!res || st.dwCurrentState == SERVICE_STOPPED) - continue; - - done = FALSE; - Sleep( 100 ); - break; - } - } - - HeapFree( GetProcessHeap(), 0, wait_handles ); -} - -/****************************************************************************** - * service_run_main_thread - */ -static BOOL service_run_main_thread(void) -{ - DWORD i, n, ret; - HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; - UINT wait_services[MAXIMUM_WAIT_OBJECTS]; - dispatcher_data *disp = heap_alloc( sizeof(*disp) ); - - disp->manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); - if (!disp->manager) - { - ERR("failed to open service manager error %u\n", GetLastError()); - heap_free( disp ); - return FALSE; - } - - disp->pipe = service_open_pipe(); - if (disp->pipe == INVALID_HANDLE_VALUE) - { - WARN("failed to create control pipe error %u\n", GetLastError()); - CloseServiceHandle( disp->manager ); - heap_free( disp ); - SetLastError( ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ); - return FALSE; - } - - service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - stop_service = FALSE; - - /* FIXME: service_control_dispatcher should be merged into the main thread */ - wait_handles[0] = __wine_make_process_system(); - wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); - wait_handles[2] = service_event; - - TRACE("Starting %d services running as process %d\n", - nb_services, GetCurrentProcessId()); - - /* wait for all the threads to pack up and exit */ - while (!stop_service) - { - EnterCriticalSection( &service_cs ); - for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) - { - if (!services[i]->thread) continue; - wait_services[n] = i; - wait_handles[n++] = services[i]->thread; - } - LeaveCriticalSection( &service_cs ); - - ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); - if (!ret) /* system process event */ - { - handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); - handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); - ExitProcess(0); - } - else if (ret == 1) - { - TRACE( "control dispatcher exited, shutting down\n" ); - /* FIXME: we should maybe send a shutdown control to running services */ - ExitProcess(0); - } - else if (ret == 2) - { - continue; /* rebuild the list */ - } - else if (ret < n) - { - i = wait_services[ret]; - EnterCriticalSection( &service_cs ); - CloseHandle( services[i]->thread ); - services[i]->thread = NULL; - LeaveCriticalSection( &service_cs ); - } - else return FALSE; - } - - return TRUE; -} - -/****************************************************************************** - * StartServiceCtrlDispatcherA [ADVAPI32.@] - * - * See StartServiceCtrlDispatcherW. - */ -BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) -{ - service_data *info; - unsigned int i; - - TRACE("%p\n", servent); - - if (nb_services) - { - SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); - return FALSE; - } - while (servent[nb_services].lpServiceName) nb_services++; - if (!nb_services) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - services = heap_alloc( nb_services * sizeof(*services) ); - - for (i = 0; i < nb_services; i++) - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, servent[i].lpServiceName, -1, NULL, 0); - DWORD sz = FIELD_OFFSET( service_data, name[len] ); - info = heap_alloc_zero( sz ); - MultiByteToWideChar(CP_ACP, 0, servent[i].lpServiceName, -1, info->name, len); - info->proc.a = servent[i].lpServiceProc; - info->unicode = FALSE; - services[i] = info; - } - - return service_run_main_thread(); -} - -/****************************************************************************** - * StartServiceCtrlDispatcherW [ADVAPI32.@] - * - * Connects a process containing one or more services to the service control - * manager. - * - * PARAMS - * servent [I] A list of the service names and service procedures - * - * RETURNS - * Success: TRUE. - * Failure: FALSE. - */ -BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) -{ - service_data *info; - unsigned int i; - - TRACE("%p\n", servent); - - if (nb_services) - { - SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); - return FALSE; - } - while (servent[nb_services].lpServiceName) nb_services++; - if (!nb_services) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - services = heap_alloc( nb_services * sizeof(*services) ); - - for (i = 0; i < nb_services; i++) - { - DWORD len = strlenW(servent[i].lpServiceName) + 1; - DWORD sz = FIELD_OFFSET( service_data, name[len] ); - info = heap_alloc_zero( sz ); - strcpyW(info->name, servent[i].lpServiceName); - info->proc.w = servent[i].lpServiceProc; - info->unicode = TRUE; - services[i] = info; - } - - return service_run_main_thread(); -} - -/****************************************************************************** - * LockServiceDatabase [ADVAPI32.@] - */ -SC_LOCK WINAPI LockServiceDatabase( SC_HANDLE manager ) -{ - /* this function is a no-op in Vista and above */ - TRACE("%p\n", manager); - return (SC_LOCK)0xdeadbeef; -} - -/****************************************************************************** - * UnlockServiceDatabase [ADVAPI32.@] - */ -BOOL WINAPI UnlockServiceDatabase( SC_LOCK lock ) -{ - /* this function is a no-op in Vista and above */ - TRACE("%p\n", lock); - return TRUE; -} - -/****************************************************************************** - * SetServiceStatus [ADVAPI32.@] - * - * PARAMS - * hService [] - * lpStatus [] - */ -BOOL WINAPI -SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) -{ - DWORD err; - - TRACE("%p %x %x %x %x %x %x %x\n", hService, - lpStatus->dwServiceType, lpStatus->dwCurrentState, - lpStatus->dwControlsAccepted, lpStatus->dwWin32ExitCode, - lpStatus->dwServiceSpecificExitCode, lpStatus->dwCheckPoint, - lpStatus->dwWaitHint); - - __TRY - { - err = svcctl_SetServiceStatus( hService, lpStatus ); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - if (err != ERROR_SUCCESS) - { - SetLastError(err); - return FALSE; - } - - if (lpStatus->dwCurrentState == SERVICE_STOPPED) - { - unsigned int i, count = 0; - EnterCriticalSection( &service_cs ); - for (i = 0; i < nb_services; i++) - { - if (services[i]->handle == (SC_HANDLE)hService) continue; - if (services[i]->thread) count++; - } - if (!count) - { - stop_service = TRUE; - SetEvent( service_event ); /* notify the main loop */ - } - LeaveCriticalSection( &service_cs ); - } - - return TRUE; -} - - -/****************************************************************************** - * OpenSCManagerA [ADVAPI32.@] - * - * Establish a connection to the service control manager and open its database. - * - * PARAMS - * lpMachineName [I] Pointer to machine name string - * lpDatabaseName [I] Pointer to database name string - * dwDesiredAccess [I] Type of access - * - * RETURNS - * Success: A Handle to the service control manager database - * Failure: NULL - */ -SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, - DWORD dwDesiredAccess ) -{ - LPWSTR machineW, databaseW; - SC_HANDLE ret; - - machineW = strdupAW(lpMachineName); - databaseW = strdupAW(lpDatabaseName); - ret = OpenSCManagerW(machineW, databaseW, dwDesiredAccess); - heap_free(databaseW); - heap_free(machineW); - return ret; -} - -/****************************************************************************** - * OpenSCManagerW [ADVAPI32.@] - * - * See OpenSCManagerA. - */ -static DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess, SC_HANDLE *handle ) -{ - DWORD r; - - TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), - debugstr_w(lpDatabaseName), dwDesiredAccess); - - __TRY - { - r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); - } - __EXCEPT(rpc_filter) - { - r = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (r!=ERROR_SUCCESS) - *handle = 0; - - TRACE("returning %p\n", *handle); - return r; -} - -SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess ) -{ - SC_HANDLE handle = 0; - DWORD r; - - r = SERV_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &handle); - if (r!=ERROR_SUCCESS) - SetLastError(r); - return handle; -} - -/****************************************************************************** - * ControlService [ADVAPI32.@] - * - * Send a control code to a service. - * - * PARAMS - * hService [I] Handle of the service control manager database - * dwControl [I] Control code to send (SERVICE_CONTROL_* flags from "winsvc.h") - * lpServiceStatus [O] Destination for the status of the service, if available - * - * RETURNS - * Success: TRUE. - * Failure: FALSE. - * - * BUGS - * Unlike M$' implementation, control requests are not serialized and may be - * processed asynchronously. - */ -BOOL WINAPI ControlService( SC_HANDLE hService, DWORD dwControl, - LPSERVICE_STATUS lpServiceStatus ) -{ - DWORD err; - - TRACE("%p %d %p\n", hService, dwControl, lpServiceStatus); - - __TRY - { - err = svcctl_ControlService(hService, dwControl, lpServiceStatus); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - if (err != ERROR_SUCCESS) - { - SetLastError(err); - return FALSE; - } - - return TRUE; -} - -/****************************************************************************** - * CloseServiceHandle [ADVAPI32.@] - * - * Close a handle to a service or the service control manager database. - * - * PARAMS - * hSCObject [I] Handle to service or service control manager database - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI -CloseServiceHandle( SC_HANDLE hSCObject ) -{ - DWORD err; - - TRACE("%p\n", hSCObject); - - __TRY - { - err = svcctl_CloseServiceHandle((SC_RPC_HANDLE *)&hSCObject); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - { - SetLastError(err); - return FALSE; - } - return TRUE; -} - - -/****************************************************************************** - * OpenServiceA [ADVAPI32.@] - * - * Open a handle to a service. - * - * PARAMS - * hSCManager [I] Handle of the service control manager database - * lpServiceName [I] Name of the service to open - * dwDesiredAccess [I] Access required to the service - * - * RETURNS - * Success: Handle to the service - * Failure: NULL - */ -SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, - DWORD dwDesiredAccess ) -{ - LPWSTR lpServiceNameW; - SC_HANDLE ret; - - TRACE("%p %s 0x%08x\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); - - lpServiceNameW = strdupAW(lpServiceName); - ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); - heap_free(lpServiceNameW); - return ret; -} - - -/****************************************************************************** - * OpenServiceW [ADVAPI32.@] - * - * See OpenServiceA. - */ -static DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - DWORD dwDesiredAccess, SC_HANDLE *handle ) -{ - DWORD err; - - TRACE("%p %s 0x%08x\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); - - if (!hSCManager) - return ERROR_INVALID_HANDLE; - - __TRY - { - err = svcctl_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - *handle = 0; - - TRACE("returning %p\n", *handle); - return err; -} - -SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - DWORD dwDesiredAccess) -{ - SC_HANDLE handle = 0; - DWORD err; - - err = SERV_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, &handle); - if (err != ERROR_SUCCESS) - SetLastError(err); - return handle; -} - -/****************************************************************************** - * CreateServiceW [ADVAPI32.@] - */ -SC_HANDLE WINAPI -CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - LPCWSTR lpDisplayName, DWORD dwDesiredAccess, - DWORD dwServiceType, DWORD dwStartType, - DWORD dwErrorControl, LPCWSTR lpBinaryPathName, - LPCWSTR lpLoadOrderGroup, LPDWORD lpdwTagId, - LPCWSTR lpDependencies, LPCWSTR lpServiceStartName, - LPCWSTR lpPassword ) -{ - SC_HANDLE handle = 0; - DWORD err; - SIZE_T passwdlen; - - TRACE("%p %s %s\n", hSCManager, - debugstr_w(lpServiceName), debugstr_w(lpDisplayName)); - - if (!hSCManager) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - - if (lpPassword) - passwdlen = (strlenW(lpPassword) + 1) * sizeof(WCHAR); - else - passwdlen = 0; - - __TRY - { - BOOL is_wow64; - - IsWow64Process(GetCurrentProcess(), &is_wow64); - - if (is_wow64) - err = svcctl_CreateServiceWOW64W(hSCManager, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, - (SC_RPC_HANDLE *)&handle); - else - err = svcctl_CreateServiceW(hSCManager, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, - (SC_RPC_HANDLE *)&handle); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - { - SetLastError(err); - handle = 0; - } - return handle; -} - - -/****************************************************************************** - * CreateServiceA [ADVAPI32.@] - */ -SC_HANDLE WINAPI -CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, - LPCSTR lpDisplayName, DWORD dwDesiredAccess, - DWORD dwServiceType, DWORD dwStartType, - DWORD dwErrorControl, LPCSTR lpBinaryPathName, - LPCSTR lpLoadOrderGroup, LPDWORD lpdwTagId, - LPCSTR lpDependencies, LPCSTR lpServiceStartName, - LPCSTR lpPassword ) -{ - LPWSTR lpServiceNameW, lpDisplayNameW, lpBinaryPathNameW, - lpLoadOrderGroupW, lpDependenciesW, lpServiceStartNameW, lpPasswordW; - SC_HANDLE r; - - TRACE("%p %s %s\n", hSCManager, - debugstr_a(lpServiceName), debugstr_a(lpDisplayName)); - - lpServiceNameW = strdupAW( lpServiceName ); - lpDisplayNameW = strdupAW( lpDisplayName ); - lpBinaryPathNameW = strdupAW( lpBinaryPathName ); - lpLoadOrderGroupW = strdupAW( lpLoadOrderGroup ); - lpDependenciesW = SERV_dupmulti( lpDependencies ); - lpServiceStartNameW = strdupAW( lpServiceStartName ); - lpPasswordW = strdupAW( lpPassword ); - - r = CreateServiceW( hSCManager, lpServiceNameW, lpDisplayNameW, - dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathNameW, lpLoadOrderGroupW, lpdwTagId, - lpDependenciesW, lpServiceStartNameW, lpPasswordW ); - - heap_free( lpServiceNameW ); - heap_free( lpDisplayNameW ); - heap_free( lpBinaryPathNameW ); - heap_free( lpLoadOrderGroupW ); - heap_free( lpDependenciesW ); - heap_free( lpServiceStartNameW ); - heap_free( lpPasswordW ); - - return r; -} - - -/****************************************************************************** - * DeleteService [ADVAPI32.@] - * - * Delete a service from the service control manager database. - * - * PARAMS - * hService [I] Handle of the service to delete - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DeleteService( SC_HANDLE hService ) -{ - DWORD err; - - TRACE("%p\n", hService); - - __TRY - { - err = svcctl_DeleteService(hService); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - if (err != 0) - { - SetLastError(err); - return FALSE; - } - - return TRUE; -} - - -/****************************************************************************** - * StartServiceA [ADVAPI32.@] - * - * Start a service - * - * PARAMS - * hService [I] Handle of service - * dwNumServiceArgs [I] Number of arguments - * lpServiceArgVectors [I] Address of array of argument strings - * - * NOTES - * - NT implements this function using an obscure RPC call. - * - You might need to do a "setenv SystemRoot \\WINNT" in your .cshrc - * to get things like "%SystemRoot%\\System32\\service.exe" to load. - * - This will only work for shared address space. How should the service - * args be transferred when address spaces are separated? - * - Can only start one service at a time. - * - Has no concept of privilege. - * - * RETURNS - * Success: TRUE. - * Failure: FALSE - */ -BOOL WINAPI StartServiceA( SC_HANDLE hService, DWORD dwNumServiceArgs, - LPCSTR *lpServiceArgVectors ) -{ - LPWSTR *lpwstr=NULL; - unsigned int i; - BOOL r; - - TRACE("(%p,%d,%p)\n",hService,dwNumServiceArgs,lpServiceArgVectors); - - if (dwNumServiceArgs) - lpwstr = heap_alloc( dwNumServiceArgs*sizeof(LPWSTR) ); - - for(i=0; i<dwNumServiceArgs; i++) - lpwstr[i]=strdupAW(lpServiceArgVectors[i]); - - r = StartServiceW(hService, dwNumServiceArgs, (LPCWSTR *)lpwstr); - - if (dwNumServiceArgs) - { - for(i=0; i<dwNumServiceArgs; i++) - heap_free(lpwstr[i]); - heap_free(lpwstr); - } - - return r; -} - - -/****************************************************************************** - * StartServiceW [ADVAPI32.@] - * - * See StartServiceA. - */ -BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, - LPCWSTR *lpServiceArgVectors) -{ - DWORD err; - - TRACE("%p %d %p\n", hService, dwNumServiceArgs, lpServiceArgVectors); - - __TRY - { - err = svcctl_StartServiceW(hService, dwNumServiceArgs, lpServiceArgVectors); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - if (err != ERROR_SUCCESS) - { - SetLastError(err); - return FALSE; - } - - return TRUE; -} - -/****************************************************************************** - * QueryServiceStatus [ADVAPI32.@] - * - * PARAMS - * hService [I] Handle to service to get information about - * lpservicestatus [O] buffer to receive the status information for the service - * - */ -BOOL WINAPI QueryServiceStatus(SC_HANDLE hService, - LPSERVICE_STATUS lpservicestatus) -{ - SERVICE_STATUS_PROCESS SvcStatusData; - BOOL ret; - DWORD dummy; - - TRACE("%p %p\n", hService, lpservicestatus); - - if (!hService) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!lpservicestatus) - { - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; - } - - ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&SvcStatusData, - sizeof(SERVICE_STATUS_PROCESS), &dummy); - if (ret) memcpy(lpservicestatus, &SvcStatusData, sizeof(SERVICE_STATUS)) ; - return ret; -} - - -/****************************************************************************** - * QueryServiceStatusEx [ADVAPI32.@] - * - * Get information about a service. - * - * PARAMS - * hService [I] Handle to service to get information about - * InfoLevel [I] Level of information to get - * lpBuffer [O] Destination for requested information - * cbBufSize [I] Size of lpBuffer in bytes - * pcbBytesNeeded [O] Destination for number of bytes needed, if cbBufSize is too small - * - * RETURNS - * Success: TRUE - * FAILURE: FALSE - */ -BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, - LPBYTE lpBuffer, DWORD cbBufSize, - LPDWORD pcbBytesNeeded) -{ - DWORD err; - - TRACE("%p %d %p %d %p\n", hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - - if (InfoLevel != SC_STATUS_PROCESS_INFO) - { - err = ERROR_INVALID_LEVEL; - } - else if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS)) - { - *pcbBytesNeeded = sizeof(SERVICE_STATUS_PROCESS); - err = ERROR_INSUFFICIENT_BUFFER; - } - else - { - __TRY - { - err = svcctl_QueryServiceStatusEx(hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - } - if (err != ERROR_SUCCESS) - { - SetLastError(err); - return FALSE; - } - return TRUE; -} - -/****************************************************************************** - * QueryServiceConfigA [ADVAPI32.@] - */ -BOOL WINAPI QueryServiceConfigA( SC_HANDLE hService, LPQUERY_SERVICE_CONFIGA config, - DWORD size, LPDWORD needed ) -{ - DWORD n; - LPSTR p, buffer; - BOOL ret; - QUERY_SERVICE_CONFIGW *configW; - - TRACE("%p %p %d %p\n", hService, config, size, needed); - - if (!(buffer = heap_alloc( 2 * size ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - configW = (QUERY_SERVICE_CONFIGW *)buffer; - ret = QueryServiceConfigW( hService, configW, 2 * size, needed ); - if (!ret) goto done; - - config->dwServiceType = configW->dwServiceType; - config->dwStartType = configW->dwStartType; - config->dwErrorControl = configW->dwErrorControl; - config->lpBinaryPathName = NULL; - config->lpLoadOrderGroup = NULL; - config->dwTagId = configW->dwTagId; - config->lpDependencies = NULL; - config->lpServiceStartName = NULL; - config->lpDisplayName = NULL; - - p = (LPSTR)(config + 1); - n = size - sizeof(*config); - ret = FALSE; - -#define MAP_STR(str) \ - do { \ - if (configW->str) \ - { \ - DWORD sz = WideCharToMultiByte( CP_ACP, 0, configW->str, -1, p, n, NULL, NULL ); \ - if (!sz) goto done; \ - config->str = p; \ - p += sz; \ - n -= sz; \ - } \ - } while (0) - - MAP_STR( lpBinaryPathName ); - MAP_STR( lpLoadOrderGroup ); - MAP_STR( lpDependencies ); - MAP_STR( lpServiceStartName ); - MAP_STR( lpDisplayName ); -#undef MAP_STR - - *needed = p - (LPSTR)config; - ret = TRUE; - -done: - heap_free( buffer ); - return ret; -} - -static DWORD move_string_to_buffer(BYTE **buf, LPWSTR *string_ptr) -{ - DWORD cb; - - if (!*string_ptr) - { - cb = sizeof(WCHAR); - memset(*buf, 0, cb); - } - else - { - cb = (strlenW(*string_ptr) + 1)*sizeof(WCHAR); - memcpy(*buf, *string_ptr, cb); - MIDL_user_free(*string_ptr); - } - - *string_ptr = (LPWSTR)*buf; - *buf += cb; - - return cb; -} - -static DWORD size_string(LPCWSTR string) -{ - return (string ? (strlenW(string) + 1)*sizeof(WCHAR) : sizeof(WCHAR)); -} - -/****************************************************************************** - * QueryServiceConfigW [ADVAPI32.@] - */ -BOOL WINAPI -QueryServiceConfigW( SC_HANDLE hService, - LPQUERY_SERVICE_CONFIGW lpServiceConfig, - DWORD cbBufSize, LPDWORD pcbBytesNeeded) -{ - QUERY_SERVICE_CONFIGW config; - DWORD total; - DWORD err; - BYTE *bufpos; - - TRACE("%p %p %d %p\n", hService, lpServiceConfig, - cbBufSize, pcbBytesNeeded); - - memset(&config, 0, sizeof(config)); - - __TRY - { - err = svcctl_QueryServiceConfigW(hService, &config, cbBufSize, pcbBytesNeeded); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - { - TRACE("services.exe: error %u\n", err); - SetLastError(err); - return FALSE; - } - - /* calculate the size required first */ - total = sizeof (QUERY_SERVICE_CONFIGW); - total += size_string(config.lpBinaryPathName); - total += size_string(config.lpLoadOrderGroup); - total += size_string(config.lpDependencies); - total += size_string(config.lpServiceStartName); - total += size_string(config.lpDisplayName); - - *pcbBytesNeeded = total; - - /* if there's not enough memory, return an error */ - if( total > cbBufSize ) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - MIDL_user_free(config.lpBinaryPathName); - MIDL_user_free(config.lpLoadOrderGroup); - MIDL_user_free(config.lpDependencies); - MIDL_user_free(config.lpServiceStartName); - MIDL_user_free(config.lpDisplayName); - return FALSE; - } - - *lpServiceConfig = config; - bufpos = ((BYTE *)lpServiceConfig) + sizeof(QUERY_SERVICE_CONFIGW); - move_string_to_buffer(&bufpos, &lpServiceConfig->lpBinaryPathName); - move_string_to_buffer(&bufpos, &lpServiceConfig->lpLoadOrderGroup); - move_string_to_buffer(&bufpos, &lpServiceConfig->lpDependencies); - move_string_to_buffer(&bufpos, &lpServiceConfig->lpServiceStartName); - move_string_to_buffer(&bufpos, &lpServiceConfig->lpDisplayName); +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/unicode.h" +#include "wine/debug.h" - TRACE("Image path = %s\n", debugstr_w(lpServiceConfig->lpBinaryPathName) ); - TRACE("Group = %s\n", debugstr_w(lpServiceConfig->lpLoadOrderGroup) ); - TRACE("Dependencies = %s\n", debugstr_w(lpServiceConfig->lpDependencies) ); - TRACE("Service account name = %s\n", debugstr_w(lpServiceConfig->lpServiceStartName) ); - TRACE("Display name = %s\n", debugstr_w(lpServiceConfig->lpDisplayName) ); +#include "advapi32_misc.h" - return TRUE; -} +WINE_DEFAULT_DEBUG_CHANNEL(service); /****************************************************************************** - * QueryServiceConfig2A [ADVAPI32.@] - * - * Note - * observed under win2k: - * The functions QueryServiceConfig2A and QueryServiceConfig2W return the same - * required buffer size (in byte) at least for dwLevel SERVICE_CONFIG_DESCRIPTION + * LockServiceDatabase [ADVAPI32.@] */ -BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, - DWORD size, LPDWORD needed) +SC_LOCK WINAPI LockServiceDatabase( SC_HANDLE manager ) { - BOOL ret; - LPBYTE bufferW = NULL; - - TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); - - if(buffer && size) - bufferW = heap_alloc(size); - - ret = QueryServiceConfig2W(hService, dwLevel, bufferW, size, needed); - if(!ret) goto cleanup; - - switch(dwLevel) { - case SERVICE_CONFIG_DESCRIPTION: - if (buffer && bufferW) { - LPSERVICE_DESCRIPTIONA configA = (LPSERVICE_DESCRIPTIONA) buffer; - LPSERVICE_DESCRIPTIONW configW = (LPSERVICE_DESCRIPTIONW) bufferW; - if (configW->lpDescription && (size > sizeof(SERVICE_DESCRIPTIONA))) { - DWORD sz; - configA->lpDescription = (LPSTR)(configA + 1); - sz = WideCharToMultiByte( CP_ACP, 0, configW->lpDescription, -1, - configA->lpDescription, size - sizeof(SERVICE_DESCRIPTIONA), NULL, NULL ); - if (!sz) { - FIXME("WideCharToMultiByte failed for configW->lpDescription\n"); - ret = FALSE; - configA->lpDescription = NULL; - } - } - else configA->lpDescription = NULL; - } - break; - case SERVICE_CONFIG_PRESHUTDOWN_INFO: - if (buffer && bufferW && *needed<=size) - memcpy(buffer, bufferW, *needed); - break; - default: - FIXME("conversation W->A not implemented for level %d\n", dwLevel); - ret = FALSE; - break; - } - -cleanup: - heap_free( bufferW); - return ret; + /* this function is a no-op in Vista and above */ + TRACE("%p\n", manager); + return (SC_LOCK)0xdeadbeef; } /****************************************************************************** - * QueryServiceConfig2W [ADVAPI32.@] - * - * See QueryServiceConfig2A. + * UnlockServiceDatabase [ADVAPI32.@] */ -BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, - DWORD size, LPDWORD needed) +BOOL WINAPI UnlockServiceDatabase( SC_LOCK lock ) { - BYTE *bufptr; - DWORD err; - - TRACE("%p %u %p %u %p\n", hService, dwLevel, buffer, size, needed); - - if (!buffer && size) - { - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; - } - - switch (dwLevel) - { - case SERVICE_CONFIG_DESCRIPTION: - if (!(bufptr = heap_alloc( size ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - break; - - case SERVICE_CONFIG_PRESHUTDOWN_INFO: - bufptr = buffer; - break; - - default: - FIXME("Level %d not implemented\n", dwLevel); - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; - } - - if (!needed) - { - if (dwLevel == SERVICE_CONFIG_DESCRIPTION) heap_free(bufptr); - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; - } - - __TRY - { - err = svcctl_QueryServiceConfig2W(hService, dwLevel, bufptr, size, needed); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - switch (dwLevel) - { - case SERVICE_CONFIG_DESCRIPTION: - { - SERVICE_DESCRIPTIONW *desc = (SERVICE_DESCRIPTIONW *)buffer; - struct service_description *s = (struct service_description *)bufptr; - - if (err != ERROR_SUCCESS && err != ERROR_INSUFFICIENT_BUFFER) - { - heap_free( bufptr ); - SetLastError( err ); - return FALSE; - } - - /* adjust for potentially larger SERVICE_DESCRIPTIONW structure */ - if (*needed == sizeof(*s)) *needed = sizeof(*desc); - else - *needed = *needed - FIELD_OFFSET(struct service_description, description) + sizeof(*desc); - - if (size < *needed) - { - heap_free( bufptr ); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } - if (desc) - { - if (!s->size) desc->lpDescription = NULL; - else - { - desc->lpDescription = (WCHAR *)(desc + 1); - memcpy( desc->lpDescription, s->description, s->size ); - } - } - heap_free( bufptr ); - break; - } - case SERVICE_CONFIG_PRESHUTDOWN_INFO: - if (err != ERROR_SUCCESS) - { - SetLastError( err ); - return FALSE; - } - break; - - default: - break; - } - + /* this function is a no-op in Vista and above */ + TRACE("%p\n", lock); return TRUE; } @@ -1871,158 +244,41 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st heap_free( servicesW ); return FALSE; } - MultiByteToWideChar( CP_ACP, 0, group, -1, groupW, len * sizeof(WCHAR) ); - } - - ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, sz, - needed, returned, resume_handle, groupW ); - if (!ret) goto done; - - p = (char *)services + *returned * sizeof(ENUM_SERVICE_STATUS_PROCESSA); - n = size - (p - (char *)services); - ret = FALSE; - for (i = 0; i < *returned; i++) - { - sz = WideCharToMultiByte( CP_ACP, 0, servicesW[i].lpServiceName, -1, p, n, NULL, NULL ); - if (!sz) goto done; - services[i].lpServiceName = p; - p += sz; - n -= sz; - if (servicesW[i].lpDisplayName) - { - sz = WideCharToMultiByte( CP_ACP, 0, servicesW[i].lpDisplayName, -1, p, n, NULL, NULL ); - if (!sz) goto done; - services[i].lpDisplayName = p; - p += sz; - n -= sz; - } - else services[i].lpDisplayName = NULL; - services[i].ServiceStatusProcess = servicesW[i].ServiceStatusProcess; - } - - ret = TRUE; - -done: - heap_free( servicesW ); - heap_free( groupW ); - return ret; -} - -/****************************************************************************** - * EnumServicesStatusExW [ADVAPI32.@] - */ -BOOL WINAPI -EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD state, - LPBYTE buffer, DWORD size, LPDWORD needed, LPDWORD returned, - LPDWORD resume_handle, LPCWSTR group ) -{ - DWORD err, i, offset, buflen, count, total_size = 0; - ENUM_SERVICE_STATUS_PROCESSW *services = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; - struct enum_service_status_process *entry; - const WCHAR *str; - BYTE *buf; - - TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, - size, needed, returned, resume_handle, debugstr_w(group)); - - if (level != SC_ENUM_PROCESS_INFO) - { - SetLastError( ERROR_INVALID_LEVEL ); - return FALSE; - } - if (!hmngr) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - if (!needed || !returned) - { - SetLastError( ERROR_INVALID_ADDRESS ); - return FALSE; - } - - /* make sure we pass a valid pointer */ - buflen = max( size, sizeof(*services) ); - if (!(buf = heap_alloc( buflen ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - - __TRY - { - err = svcctl_EnumServicesStatusExW( hmngr, SC_ENUM_PROCESS_INFO, type, state, buf, buflen, needed, - &count, resume_handle, group ); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code( GetExceptionCode() ); - } - __ENDTRY - - *returned = 0; - if (err != ERROR_SUCCESS) - { - /* double the needed size to fit the potentially larger ENUM_SERVICE_STATUS_PROCESSW */ - if (err == ERROR_MORE_DATA) *needed *= 2; - heap_free( buf ); - SetLastError( err ); - return FALSE; - } - - entry = (struct enum_service_status_process *)buf; - for (i = 0; i < count; i++) - { - total_size += sizeof(*services); - if (entry->service_name) - { - str = (const WCHAR *)(buf + entry->service_name); - total_size += (strlenW( str ) + 1) * sizeof(WCHAR); - } - if (entry->display_name) - { - str = (const WCHAR *)(buf + entry->display_name); - total_size += (strlenW( str ) + 1) * sizeof(WCHAR); - } - entry++; - } - - if (total_size > size) - { - heap_free( buf ); - *needed = total_size; - SetLastError( ERROR_MORE_DATA ); - return FALSE; + MultiByteToWideChar( CP_ACP, 0, group, -1, groupW, len * sizeof(WCHAR) ); } - offset = count * sizeof(*services); - entry = (struct enum_service_status_process *)buf; - for (i = 0; i < count; i++) - { - DWORD str_size; - str = (const WCHAR *)(buf + entry->service_name); - str_size = (strlenW( str ) + 1) * sizeof(WCHAR); - services[i].lpServiceName = (WCHAR *)((char *)services + offset); - memcpy( services[i].lpServiceName, str, str_size ); - offset += str_size; + ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, sz, + needed, returned, resume_handle, groupW ); + if (!ret) goto done; - if (!entry->display_name) services[i].lpDisplayName = NULL; - else + p = (char *)services + *returned * sizeof(ENUM_SERVICE_STATUS_PROCESSA); + n = size - (p - (char *)services); + ret = FALSE; + for (i = 0; i < *returned; i++) + { + sz = WideCharToMultiByte( CP_ACP, 0, servicesW[i].lpServiceName, -1, p, n, NULL, NULL ); + if (!sz) goto done; + services[i].lpServiceName = p; + p += sz; + n -= sz; + if (servicesW[i].lpDisplayName) { - str = (const WCHAR *)(buf + entry->display_name); - str_size = (strlenW( str ) + 1) * sizeof(WCHAR); - services[i].lpDisplayName = (WCHAR *)((char *)services + offset); - memcpy( services[i].lpDisplayName, str, str_size ); - offset += str_size; + sz = WideCharToMultiByte( CP_ACP, 0, servicesW[i].lpDisplayName, -1, p, n, NULL, NULL ); + if (!sz) goto done; + services[i].lpDisplayName = p; + p += sz; + n -= sz; } - services[i].ServiceStatusProcess = entry->service_status_process; - entry++; + else services[i].lpDisplayName = NULL; + services[i].ServiceStatusProcess = servicesW[i].ServiceStatusProcess; } - heap_free( buf ); - *needed = 0; - *returned = count; - return TRUE; + ret = TRUE; + +done: + heap_free( servicesW ); + heap_free( groupW ); + return ret; } /****************************************************************************** @@ -2071,59 +327,6 @@ cleanup: return ret; } -/****************************************************************************** - * GetServiceKeyNameW [ADVAPI32.@] - */ -BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, - LPWSTR lpServiceName, LPDWORD lpcchBuffer ) -{ - DWORD err; - WCHAR buffer[2]; - DWORD size; - - TRACE("%p %s %p %p\n", hSCManager, - debugstr_w(lpDisplayName), lpServiceName, lpcchBuffer); - - if (!hSCManager) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - - /* provide a buffer if the caller didn't */ - if (!lpServiceName || *lpcchBuffer < 2) - { - lpServiceName = buffer; - /* A size of 1 would be enough, but tests show that Windows returns 2, - * probably because of a WCHAR/bytes mismatch in their code. - */ - *lpcchBuffer = 2; - } - - /* RPC call takes size excluding nul-terminator, whereas *lpcchBuffer - * includes the nul-terminator on input. */ - size = *lpcchBuffer - 1; - - __TRY - { - err = svcctl_GetServiceKeyNameW(hSCManager, lpDisplayName, lpServiceName, - &size); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - /* The value of *lpcchBuffer excludes nul-terminator on output. */ - if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) - *lpcchBuffer = size; - - if (err) - SetLastError(err); - return err == ERROR_SUCCESS; -} - /****************************************************************************** * QueryServiceLockStatusA [ADVAPI32.@] */ @@ -2195,284 +398,6 @@ cleanup: return ret; } -/****************************************************************************** - * GetServiceDisplayNameW [ADVAPI32.@] - */ -BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - LPWSTR lpDisplayName, LPDWORD lpcchBuffer) -{ - DWORD err; - DWORD size; - WCHAR buffer[2]; - - TRACE("%p %s %p %p\n", hSCManager, - debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); - - if (!hSCManager) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - - /* provide a buffer if the caller didn't */ - if (!lpDisplayName || *lpcchBuffer < 2) - { - lpDisplayName = buffer; - /* A size of 1 would be enough, but tests show that Windows returns 2, - * probably because of a WCHAR/bytes mismatch in their code. - */ - *lpcchBuffer = 2; - } - - /* RPC call takes size excluding nul-terminator, whereas *lpcchBuffer - * includes the nul-terminator on input. */ - size = *lpcchBuffer - 1; - - __TRY - { - err = svcctl_GetServiceDisplayNameW(hSCManager, lpServiceName, lpDisplayName, - &size); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - /* The value of *lpcchBuffer excludes nul-terminator on output. */ - if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) - *lpcchBuffer = size; - - if (err) - SetLastError(err); - return err == ERROR_SUCCESS; -} - -/****************************************************************************** - * ChangeServiceConfigW [ADVAPI32.@] - */ -BOOL WINAPI ChangeServiceConfigW( SC_HANDLE hService, DWORD dwServiceType, - DWORD dwStartType, DWORD dwErrorControl, LPCWSTR lpBinaryPathName, - LPCWSTR lpLoadOrderGroup, LPDWORD lpdwTagId, LPCWSTR lpDependencies, - LPCWSTR lpServiceStartName, LPCWSTR lpPassword, LPCWSTR lpDisplayName) -{ - DWORD cb_pwd; - DWORD err; - - TRACE("%p %d %d %d %s %s %p %p %s %s %s\n", - hService, dwServiceType, dwStartType, dwErrorControl, - debugstr_w(lpBinaryPathName), debugstr_w(lpLoadOrderGroup), - lpdwTagId, lpDependencies, debugstr_w(lpServiceStartName), - debugstr_w(lpPassword), debugstr_w(lpDisplayName) ); - - cb_pwd = lpPassword ? (strlenW(lpPassword) + 1)*sizeof(WCHAR) : 0; - - __TRY - { - err = svcctl_ChangeServiceConfigW(hService, dwServiceType, - dwStartType, dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, - (const BYTE *)lpDependencies, multisz_cb(lpDependencies), lpServiceStartName, - (const BYTE *)lpPassword, cb_pwd, lpDisplayName); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - SetLastError(err); - - return err == ERROR_SUCCESS; -} - -/****************************************************************************** - * ChangeServiceConfigA [ADVAPI32.@] - */ -BOOL WINAPI ChangeServiceConfigA( SC_HANDLE hService, DWORD dwServiceType, - DWORD dwStartType, DWORD dwErrorControl, LPCSTR lpBinaryPathName, - LPCSTR lpLoadOrderGroup, LPDWORD lpdwTagId, LPCSTR lpDependencies, - LPCSTR lpServiceStartName, LPCSTR lpPassword, LPCSTR lpDisplayName) -{ - LPWSTR wBinaryPathName, wLoadOrderGroup, wDependencies; - LPWSTR wServiceStartName, wPassword, wDisplayName; - BOOL r; - - TRACE("%p %d %d %d %s %s %p %p %s %s %s\n", - hService, dwServiceType, dwStartType, dwErrorControl, - debugstr_a(lpBinaryPathName), debugstr_a(lpLoadOrderGroup), - lpdwTagId, lpDependencies, debugstr_a(lpServiceStartName), - debugstr_a(lpPassword), debugstr_a(lpDisplayName) ); - - wBinaryPathName = strdupAW( lpBinaryPathName ); - wLoadOrderGroup = strdupAW( lpLoadOrderGroup ); - wDependencies = SERV_dupmulti( lpDependencies ); - wServiceStartName = strdupAW( lpServiceStartName ); - wPassword = strdupAW( lpPassword ); - wDisplayName = strdupAW( lpDisplayName ); - - r = ChangeServiceConfigW( hService, dwServiceType, - dwStartType, dwErrorControl, wBinaryPathName, - wLoadOrderGroup, lpdwTagId, wDependencies, - wServiceStartName, wPassword, wDisplayName); - - heap_free( wBinaryPathName ); - heap_free( wLoadOrderGroup ); - heap_free( wDependencies ); - heap_free( wServiceStartName ); - heap_free( wPassword ); - heap_free( wDisplayName ); - - return r; -} - -/****************************************************************************** - * ChangeServiceConfig2A [ADVAPI32.@] - */ -BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, - LPVOID lpInfo) -{ - BOOL r = FALSE; - - TRACE("%p %d %p\n",hService, dwInfoLevel, lpInfo); - - if (dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) - { - LPSERVICE_DESCRIPTIONA sd = lpInfo; - SERVICE_DESCRIPTIONW sdw; - - sdw.lpDescription = strdupAW( sd->lpDescription ); - - r = ChangeServiceConfig2W( hService, dwInfoLevel, &sdw ); - - heap_free( sdw.lpDescription ); - } - else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) - { - LPSERVICE_FAILURE_ACTIONSA fa = lpInfo; - SERVICE_FAILURE_ACTIONSW faw; - - faw.dwResetPeriod = fa->dwResetPeriod; - faw.lpRebootMsg = strdupAW( fa->lpRebootMsg ); - faw.lpCommand = strdupAW( fa->lpCommand ); - faw.cActions = fa->cActions; - faw.lpsaActions = fa->lpsaActions; - - r = ChangeServiceConfig2W( hService, dwInfoLevel, &faw ); - - heap_free( faw.lpRebootMsg ); - heap_free( faw.lpCommand ); - } - else if (dwInfoLevel == SERVICE_CONFIG_PRESHUTDOWN_INFO) - { - r = ChangeServiceConfig2W( hService, dwInfoLevel, lpInfo); - } - else - SetLastError( ERROR_INVALID_PARAMETER ); - - return r; -} - -/****************************************************************************** - * ChangeServiceConfig2W [ADVAPI32.@] - */ -BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, - LPVOID lpInfo) -{ - SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; - DWORD err; - - __TRY - { - SC_RPC_CONFIG_INFOW info; - - info.dwInfoLevel = dwInfoLevel; - if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) - { - SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; - WCHAR *p; - - for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); - rpc_privinfo.cbRequiredPrivileges = - (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); - rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; - info.u.privinfo = &rpc_privinfo; - } - else - info.u.descr = lpInfo; - err = svcctl_ChangeServiceConfig2W( hService, info ); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - SetLastError(err); - - return err == ERROR_SUCCESS; -} - -static NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor, - DWORD cbBufSize, LPDWORD pcbBytesNeeded) -{ - SECURITY_DESCRIPTOR descriptor; - NTSTATUS status; - DWORD size; - ACL acl; - - FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, - lpSecurityDescriptor, cbBufSize, pcbBytesNeeded); - - if (dwSecurityInformation != DACL_SECURITY_INFORMATION) - FIXME("information %d not supported\n", dwSecurityInformation); - - InitializeSecurityDescriptor(&descriptor, SECURITY_DESCRIPTOR_REVISION); - - InitializeAcl(&acl, sizeof(ACL), ACL_REVISION); - SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); - - size = cbBufSize; - status = RtlMakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); - *pcbBytesNeeded = size; - return status; -} - -/****************************************************************************** - * QueryServiceObjectSecurity [ADVAPI32.@] - */ -BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor, - DWORD cbBufSize, LPDWORD pcbBytesNeeded) -{ - NTSTATUS status = SERV_QueryServiceObjectSecurity(hService, dwSecurityInformation, lpSecurityDescriptor, - cbBufSize, pcbBytesNeeded); - if (status != STATUS_SUCCESS) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - return TRUE; -} - -/****************************************************************************** - * SetServiceObjectSecurity [ADVAPI32.@] - * - * NOTES - * - SetSecurityInfo should be updated to call this function once it's implemented. - */ -BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor) -{ - FIXME("%p %d %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); - return TRUE; -} - /****************************************************************************** * SetServiceBits [ADVAPI32.@] */ @@ -2486,69 +411,6 @@ BOOL WINAPI SetServiceBits( SERVICE_STATUS_HANDLE hServiceStatus, return TRUE; } -/* thunk for calling the RegisterServiceCtrlHandler handler function */ -static DWORD WINAPI ctrl_handler_thunk( DWORD control, DWORD type, void *data, void *context ) -{ - LPHANDLER_FUNCTION func = context; - - func( control ); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * RegisterServiceCtrlHandlerA [ADVAPI32.@] - */ -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA( LPCSTR name, LPHANDLER_FUNCTION handler ) -{ - return RegisterServiceCtrlHandlerExA( name, ctrl_handler_thunk, handler ); -} - -/****************************************************************************** - * RegisterServiceCtrlHandlerW [ADVAPI32.@] - */ -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW( LPCWSTR name, LPHANDLER_FUNCTION handler ) -{ - return RegisterServiceCtrlHandlerExW( name, ctrl_handler_thunk, handler ); -} - -/****************************************************************************** - * RegisterServiceCtrlHandlerExA [ADVAPI32.@] - */ -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA( LPCSTR name, LPHANDLER_FUNCTION_EX handler, LPVOID context ) -{ - LPWSTR nameW; - SERVICE_STATUS_HANDLE ret; - - nameW = strdupAW(name); - ret = RegisterServiceCtrlHandlerExW( nameW, handler, context ); - heap_free( nameW ); - return ret; -} - -/****************************************************************************** - * RegisterServiceCtrlHandlerExW [ADVAPI32.@] - */ -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceName, - LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) -{ - service_data *service; - SC_HANDLE hService = 0; - - TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); - - EnterCriticalSection( &service_cs ); - if ((service = find_service_by_name( lpServiceName ))) - { - service->handler = lpHandlerProc; - service->context = lpContext; - hService = service->handle; - } - LeaveCriticalSection( &service_cs ); - - if (!hService) SetLastError( ERROR_SERVICE_DOES_NOT_EXIST ); - return (SERVICE_STATUS_HANDLE)hService; -} - /****************************************************************************** * EnumDependentServicesA [ADVAPI32.@] */ @@ -2562,145 +424,3 @@ BOOL WINAPI EnumDependentServicesA( SC_HANDLE hService, DWORD dwServiceState, *lpServicesReturned = 0; return TRUE; } - -/****************************************************************************** - * EnumDependentServicesW [ADVAPI32.@] - */ -BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, - LPENUM_SERVICE_STATUSW lpServices, DWORD cbBufSize, - LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned ) -{ - FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, - lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); - - *lpServicesReturned = 0; - return TRUE; -} - -static DWORD WINAPI notify_thread(void *user) -{ - DWORD err; - notify_data *data = user; - SC_RPC_NOTIFY_PARAMS_LIST *list = NULL; - SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; - BOOL dummy; - - __TRY - { - /* GetNotifyResults blocks until there is an event */ - err = svcctl_GetNotifyResults(data->notify_handle, &list); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - EnterCriticalSection( &service_cs ); - - list_remove(&data->entry); - - LeaveCriticalSection( &service_cs ); - - if (err == ERROR_SUCCESS && list) - { - cparams = list->NotifyParamsArray[0].u.params; - - data->notify_buffer->dwNotificationStatus = cparams->dwNotificationStatus; - memcpy(&data->notify_buffer->ServiceStatus, &cparams->ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS)); - data->notify_buffer->dwNotificationTriggered = cparams->dwNotificationTriggered; - data->notify_buffer->pszServiceNames = NULL; - - QueueUserAPC((PAPCFUNC)data->notify_buffer->pfnNotifyCallback, - data->calling_thread, (ULONG_PTR)data->notify_buffer); - - HeapFree(GetProcessHeap(), 0, list); - } - else - WARN("GetNotifyResults server call failed: %u\n", err); - - - __TRY - { - err = svcctl_CloseNotifyHandle(&data->notify_handle, &dummy); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - WARN("CloseNotifyHandle server call failed: %u\n", err); - - CloseHandle(data->calling_thread); - HeapFree(GetProcessHeap(), 0, data); - - return 0; -} - -/****************************************************************************** - * NotifyServiceStatusChangeW [ADVAPI32.@] - */ -DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE hService, DWORD dwNotifyMask, - SERVICE_NOTIFYW *pNotifyBuffer) -{ - DWORD err; - BOOL b_dummy = FALSE; - GUID g_dummy = {0}; - notify_data *data; - - TRACE("%p 0x%x %p\n", hService, dwNotifyMask, pNotifyBuffer); - - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); - if (!data) - return ERROR_NOT_ENOUGH_MEMORY; - - data->service = hService; - data->notify_buffer = pNotifyBuffer; - if (!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), - GetCurrentProcess(), &data->calling_thread, 0, FALSE, - DUPLICATE_SAME_ACCESS)) - { - ERR("DuplicateHandle failed: %u\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, data); - return ERROR_NOT_ENOUGH_MEMORY; - } - - data->params.dwInfoLevel = 2; - data->params.u.params = &data->cparams; - - data->cparams.dwNotifyMask = dwNotifyMask; - - EnterCriticalSection( &service_cs ); - - __TRY - { - err = svcctl_NotifyServiceStatusChange(hService, data->params, - &g_dummy, &g_dummy, &b_dummy, &data->notify_handle); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code(GetExceptionCode()); - } - __ENDTRY - - if (err != ERROR_SUCCESS) - { - WARN("NotifyServiceStatusChange server call failed: %u\n", err); - LeaveCriticalSection( &service_cs ); - CloseHandle(data->calling_thread); - CloseHandle(data->ready_evt); - HeapFree(GetProcessHeap(), 0, data); - return err; - } - - CloseHandle(CreateThread(NULL, 0, &notify_thread, data, 0, NULL)); - - list_add_tail(&notify_list, &data->entry); - - LeaveCriticalSection( &service_cs ); - - return ERROR_SUCCESS; -} diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index 9f573ccc2f9..eb98d04859c 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -1,8 +1,13 @@ MODULE = sechost.dll IMPORTLIB = sechost IMPORTS = kernelbase +DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + service.c \ trace.c + +IDL_SRCS = \ + svcctl.idl diff --git a/dlls/sechost/sechost.spec b/dlls/sechost/sechost.spec index f54de38c289..df6af1646df 100644 --- a/dlls/sechost/sechost.spec +++ b/dlls/sechost/sechost.spec @@ -19,13 +19,13 @@ @ stub BuildSecurityDescriptorForSharingAccessEx @ stub CapabilityCheck @ stub CapabilityCheckForSingleSessionSku -@ stdcall ChangeServiceConfig2A(long long ptr) advapi32.ChangeServiceConfig2A -@ stdcall ChangeServiceConfig2W(long long ptr) advapi32.ChangeServiceConfig2W -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) advapi32.ChangeServiceConfigA -@ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) advapi32.ChangeServiceConfigW -@ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle +@ stdcall ChangeServiceConfig2A(long long ptr) +@ stdcall ChangeServiceConfig2W(long long ptr) +@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) +@ stdcall CloseServiceHandle(long) @ stdcall CloseTrace(int64) -@ stdcall ControlService(long long ptr) advapi32.ControlService +@ stdcall ControlService(long long ptr) @ stub ControlServiceExA @ stub ControlServiceExW @ stdcall ControlTraceA(int64 str ptr long) @@ -38,9 +38,9 @@ @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW @ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW -@ stdcall CreateServiceA(long str str long long long long str str ptr str str str) advapi32.CreateServiceA +@ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stub CreateServiceEx -@ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) advapi32.CreateServiceW +@ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) @ stub CredBackupCredentials @ stdcall CredDeleteA(str long long) advapi32.CredDeleteA @ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW @@ -84,10 +84,10 @@ @ stub CredpDecodeCredential @ stub CredpEncodeCredential @ stub CredpEncodeSecret -@ stdcall DeleteService(long) advapi32.DeleteService +@ stdcall DeleteService(long) @ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) -@ stdcall EnumDependentServicesW(long long ptr long ptr ptr) advapi32.EnumDependentServicesW -@ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) advapi32.EnumServicesStatusExW +@ stdcall EnumDependentServicesW(long long ptr long ptr ptr) +@ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stub EnumerateIdentityProviders @ stub EnumerateTraceGuidsEx @ stub EtwQueryRealtimeConsumer @@ -99,8 +99,8 @@ @ stub GetIdentityProviderInfoByGUID @ stub GetIdentityProviderInfoByName @ stub GetServiceDirectory -@ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) advapi32.GetServiceDisplayNameW -@ stdcall GetServiceKeyNameW(long wstr ptr ptr) advapi32.GetServiceKeyNameW +@ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) +@ stdcall GetServiceKeyNameW(long wstr ptr ptr) @ stub GetServiceRegistryStateKey @ stub I_QueryTagInformation @ stub I_RegisterSvchostNotificationCallback @@ -159,45 +159,45 @@ @ stdcall LsaStorePrivateData(ptr ptr ptr) advapi32.LsaStorePrivateData @ stub NotifyServiceStatusChange @ stub NotifyServiceStatusChangeA -@ stdcall NotifyServiceStatusChangeW(ptr long ptr) advapi32.NotifyServiceStatusChangeW -@ stdcall OpenSCManagerA(str str long) advapi32.OpenSCManagerA -@ stdcall OpenSCManagerW(wstr wstr long) advapi32.OpenSCManagerW -@ stdcall OpenServiceA(long str long) advapi32.OpenServiceA -@ stdcall OpenServiceW(long wstr long) advapi32.OpenServiceW +@ stdcall NotifyServiceStatusChangeW(ptr long ptr) +@ stdcall OpenSCManagerA(str str long) +@ stdcall OpenSCManagerW(wstr wstr long) +@ stdcall OpenServiceA(long str long) +@ stdcall OpenServiceW(long wstr long) @ stdcall -ret64 OpenTraceW(ptr) @ stdcall ProcessTrace(ptr long ptr ptr) @ stdcall QueryAllTracesA(ptr long ptr) @ stdcall QueryAllTracesW(ptr long ptr) @ stub QueryLocalUserServiceName -@ stdcall QueryServiceConfig2A(long long ptr long ptr) advapi32.QueryServiceConfig2A -@ stdcall QueryServiceConfig2W(long long ptr long ptr) advapi32.QueryServiceConfig2W -@ stdcall QueryServiceConfigA(long ptr long ptr) advapi32.QueryServiceConfigA -@ stdcall QueryServiceConfigW(long ptr long ptr) advapi32.QueryServiceConfigW +@ stdcall QueryServiceConfig2A(long long ptr long ptr) +@ stdcall QueryServiceConfig2W(long long ptr long ptr) +@ stdcall QueryServiceConfigA(long ptr long ptr) +@ stdcall QueryServiceConfigW(long ptr long ptr) @ stub QueryServiceDynamicInformation -@ stdcall QueryServiceObjectSecurity(long long ptr long ptr) advapi32.QueryServiceObjectSecurity -@ stdcall QueryServiceStatus(long ptr) advapi32.QueryServiceStatus -@ stdcall QueryServiceStatusEx(long long ptr long ptr) advapi32.QueryServiceStatusEx +@ stdcall QueryServiceObjectSecurity(long long ptr long ptr) +@ stdcall QueryServiceStatus(long ptr) +@ stdcall QueryServiceStatusEx(long long ptr long ptr) @ stub QueryTraceProcessingHandle @ stub QueryTransientObjectSecurityDescriptor @ stub QueryUserServiceName @ stub QueryUserServiceNameForContext -@ stdcall RegisterServiceCtrlHandlerA(str ptr) advapi32.RegisterServiceCtrlHandlerA -@ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) advapi32.RegisterServiceCtrlHandlerExA -@ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) advapi32.RegisterServiceCtrlHandlerExW -@ stdcall RegisterServiceCtrlHandlerW(wstr ptr) advapi32.RegisterServiceCtrlHandlerW +@ stdcall RegisterServiceCtrlHandlerA(str ptr) +@ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) +@ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) +@ stdcall RegisterServiceCtrlHandlerW(wstr ptr) @ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA @ stub ReleaseIdentityProviderEnumContext @ stub RemoveTraceCallback @ stub RpcClientCapabilityCheck @ stub SetLocalRpcServerInterfaceSecurity @ stub SetLocalRpcServerProtseqSecurity -@ stdcall SetServiceObjectSecurity(long long ptr) advapi32.SetServiceObjectSecurity -@ stdcall SetServiceStatus(long ptr) advapi32.SetServiceStatus +@ stdcall SetServiceObjectSecurity(long long ptr) +@ stdcall SetServiceStatus(long ptr) @ stub SetTraceCallback -@ stdcall StartServiceA(long long ptr) advapi32.StartServiceA -@ stdcall StartServiceCtrlDispatcherA(ptr) advapi32.StartServiceCtrlDispatcherA -@ stdcall StartServiceCtrlDispatcherW(ptr) advapi32.StartServiceCtrlDispatcherW -@ stdcall StartServiceW(long long ptr) advapi32.StartServiceW +@ stdcall StartServiceA(long long ptr) +@ stdcall StartServiceCtrlDispatcherA(ptr) +@ stdcall StartServiceCtrlDispatcherW(ptr) +@ stdcall StartServiceW(long long ptr) @ stdcall StartTraceA(ptr str ptr) @ stdcall StartTraceW(ptr wstr ptr) @ stdcall StopTraceW(int64 wstr ptr) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c new file mode 100644 index 00000000000..7a4211631e2 --- /dev/null +++ b/dlls/sechost/service.c @@ -0,0 +1,1969 @@ +/* + * Service control API + * + * Copyright 1995 Sven Verdoolaege + * Copyright 2005 Mike McCormack + * Copyright 2007 Rolf Kalbermatter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "winternl.h" + +#include "wine/debug.h" +#include "wine/exception.h" +#include "wine/heap.h" +#include "wine/list.h" + +#include "svcctl.h" + +WINE_DEFAULT_DEBUG_CHANNEL(service); + +struct notify_data +{ + SC_HANDLE service; + SC_RPC_NOTIFY_PARAMS params; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 cparams; + SC_NOTIFY_RPC_HANDLE notify_handle; + SERVICE_NOTIFYW *notify_buffer; + HANDLE calling_thread, ready_evt; + struct list entry; +}; + +static struct list notify_list = LIST_INIT(notify_list); + +static CRITICAL_SECTION service_cs; +static CRITICAL_SECTION_DEBUG service_cs_debug = +{ + 0, 0, &service_cs, + { &service_cs_debug.ProcessLocksList, + &service_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": service_cs") } +}; +static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; + +struct service_data +{ + LPHANDLER_FUNCTION_EX handler; + void *context; + HANDLE thread; + SC_HANDLE handle; + SC_HANDLE full_access_handle; + unsigned int unicode : 1; + union + { + LPSERVICE_MAIN_FUNCTIONA a; + LPSERVICE_MAIN_FUNCTIONW w; + } proc; + WCHAR *args; + WCHAR name[1]; +}; + +struct dispatcher_data +{ + SC_HANDLE manager; + HANDLE pipe; +}; + +static struct service_data **services; +static unsigned int nb_services; +static HANDLE service_event; +static BOOL stop_service; + +extern HANDLE CDECL __wine_make_process_system(void); + +static WCHAR *heap_strdupAtoW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +static WCHAR *heap_strdup_multi_AtoW( const char *src ) +{ + WCHAR *dst = NULL; + const char *p = src; + DWORD len; + + if (!src) return NULL; + + while (*p) p += strlen(p) + 1; + for (p = src; *p; p += strlen(p) + 1); + p++; /* final null */ + len = MultiByteToWideChar( CP_ACP, 0, src, p - src, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, p - src, dst, len ); + return dst; +} + +static inline DWORD multisz_size( const WCHAR *str ) +{ + const WCHAR *p = str; + + if (!str) return 0; + + while (*p) p += wcslen(p) + 1; + return (p - str + 1) * sizeof(WCHAR); +} + +void __RPC_FAR * __RPC_USER MIDL_user_allocate( SIZE_T len ) +{ + return heap_alloc(len); +} + +void __RPC_USER MIDL_user_free( void __RPC_FAR *ptr ) +{ + heap_free(ptr); +} + +static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr ) +{ + return I_RpcExceptionFilter( eptr->ExceptionRecord->ExceptionCode ); +} + +static DWORD map_exception_code( DWORD exception_code ) +{ + switch (exception_code) + { + case RPC_X_NULL_REF_POINTER: + return ERROR_INVALID_ADDRESS; + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: + case RPC_X_BYTE_COUNT_TOO_SMALL: + return ERROR_INVALID_PARAMETER; + case RPC_S_INVALID_BINDING: + case RPC_X_SS_IN_NULL_CONTEXT: + return ERROR_INVALID_HANDLE; + default: + return exception_code; + } +} + +static handle_t rpc_wstr_bind( RPC_WSTR str ) +{ + WCHAR transport[] = SVCCTL_TRANSPORT; + WCHAR endpoint[] = SVCCTL_ENDPOINT; + RPC_WSTR binding_str; + RPC_STATUS status; + handle_t rpc_handle; + + status = RpcStringBindingComposeW( NULL, transport, str, endpoint, NULL, &binding_str ); + if (status != RPC_S_OK) + { + ERR("RpcStringBindingComposeW failed, error %d\n", status); + return NULL; + } + + status = RpcBindingFromStringBindingW( binding_str, &rpc_handle ); + RpcStringFreeW( &binding_str ); + + if (status != RPC_S_OK) + { + ERR("Couldn't connect to services.exe, error %d\n", status); + return NULL; + } + + return rpc_handle; +} + +static handle_t rpc_cstr_bind(RPC_CSTR str) +{ + RPC_CSTR transport = (RPC_CSTR)SVCCTL_TRANSPORTA; + RPC_CSTR endpoint = (RPC_CSTR)SVCCTL_ENDPOINTA; + RPC_CSTR binding_str; + RPC_STATUS status; + handle_t rpc_handle; + + status = RpcStringBindingComposeA( NULL, transport, str, endpoint, NULL, &binding_str ); + if (status != RPC_S_OK) + { + ERR("RpcStringBindingComposeA failed, error %d\n", status); + return NULL; + } + + status = RpcBindingFromStringBindingA( binding_str, &rpc_handle ); + RpcStringFreeA( &binding_str ); + + if (status != RPC_S_OK) + { + ERR("Couldn't connect to services.exe, error %d\n", status); + return NULL; + } + + return rpc_handle; +} + +DECLSPEC_HIDDEN handle_t __RPC_USER MACHINE_HANDLEA_bind( MACHINE_HANDLEA name ) +{ + return rpc_cstr_bind( (RPC_CSTR)name ); +} + +DECLSPEC_HIDDEN void __RPC_USER MACHINE_HANDLEA_unbind( MACHINE_HANDLEA name, handle_t h ) +{ + RpcBindingFree( &h ); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER MACHINE_HANDLEW_bind( MACHINE_HANDLEW name ) +{ + return rpc_wstr_bind( (RPC_WSTR)name ); +} + +DECLSPEC_HIDDEN void __RPC_USER MACHINE_HANDLEW_unbind( MACHINE_HANDLEW name, handle_t h ) +{ + RpcBindingFree( &h ); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER SVCCTL_HANDLEW_bind( SVCCTL_HANDLEW name ) +{ + return rpc_wstr_bind( (RPC_WSTR)name ); +} + +DECLSPEC_HIDDEN void __RPC_USER SVCCTL_HANDLEW_unbind( SVCCTL_HANDLEW name, handle_t h ) +{ + RpcBindingFree( &h ); +} + +static BOOL set_error( DWORD err ) +{ + if (err) SetLastError( err ); + return !err; +} + +/****************************************************************************** + * OpenSCManagerA (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenSCManagerA( const char *machine, const char *database, DWORD access ) +{ + WCHAR *machineW, *databaseW; + SC_HANDLE ret; + + machineW = heap_strdupAtoW( machine ); + databaseW = heap_strdupAtoW( database ); + ret = OpenSCManagerW( machineW, databaseW, access ); + heap_free( databaseW ); + heap_free( machineW ); + return ret; +} + +/****************************************************************************** + * OpenSCManagerW (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenSCManagerW( const WCHAR *machine, const WCHAR *database, DWORD access ) +{ + SC_RPC_HANDLE handle = NULL; + DWORD err; + + TRACE( "%s %s %#x\n", debugstr_w(machine), debugstr_w(database), access ); + + __TRY + { + err = svcctl_OpenSCManagerW( machine, database, access, &handle ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!err) return handle; + SetLastError( err ); + return NULL; +} + +/****************************************************************************** + * OpenServiceA (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenServiceA( SC_HANDLE manager, const char *name, DWORD access ) +{ + WCHAR *nameW; + SC_HANDLE ret; + + TRACE( "%p %s %#x\n", manager, debugstr_a(name), access ); + + nameW = heap_strdupAtoW( name ); + ret = OpenServiceW( manager, nameW, access ); + heap_free( nameW ); + return ret; +} + +/****************************************************************************** + * OpenServiceW (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenServiceW( SC_HANDLE manager, const WCHAR *name, DWORD access ) +{ + SC_RPC_HANDLE handle = NULL; + DWORD err; + + TRACE( "%p %s %#x\n", manager, debugstr_w(name), access ); + + if (!manager) + { + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } + + __TRY + { + err = svcctl_OpenServiceW( manager, name, access, &handle ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!err) return handle; + SetLastError( err ); + return 0; +} + +/****************************************************************************** + * CreateServiceA (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH CreateServiceA( SC_HANDLE manager, const char *name, const char *display_name, + DWORD access, DWORD service_type, DWORD start_type, + DWORD error_control, const char *path, const char *group, + DWORD *tag, const char *dependencies, const char *username, + const char *password ) +{ + WCHAR *nameW, *display_nameW, *pathW, *groupW, *dependenciesW, *usernameW, *passwordW; + SC_HANDLE handle; + + TRACE( "%p %s %s\n", manager, debugstr_a(name), debugstr_a(display_name) ); + + nameW = heap_strdupAtoW( name ); + display_nameW = heap_strdupAtoW( display_name ); + pathW = heap_strdupAtoW( path ); + groupW = heap_strdupAtoW( group ); + dependenciesW = heap_strdupAtoW( dependencies ); + usernameW = heap_strdupAtoW( username ); + passwordW = heap_strdupAtoW( password ); + + handle = CreateServiceW( manager, nameW, display_nameW, access, service_type, start_type, error_control, + pathW, groupW, tag, dependenciesW, usernameW, passwordW ); + + heap_free( nameW ); + heap_free( display_nameW ); + heap_free( pathW ); + heap_free( groupW ); + heap_free( dependenciesW ); + heap_free( usernameW ); + heap_free( passwordW ); + + return handle; +} + +/****************************************************************************** + * CreateServiceW (sechost.@) + */ +SC_HANDLE WINAPI DECLSPEC_HOTPATCH CreateServiceW( SC_HANDLE manager, const WCHAR *name, const WCHAR *display_name, + DWORD access, DWORD service_type, DWORD start_type, + DWORD error_control, const WCHAR *path, const WCHAR *group, + DWORD *tag, const WCHAR *dependencies, const WCHAR *username, + const WCHAR *password ) +{ + SC_RPC_HANDLE handle = NULL; + DWORD err; + SIZE_T password_size = 0; + + TRACE( "%p %s %s\n", manager, debugstr_w(name), debugstr_w(display_name) ); + + if (!manager) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } + + if (password) password_size = (wcslen(password) + 1) * sizeof(WCHAR); + + __TRY + { + BOOL is_wow64; + + if (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64) + err = svcctl_CreateServiceWOW64W( manager, name, display_name, access, service_type, start_type, + error_control, path, group, tag, (const BYTE *)dependencies, + multisz_size( dependencies ), username, (const BYTE *)password, + password_size, &handle ); + else + err = svcctl_CreateServiceW( manager, name, display_name, access, service_type, start_type, + error_control, path, group, tag, (const BYTE *)dependencies, + multisz_size( dependencies ), username, (const BYTE *)password, + password_size, &handle ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!err) return handle; + SetLastError( err ); + return NULL; +} + +/****************************************************************************** + * DeleteService (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteService( SC_HANDLE service ) +{ + DWORD err; + + TRACE( "%p\n", service ); + + __TRY + { + err = svcctl_DeleteService( service ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * CloseServiceHandle (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CloseServiceHandle( SC_HANDLE handle ) +{ + DWORD err; + + TRACE( "%p\n", handle ); + + __TRY + { + err = svcctl_CloseServiceHandle( (SC_RPC_HANDLE *)&handle ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * ChangeServiceConfig2A (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfig2A( SC_HANDLE service, DWORD level, void *info) +{ + BOOL r = FALSE; + + TRACE( "%p %d %p\n", service, level, info ); + + if (level == SERVICE_CONFIG_DESCRIPTION) + { + SERVICE_DESCRIPTIONA *sd = info; + SERVICE_DESCRIPTIONW sdw; + + sdw.lpDescription = heap_strdupAtoW( sd->lpDescription ); + + r = ChangeServiceConfig2W( service, level, &sdw ); + + heap_free( sdw.lpDescription ); + } + else if (level == SERVICE_CONFIG_FAILURE_ACTIONS) + { + SERVICE_FAILURE_ACTIONSA *fa = info; + SERVICE_FAILURE_ACTIONSW faw; + + faw.dwResetPeriod = fa->dwResetPeriod; + faw.lpRebootMsg = heap_strdupAtoW( fa->lpRebootMsg ); + faw.lpCommand = heap_strdupAtoW( fa->lpCommand ); + faw.cActions = fa->cActions; + faw.lpsaActions = fa->lpsaActions; + + r = ChangeServiceConfig2W( service, level, &faw ); + + heap_free( faw.lpRebootMsg ); + heap_free( faw.lpCommand ); + } + else if (level == SERVICE_CONFIG_PRESHUTDOWN_INFO) + { + r = ChangeServiceConfig2W( service, level, info ); + } + else + SetLastError( ERROR_INVALID_PARAMETER ); + + return r; +} + +/****************************************************************************** + * ChangeServiceConfig2W (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfig2W( SC_HANDLE service, DWORD level, void *info ) +{ + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; + DWORD err; + + __TRY + { + SC_RPC_CONFIG_INFOW rpc_info; + + rpc_info.dwInfoLevel = level; + if (level == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = info; + + rpc_privinfo.cbRequiredPrivileges = multisz_size( privinfo->pmszRequiredPrivileges ); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + rpc_info.u.privinfo = &rpc_privinfo; + } + else + rpc_info.u.descr = info; + err = svcctl_ChangeServiceConfig2W( service, rpc_info ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * ChangeServiceConfigA (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfigA( SC_HANDLE service, DWORD service_type, DWORD start_type, + DWORD error_control, const char *path, const char *group, + DWORD *tag, const char *dependencies, const char *username, + const char *password, const char *display_name ) +{ + WCHAR *pathW, *groupW, *dependenciesW, *usernameW, *passwordW, *display_nameW; + BOOL r; + + TRACE( "%p %d %d %d %s %s %p %p %s %s %s\n", service, service_type, start_type, + error_control, debugstr_a(path), debugstr_a(group), tag, dependencies, + debugstr_a(username), debugstr_a(password), debugstr_a(display_name) ); + + pathW = heap_strdupAtoW( path ); + groupW = heap_strdupAtoW( group ); + dependenciesW = heap_strdup_multi_AtoW( dependencies ); + usernameW = heap_strdupAtoW( username ); + passwordW = heap_strdupAtoW( password ); + display_nameW = heap_strdupAtoW( display_name ); + + r = ChangeServiceConfigW( service, service_type, start_type, error_control, pathW, + groupW, tag, dependenciesW, usernameW, passwordW, display_nameW ); + + heap_free( pathW ); + heap_free( groupW ); + heap_free( dependenciesW ); + heap_free( usernameW ); + heap_free( passwordW ); + heap_free( display_nameW ); + + return r; +} + +/****************************************************************************** + * ChangeServiceConfigW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfigW( SC_HANDLE service, DWORD service_type, DWORD start_type, + DWORD error_control, const WCHAR *path, const WCHAR *group, + DWORD *tag, const WCHAR *dependencies, const WCHAR *username, + const WCHAR *password, const WCHAR *display_name ) +{ + DWORD password_size; + DWORD err; + + TRACE( "%p %d %d %d %s %s %p %p %s %s %s\n", service, service_type, start_type, + error_control, debugstr_w(path), debugstr_w(group), tag, dependencies, + debugstr_w(username), debugstr_w(password), debugstr_w(display_name) ); + + password_size = password ? (wcslen(password) + 1) * sizeof(WCHAR) : 0; + + __TRY + { + err = svcctl_ChangeServiceConfigW( service, service_type, start_type, error_control, path, group, tag, + (const BYTE *)dependencies, multisz_size(dependencies), username, + (const BYTE *)password, password_size, display_name ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * QueryServiceConfigA (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfigA( SC_HANDLE service, QUERY_SERVICE_CONFIGA *config, + DWORD size, DWORD *ret_size ) +{ + DWORD n; + char *p, *buffer; + BOOL ret; + QUERY_SERVICE_CONFIGW *configW; + + TRACE( "%p %p %d %p\n", service, config, size, ret_size ); + + if (!(buffer = heap_alloc( 2 * size ))) return set_error( ERROR_NOT_ENOUGH_MEMORY ); + configW = (QUERY_SERVICE_CONFIGW *)buffer; + ret = QueryServiceConfigW( service, configW, 2 * size, ret_size ); + if (!ret) goto done; + + config->dwServiceType = configW->dwServiceType; + config->dwStartType = configW->dwStartType; + config->dwErrorControl = configW->dwErrorControl; + config->lpBinaryPathName = NULL; + config->lpLoadOrderGroup = NULL; + config->dwTagId = configW->dwTagId; + config->lpDependencies = NULL; + config->lpServiceStartName = NULL; + config->lpDisplayName = NULL; + + p = (char *)(config + 1); + n = size - sizeof(*config); + ret = FALSE; + +#define MAP_STR(str) \ + do { \ + if (configW->str) \ + { \ + DWORD sz = WideCharToMultiByte( CP_ACP, 0, configW->str, -1, p, n, NULL, NULL ); \ + if (!sz) goto done; \ + config->str = p; \ + p += sz; \ + n -= sz; \ + } \ + } while (0) + + MAP_STR( lpBinaryPathName ); + MAP_STR( lpLoadOrderGroup ); + MAP_STR( lpDependencies ); + MAP_STR( lpServiceStartName ); + MAP_STR( lpDisplayName ); +#undef MAP_STR + + *ret_size = p - (char *)config; + ret = TRUE; + +done: + heap_free( buffer ); + return ret; +} + +static DWORD move_string_to_buffer(BYTE **buf, WCHAR **string_ptr) +{ + DWORD cb; + + if (!*string_ptr) + { + cb = sizeof(WCHAR); + memset(*buf, 0, cb); + } + else + { + cb = (wcslen( *string_ptr ) + 1) * sizeof(WCHAR); + memcpy(*buf, *string_ptr, cb); + MIDL_user_free( *string_ptr ); + } + + *string_ptr = (WCHAR *)*buf; + *buf += cb; + + return cb; +} + +static DWORD size_string( const WCHAR *string ) +{ + return (string ? (wcslen( string ) + 1) * sizeof(WCHAR) : sizeof(WCHAR)); +} + +/****************************************************************************** + * QueryServiceConfigW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfigW( SC_HANDLE service, QUERY_SERVICE_CONFIGW *ret_config, + DWORD size, DWORD *ret_size ) +{ + QUERY_SERVICE_CONFIGW config; + DWORD total; + DWORD err; + BYTE *bufpos; + + TRACE( "%p %p %d %p\n", service, ret_config, size, ret_size ); + + memset(&config, 0, sizeof(config)); + + __TRY + { + err = svcctl_QueryServiceConfigW( service, &config, size, ret_size ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (err) return set_error( err ); + + /* calculate the size required first */ + total = sizeof(QUERY_SERVICE_CONFIGW); + total += size_string( config.lpBinaryPathName ); + total += size_string( config.lpLoadOrderGroup ); + total += size_string( config.lpDependencies ); + total += size_string( config.lpServiceStartName ); + total += size_string( config.lpDisplayName ); + + *ret_size = total; + + /* if there's not enough memory, return an error */ + if (size < total) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + MIDL_user_free( config.lpBinaryPathName ); + MIDL_user_free( config.lpLoadOrderGroup ); + MIDL_user_free( config.lpDependencies ); + MIDL_user_free( config.lpServiceStartName ); + MIDL_user_free( config.lpDisplayName ); + return FALSE; + } + + *ret_config = config; + bufpos = ((BYTE *)ret_config) + sizeof(QUERY_SERVICE_CONFIGW); + move_string_to_buffer( &bufpos, &ret_config->lpBinaryPathName ); + move_string_to_buffer( &bufpos, &ret_config->lpLoadOrderGroup ); + move_string_to_buffer( &bufpos, &ret_config->lpDependencies ); + move_string_to_buffer( &bufpos, &ret_config->lpServiceStartName ); + move_string_to_buffer( &bufpos, &ret_config->lpDisplayName ); + + TRACE( "Image path = %s\n", debugstr_w( ret_config->lpBinaryPathName ) ); + TRACE( "Group = %s\n", debugstr_w( ret_config->lpLoadOrderGroup ) ); + TRACE( "Dependencies = %s\n", debugstr_w( ret_config->lpDependencies ) ); + TRACE( "Service account name = %s\n", debugstr_w( ret_config->lpServiceStartName ) ); + TRACE( "Display name = %s\n", debugstr_w( ret_config->lpDisplayName ) ); + + return TRUE; +} + +/****************************************************************************** + * QueryServiceConfig2A (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2A( SC_HANDLE service, DWORD level, BYTE *buffer, + DWORD size, DWORD *ret_size ) +{ + BYTE *bufferW = NULL; + + TRACE( "%p %u %p %u %p\n", service, level, buffer, size, ret_size ); + + if (buffer && size) + bufferW = heap_alloc( size ); + + if (!QueryServiceConfig2W( service, level, bufferW, size, ret_size )) + { + heap_free( bufferW ); + return FALSE; + } + + switch (level) + { + case SERVICE_CONFIG_DESCRIPTION: + if (buffer && bufferW) { + SERVICE_DESCRIPTIONA *configA = (SERVICE_DESCRIPTIONA *)buffer; + SERVICE_DESCRIPTIONW *configW = (SERVICE_DESCRIPTIONW *)bufferW; + if (configW->lpDescription && size > sizeof(SERVICE_DESCRIPTIONA)) + { + configA->lpDescription = (char *)(configA + 1); + WideCharToMultiByte( CP_ACP, 0, configW->lpDescription, -1, configA->lpDescription, + size - sizeof(SERVICE_DESCRIPTIONA), NULL, NULL ); + } + else configA->lpDescription = NULL; + } + break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + if (buffer && bufferW && *ret_size <= size) + memcpy(buffer, bufferW, *ret_size); + break; + default: + FIXME("conversion W->A not implemented for level %d\n", level); + heap_free( bufferW ); + return FALSE; + } + + heap_free( bufferW ); + return TRUE; +} + +/****************************************************************************** + * QueryServiceConfig2W (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2W( SC_HANDLE service, DWORD level, BYTE *buffer, + DWORD size, DWORD *ret_size ) +{ + BYTE *bufptr; + DWORD err; + + TRACE( "%p %u %p %u %p\n", service, level, buffer, size, ret_size ); + + if (!buffer && size) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + switch (level) + { + case SERVICE_CONFIG_DESCRIPTION: + if (!(bufptr = heap_alloc( size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + break; + + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + bufptr = buffer; + break; + + default: + FIXME("Level %d not implemented\n", level); + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (!ret_size) + { + if (level == SERVICE_CONFIG_DESCRIPTION) heap_free( bufptr ); + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + __TRY + { + err = svcctl_QueryServiceConfig2W( service, level, bufptr, size, ret_size ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + switch (level) + { + case SERVICE_CONFIG_DESCRIPTION: + { + SERVICE_DESCRIPTIONW *desc = (SERVICE_DESCRIPTIONW *)buffer; + struct service_description *s = (struct service_description *)bufptr; + + if (err != ERROR_SUCCESS && err != ERROR_INSUFFICIENT_BUFFER) + { + heap_free( bufptr ); + SetLastError( err ); + return FALSE; + } + + /* adjust for potentially larger SERVICE_DESCRIPTIONW structure */ + if (*ret_size == sizeof(*s)) + *ret_size = sizeof(*desc); + else + *ret_size = *ret_size - FIELD_OFFSET(struct service_description, description) + sizeof(*desc); + + if (size < *ret_size) + { + heap_free( bufptr ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (desc) + { + if (!s->size) desc->lpDescription = NULL; + else + { + desc->lpDescription = (WCHAR *)(desc + 1); + memcpy( desc->lpDescription, s->description, s->size ); + } + } + heap_free( bufptr ); + break; + } + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + return set_error( err ); + + default: + break; + } + + return TRUE; +} + +/****************************************************************************** + * GetServiceDisplayNameW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetServiceDisplayNameW( SC_HANDLE manager, const WCHAR *service, + WCHAR *display_name, DWORD *len ) +{ + DWORD err; + DWORD size; + WCHAR buffer[2]; + + TRACE( "%p %s %p %p\n", manager, debugstr_w(service), display_name, len ); + + if (!manager) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + /* provide a buffer if the caller didn't */ + if (!display_name || *len < sizeof(WCHAR)) + { + display_name = buffer; + /* A size of 1 would be enough, but tests show that Windows returns 2, + * probably because of a WCHAR/bytes mismatch in their code. */ + *len = 2; + } + + /* RPC call takes size excluding nul-terminator, whereas *len + * includes the nul-terminator on input. */ + size = *len - 1; + + __TRY + { + err = svcctl_GetServiceDisplayNameW( manager, service, display_name, &size ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + /* The value of *len excludes nul-terminator on output. */ + if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) + *len = size; + return set_error( err ); +} + +/****************************************************************************** + * GetServiceKeyNameW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetServiceKeyNameW( SC_HANDLE manager, const WCHAR *display_name, + WCHAR *key_name, DWORD *len ) +{ + DWORD err; + WCHAR buffer[2]; + DWORD size; + + TRACE( "%p %s %p %p\n", manager, debugstr_w(display_name), key_name, len ); + + if (!manager) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + /* provide a buffer if the caller didn't */ + if (!key_name || *len < 2) + { + key_name = buffer; + /* A size of 1 would be enough, but tests show that Windows returns 2, + * probably because of a WCHAR/bytes mismatch in their code. + */ + *len = 2; + } + + /* RPC call takes size excluding nul-terminator, whereas *len + * includes the nul-terminator on input. */ + size = *len - 1; + + __TRY + { + err = svcctl_GetServiceKeyNameW( manager, display_name, key_name, &size ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + /* The value of *lpcchBuffer excludes nul-terminator on output. */ + if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) + *len = size; + return set_error( err ); +} + +/****************************************************************************** + * StartServiceA (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH StartServiceA( SC_HANDLE service, DWORD argc, const char **argv ) +{ + WCHAR **argvW = NULL; + DWORD i; + BOOL r; + + if (argc) + argvW = heap_alloc( argc * sizeof(WCHAR) ); + + for (i = 0; i < argc; i++) + argvW[i] = heap_strdupAtoW( argv[i] ); + + r = StartServiceW( service, argc, (const WCHAR **)argvW ); + + for (i = 0; i < argc; i++) + heap_free( argvW[i] ); + heap_free( argv ); + return r; +} + + +/****************************************************************************** + * StartServiceW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH StartServiceW( SC_HANDLE service, DWORD argc, const WCHAR **argv ) +{ + DWORD err; + + TRACE( "%p %u %p\n", service, argc, argv ); + + __TRY + { + err = svcctl_StartServiceW( service, argc, argv ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * ControlService (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH ControlService( SC_HANDLE service, DWORD control, SERVICE_STATUS *status ) +{ + DWORD err; + + TRACE( "%p %d %p\n", service, control, status ); + + __TRY + { + err = svcctl_ControlService( service, control, status ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * QueryServiceStatus (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceStatus( SC_HANDLE service, SERVICE_STATUS *status ) +{ + SERVICE_STATUS_PROCESS process_status; + BOOL ret; + DWORD size; + + TRACE( "%p %p\n", service, status ); + + if (!service) return set_error( ERROR_INVALID_HANDLE ); + if (!status) return set_error( ERROR_INVALID_ADDRESS ); + + ret = QueryServiceStatusEx( service, SC_STATUS_PROCESS_INFO, (BYTE *)&process_status, + sizeof(SERVICE_STATUS_PROCESS), &size ); + if (ret) memcpy(status, &process_status, sizeof(SERVICE_STATUS) ); + return ret; +} + +/****************************************************************************** + * QueryServiceStatusEx (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceStatusEx( SC_HANDLE service, SC_STATUS_TYPE level, + BYTE *buffer, DWORD size, DWORD *ret_size ) +{ + DWORD err; + + TRACE( "%p %d %p %d %p\n", service, level, buffer, size, ret_size ); + + if (level != SC_STATUS_PROCESS_INFO) return set_error( ERROR_INVALID_LEVEL ); + + if (size < sizeof(SERVICE_STATUS_PROCESS)) + { + *ret_size = sizeof(SERVICE_STATUS_PROCESS); + return set_error( ERROR_INSUFFICIENT_BUFFER ); + } + + __TRY + { + err = svcctl_QueryServiceStatusEx( service, level, buffer, size, ret_size ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + return set_error( err ); +} + +/****************************************************************************** + * EnumServicesStatusExW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumServicesStatusExW( SC_HANDLE manager, SC_ENUM_TYPE level, DWORD type, DWORD state, + BYTE *buffer, DWORD size, DWORD *needed, DWORD *returned, + DWORD *resume_handle, const WCHAR *group ) +{ + DWORD err, i, offset, buflen, count, total_size = 0; + ENUM_SERVICE_STATUS_PROCESSW *services = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; + struct enum_service_status_process *entry; + const WCHAR *str; + BYTE *buf; + + TRACE( "%p %u 0x%x 0x%x %p %u %p %p %p %s\n", manager, level, type, state, buffer, + size, needed, returned, resume_handle, debugstr_w(group) ); + + if (level != SC_ENUM_PROCESS_INFO) return set_error( ERROR_INVALID_LEVEL ); + if (!manager) return set_error( ERROR_INVALID_HANDLE ); + if (!needed || !returned) return set_error( ERROR_INVALID_ADDRESS ); + + /* make sure we pass a valid pointer */ + buflen = max( size, sizeof(*services) ); + if (!(buf = heap_alloc( buflen ))) return set_error( ERROR_NOT_ENOUGH_MEMORY ); + + __TRY + { + err = svcctl_EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, type, state, buf, buflen, needed, + &count, resume_handle, group ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + *returned = 0; + if (err != ERROR_SUCCESS) + { + /* double the needed size to fit the potentially larger ENUM_SERVICE_STATUS_PROCESSW */ + if (err == ERROR_MORE_DATA) *needed *= 2; + heap_free( buf ); + SetLastError( err ); + return FALSE; + } + + entry = (struct enum_service_status_process *)buf; + for (i = 0; i < count; i++) + { + total_size += sizeof(*services); + if (entry->service_name) + { + str = (const WCHAR *)(buf + entry->service_name); + total_size += (wcslen( str ) + 1) * sizeof(WCHAR); + } + if (entry->display_name) + { + str = (const WCHAR *)(buf + entry->display_name); + total_size += (wcslen( str ) + 1) * sizeof(WCHAR); + } + entry++; + } + + if (total_size > size) + { + heap_free( buf ); + *needed = total_size; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + + offset = count * sizeof(*services); + entry = (struct enum_service_status_process *)buf; + for (i = 0; i < count; i++) + { + DWORD str_size; + str = (const WCHAR *)(buf + entry->service_name); + str_size = (wcslen( str ) + 1) * sizeof(WCHAR); + services[i].lpServiceName = (WCHAR *)((char *)services + offset); + memcpy( services[i].lpServiceName, str, str_size ); + offset += str_size; + + if (!entry->display_name) services[i].lpDisplayName = NULL; + else + { + str = (const WCHAR *)(buf + entry->display_name); + str_size = (wcslen( str ) + 1) * sizeof(WCHAR); + services[i].lpDisplayName = (WCHAR *)((char *)services + offset); + memcpy( services[i].lpDisplayName, str, str_size ); + offset += str_size; + } + services[i].ServiceStatusProcess = entry->service_status_process; + entry++; + } + + heap_free( buf ); + *needed = 0; + *returned = count; + return TRUE; +} + +/****************************************************************************** + * EnumDependentServicesW (sechost.@) + */ +BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, + LPENUM_SERVICE_STATUSW lpServices, DWORD cbBufSize, + LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned ) +{ + FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, + lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); + + *lpServicesReturned = 0; + return TRUE; +} + +/****************************************************************************** + * QueryServiceObjectSecurity (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceObjectSecurity( SC_HANDLE service, SECURITY_INFORMATION type, + PSECURITY_DESCRIPTOR ret_descriptor, DWORD size, DWORD *ret_size ) +{ + SECURITY_DESCRIPTOR descriptor; + NTSTATUS status; + ACL acl; + + FIXME( "%p %d %p %u %p - semi-stub\n", service, type, ret_descriptor, size, ret_size ); + + if (type != DACL_SECURITY_INFORMATION) + FIXME("information %d not supported\n", type); + + InitializeSecurityDescriptor( &descriptor, SECURITY_DESCRIPTOR_REVISION ); + + InitializeAcl( &acl, sizeof(ACL), ACL_REVISION ); + SetSecurityDescriptorDacl( &descriptor, TRUE, &acl, TRUE ); + + status = RtlMakeSelfRelativeSD( &descriptor, ret_descriptor, &size ); + *ret_size = size; + + return set_error( RtlNtStatusToDosError( status ) ); +} + +/****************************************************************************** + * SetServiceObjectSecurity (sechost.@) + */ +BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor) +{ + FIXME("%p %d %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); + return TRUE; +} + +static DWORD WINAPI notify_thread(void *user) +{ + DWORD err; + struct notify_data *data = user; + SC_RPC_NOTIFY_PARAMS_LIST *list = NULL; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; + BOOL dummy; + + __TRY + { + /* GetNotifyResults blocks until there is an event */ + err = svcctl_GetNotifyResults(data->notify_handle, &list); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + EnterCriticalSection( &service_cs ); + + list_remove(&data->entry); + + LeaveCriticalSection( &service_cs ); + + if (err == ERROR_SUCCESS && list) + { + cparams = list->NotifyParamsArray[0].u.params; + + data->notify_buffer->dwNotificationStatus = cparams->dwNotificationStatus; + memcpy(&data->notify_buffer->ServiceStatus, &cparams->ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS)); + data->notify_buffer->dwNotificationTriggered = cparams->dwNotificationTriggered; + data->notify_buffer->pszServiceNames = NULL; + + QueueUserAPC((PAPCFUNC)data->notify_buffer->pfnNotifyCallback, + data->calling_thread, (ULONG_PTR)data->notify_buffer); + + HeapFree(GetProcessHeap(), 0, list); + } + else + WARN("GetNotifyResults server call failed: %u\n", err); + + + __TRY + { + err = svcctl_CloseNotifyHandle(&data->notify_handle, &dummy); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + WARN("CloseNotifyHandle server call failed: %u\n", err); + + CloseHandle(data->calling_thread); + HeapFree(GetProcessHeap(), 0, data); + + return 0; +} + +/****************************************************************************** + * NotifyServiceStatusChangeW (sechost.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DWORD mask, + SERVICE_NOTIFYW *notify_buffer ) +{ + DWORD err; + BOOL b_dummy = FALSE; + GUID g_dummy = {0}; + struct notify_data *data; + + TRACE( "%p 0x%x %p\n", service, mask, notify_buffer ); + + if (!(data = heap_alloc_zero( sizeof(*data) ))) + return ERROR_NOT_ENOUGH_MEMORY; + + data->service = service; + data->notify_buffer = notify_buffer; + if (!DuplicateHandle( GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), + &data->calling_thread, 0, FALSE, DUPLICATE_SAME_ACCESS )) + { + ERR("DuplicateHandle failed: %u\n", GetLastError()); + heap_free( data ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + data->params.dwInfoLevel = 2; + data->params.u.params = &data->cparams; + + data->cparams.dwNotifyMask = mask; + + EnterCriticalSection( &service_cs ); + + __TRY + { + err = svcctl_NotifyServiceStatusChange( service, data->params, &g_dummy, + &g_dummy, &b_dummy, &data->notify_handle ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + { + WARN("NotifyServiceStatusChange server call failed: %u\n", err); + LeaveCriticalSection( &service_cs ); + CloseHandle( data->calling_thread ); + CloseHandle( data->ready_evt ); + heap_free( data ); + return err; + } + + CloseHandle( CreateThread( NULL, 0, &notify_thread, data, 0, NULL ) ); + + list_add_tail( &notify_list, &data->entry ); + + LeaveCriticalSection( &service_cs ); + + return ERROR_SUCCESS; +} + +/* thunk for calling the RegisterServiceCtrlHandler handler function */ +static DWORD WINAPI ctrl_handler_thunk( DWORD control, DWORD type, void *data, void *context ) +{ + LPHANDLER_FUNCTION func = context; + + func( control ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerA (sechost.@) + */ +SERVICE_STATUS_HANDLE WINAPI DECLSPEC_HOTPATCH RegisterServiceCtrlHandlerA( + const char *name, LPHANDLER_FUNCTION handler ) +{ + return RegisterServiceCtrlHandlerExA( name, ctrl_handler_thunk, handler ); +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerW (sechost.@) + */ +SERVICE_STATUS_HANDLE WINAPI DECLSPEC_HOTPATCH RegisterServiceCtrlHandlerW( + const WCHAR *name, LPHANDLER_FUNCTION handler ) +{ + return RegisterServiceCtrlHandlerExW( name, ctrl_handler_thunk, handler ); +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerExA (sechost.@) + */ +SERVICE_STATUS_HANDLE WINAPI DECLSPEC_HOTPATCH RegisterServiceCtrlHandlerExA( + const char *name, LPHANDLER_FUNCTION_EX handler, void *context ) +{ + WCHAR *nameW; + SERVICE_STATUS_HANDLE ret; + + nameW = heap_strdupAtoW( name ); + ret = RegisterServiceCtrlHandlerExW( nameW, handler, context ); + heap_free( nameW ); + return ret; +} + +static struct service_data *find_service_by_name( const WCHAR *name ) +{ + unsigned int i; + + if (nb_services == 1) /* only one service (FIXME: should depend on OWN_PROCESS etc.) */ + return services[0]; + for (i = 0; i < nb_services; i++) + if (!wcsicmp( name, services[i]->name )) return services[i]; + return NULL; +} + +/****************************************************************************** + * RegisterServiceCtrlHandlerExW (sechost.@) + */ +SERVICE_STATUS_HANDLE WINAPI DECLSPEC_HOTPATCH RegisterServiceCtrlHandlerExW( + const WCHAR *name, LPHANDLER_FUNCTION_EX handler, void *context ) +{ + struct service_data *service; + SC_HANDLE handle = 0; + + TRACE( "%s %p %p\n", debugstr_w(name), handler, context ); + + EnterCriticalSection( &service_cs ); + if ((service = find_service_by_name( name ))) + { + service->handler = handler; + service->context = context; + handle = service->handle; + } + LeaveCriticalSection( &service_cs ); + + if (!handle) SetLastError( ERROR_SERVICE_DOES_NOT_EXIST ); + return (SERVICE_STATUS_HANDLE)handle; +} + +/****************************************************************************** + * SetServiceStatus (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetServiceStatus( SERVICE_STATUS_HANDLE service, SERVICE_STATUS *status ) +{ + DWORD err; + + TRACE( "%p %#x %#x %#x %#x %#x %#x %#x\n", service, status->dwServiceType, + status->dwCurrentState, status->dwControlsAccepted, status->dwWin32ExitCode, + status->dwServiceSpecificExitCode, status->dwCheckPoint, status->dwWaitHint ); + + __TRY + { + err = svcctl_SetServiceStatus( service, status ); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!set_error( err )) + return FALSE; + + if (status->dwCurrentState == SERVICE_STOPPED) + { + unsigned int i, count = 0; + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + if (services[i]->handle == (SC_HANDLE)service) continue; + if (services[i]->thread) count++; + } + if (!count) + { + stop_service = TRUE; + SetEvent( service_event ); /* notify the main loop */ + } + LeaveCriticalSection( &service_cs ); + } + + return TRUE; +} + +static WCHAR *service_get_pipe_name(void) +{ + static const WCHAR format[] = L"\\\\.\\pipe\\net\\NtControlPipe%u"; + WCHAR *name; + DWORD len; + HKEY service_current_key; + DWORD service_current; + LONG ret; + DWORD type; + + ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\ServiceCurrent", + 0, KEY_QUERY_VALUE, &service_current_key ); + if (ret != ERROR_SUCCESS) + return NULL; + + len = sizeof(service_current); + ret = RegQueryValueExW( service_current_key, NULL, NULL, &type, + (BYTE *)&service_current, &len ); + RegCloseKey(service_current_key); + if (ret != ERROR_SUCCESS || type != REG_DWORD) + return NULL; + + len = ARRAY_SIZE(format) + 10 /* strlenW("4294967295") */; + name = heap_alloc(len * sizeof(WCHAR)); + if (!name) + return NULL; + + swprintf( name, len, format, service_current ); + return name; +} + +static HANDLE service_open_pipe(void) +{ + WCHAR *pipe_name = service_get_pipe_name(); + HANDLE handle = INVALID_HANDLE_VALUE; + + do + { + handle = CreateFileW( pipe_name, GENERIC_READ|GENERIC_WRITE, + 0, NULL, OPEN_ALWAYS, 0, NULL ); + if (handle != INVALID_HANDLE_VALUE) + break; + if (GetLastError() != ERROR_PIPE_BUSY) + break; + } while (WaitNamedPipeW( pipe_name, NMPWAIT_USE_DEFAULT_WAIT )); + heap_free(pipe_name); + + return handle; +} + +static DWORD WINAPI service_thread( void *arg ) +{ + struct service_data *info = arg; + WCHAR *str = info->args; + DWORD argc = 0, len = 0; + + TRACE("%p\n", arg); + + while (str[len]) + { + len += wcslen( &str[len] ) + 1; + argc++; + } + len++; + + if (info->unicode) + { + WCHAR **argv, *p; + + argv = heap_alloc( (argc+1)*sizeof(*argv) ); + for (argc = 0, p = str; *p; p += wcslen( p ) + 1) + argv[argc++] = p; + argv[argc] = NULL; + + info->proc.w( argc, argv ); + heap_free( argv ); + } + else + { + char *strA, **argv, *p; + DWORD lenA; + + lenA = WideCharToMultiByte( CP_ACP,0, str, len, NULL, 0, NULL, NULL ); + strA = heap_alloc(lenA); + WideCharToMultiByte(CP_ACP,0, str, len, strA, lenA, NULL, NULL); + + argv = heap_alloc( (argc+1)*sizeof(*argv) ); + for (argc = 0, p = strA; *p; p += strlen( p ) + 1) + argv[argc++] = p; + argv[argc] = NULL; + + info->proc.a( argc, argv ); + heap_free( argv ); + heap_free( strA ); + } + return 0; +} + +static DWORD service_handle_start( struct service_data *service, const void *data, DWORD data_size ) +{ + DWORD count = data_size / sizeof(WCHAR); + + if (service->thread) + { + WARN("service is not stopped\n"); + return ERROR_SERVICE_ALREADY_RUNNING; + } + + heap_free( service->args ); + service->args = heap_alloc( (count + 2) * sizeof(WCHAR) ); + if (count) memcpy( service->args, data, count * sizeof(WCHAR) ); + service->args[count++] = 0; + service->args[count++] = 0; + + service->thread = CreateThread( NULL, 0, service_thread, + service, 0, NULL ); + SetEvent( service_event ); /* notify the main loop */ + return 0; +} + +static DWORD service_handle_control( struct service_data *service, DWORD control, const void *data, DWORD data_size ) +{ + DWORD ret = ERROR_INVALID_SERVICE_CONTROL; + + TRACE( "%s control %u data %p data_size %u\n", debugstr_w(service->name), control, data, data_size ); + + if (control == SERVICE_CONTROL_START) + ret = service_handle_start( service, data, data_size ); + else if (service->handler) + ret = service->handler( control, 0, (void *)data, service->context ); + return ret; +} + +static DWORD WINAPI service_control_dispatcher( void *arg ) +{ + struct dispatcher_data *disp = arg; + + /* dispatcher loop */ + while (1) + { + struct service_data *service; + service_start_info info; + BYTE *data = NULL; + WCHAR *name; + BOOL r; + DWORD data_size = 0, count, result; + + r = ReadFile( disp->pipe, &info, FIELD_OFFSET(service_start_info,data), &count, NULL ); + if (!r) + { + if (GetLastError() != ERROR_BROKEN_PIPE) + ERR( "pipe read failed error %u\n", GetLastError() ); + break; + } + if (count != FIELD_OFFSET(service_start_info,data)) + { + ERR( "partial pipe read %u\n", count ); + break; + } + if (count < info.total_size) + { + data_size = info.total_size - FIELD_OFFSET(service_start_info,data); + data = heap_alloc( data_size ); + r = ReadFile( disp->pipe, data, data_size, &count, NULL ); + if (!r) + { + if (GetLastError() != ERROR_BROKEN_PIPE) + ERR( "pipe read failed error %u\n", GetLastError() ); + heap_free( data ); + break; + } + if (count != data_size) + { + ERR( "partial pipe read %u/%u\n", count, data_size ); + heap_free( data ); + break; + } + } + + EnterCriticalSection( &service_cs ); + + /* validate service name */ + name = (WCHAR *)data; + if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) + { + ERR( "got request without valid service name\n" ); + result = ERROR_INVALID_PARAMETER; + goto done; + } + + if (info.magic != SERVICE_PROTOCOL_MAGIC) + { + ERR( "received invalid request for service %s\n", debugstr_w(name) ); + result = ERROR_INVALID_PARAMETER; + goto done; + } + + /* find the service */ + if (!(service = find_service_by_name( name ))) + { + FIXME( "got request for unknown service %s\n", debugstr_w(name) ); + result = ERROR_INVALID_PARAMETER; + goto done; + } + + if (!service->handle) + { + if (!(service->handle = OpenServiceW( disp->manager, name, SERVICE_SET_STATUS )) || + !(service->full_access_handle = OpenServiceW( disp->manager, name, + GENERIC_READ|GENERIC_WRITE ))) + FIXME( "failed to open service %s\n", debugstr_w(name) ); + } + + data_size -= info.name_size * sizeof(WCHAR); + result = service_handle_control(service, info.control, data_size ? + &data[info.name_size * sizeof(WCHAR)] : NULL, data_size); + + done: + LeaveCriticalSection( &service_cs ); + WriteFile( disp->pipe, &result, sizeof(result), &count, NULL ); + heap_free( data ); + } + + CloseHandle( disp->pipe ); + CloseServiceHandle( disp->manager ); + heap_free( disp ); + return 1; +} + +/* wait for services which accept this type of message to become STOPPED */ +static void handle_shutdown_msg(DWORD msg, DWORD accept) +{ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD i, n = 0, sz, timeout = 2000; + ULONGLONG stop_time; + BOOL res, done = TRUE; + SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); + + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + res = QueryServiceStatus( services[i]->full_access_handle, &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) + continue; + + done = FALSE; + + if (accept == SERVICE_ACCEPT_PRESHUTDOWN) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (BYTE *)&spi, sizeof(spi), &sz ); + if (res) + { + FIXME( "service should be able to delay shutdown\n" ); + timeout = max( spi.dwPreshutdownTimeout, timeout ); + } + } + + service_handle_control( services[i], msg, NULL, 0 ); + wait_handles[n++] = services[i]->full_access_handle; + } + LeaveCriticalSection( &service_cs ); + + /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ + timeout = min( timeout, 3000 ); + stop_time = GetTickCount64() + timeout; + + while (!done && GetTickCount64() < stop_time) + { + done = TRUE; + for (i = 0; i < n; i++) + { + res = QueryServiceStatus( wait_handles[i], &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED) + continue; + + done = FALSE; + Sleep( 100 ); + break; + } + } + + HeapFree( GetProcessHeap(), 0, wait_handles ); +} + +static BOOL service_run_main_thread(void) +{ + DWORD i, n, ret; + HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; + UINT wait_services[MAXIMUM_WAIT_OBJECTS]; + struct dispatcher_data *disp = heap_alloc( sizeof(*disp) ); + + disp->manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); + if (!disp->manager) + { + ERR("failed to open service manager error %u\n", GetLastError()); + heap_free( disp ); + return FALSE; + } + + disp->pipe = service_open_pipe(); + if (disp->pipe == INVALID_HANDLE_VALUE) + { + WARN("failed to create control pipe error %u\n", GetLastError()); + CloseServiceHandle( disp->manager ); + heap_free( disp ); + SetLastError( ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ); + return FALSE; + } + + service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + stop_service = FALSE; + + /* FIXME: service_control_dispatcher should be merged into the main thread */ + wait_handles[0] = __wine_make_process_system(); + wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); + wait_handles[2] = service_event; + + TRACE("Starting %d services running as process %d\n", + nb_services, GetCurrentProcessId()); + + /* wait for all the threads to pack up and exit */ + while (!stop_service) + { + EnterCriticalSection( &service_cs ); + for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + { + if (!services[i]->thread) continue; + wait_services[n] = i; + wait_handles[n++] = services[i]->thread; + } + LeaveCriticalSection( &service_cs ); + + ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); + if (!ret) /* system process event */ + { + handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); + handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); + ExitProcess(0); + } + else if (ret == 1) + { + TRACE( "control dispatcher exited, shutting down\n" ); + /* FIXME: we should maybe send a shutdown control to running services */ + ExitProcess(0); + } + else if (ret == 2) + { + continue; /* rebuild the list */ + } + else if (ret < n) + { + i = wait_services[ret]; + EnterCriticalSection( &service_cs ); + CloseHandle( services[i]->thread ); + services[i]->thread = NULL; + LeaveCriticalSection( &service_cs ); + } + else return FALSE; + } + + return TRUE; +} + +/****************************************************************************** + * StartServiceCtrlDispatcherA (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) +{ + struct service_data *info; + unsigned int i; + + TRACE("%p\n", servent); + + if (nb_services) + { + SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); + return FALSE; + } + while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + services = heap_alloc( nb_services * sizeof(*services) ); + + for (i = 0; i < nb_services; i++) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, servent[i].lpServiceName, -1, NULL, 0 ); + DWORD sz = FIELD_OFFSET( struct service_data, name[len] ); + info = heap_alloc_zero( sz ); + MultiByteToWideChar( CP_ACP, 0, servent[i].lpServiceName, -1, info->name, len ); + info->proc.a = servent[i].lpServiceProc; + info->unicode = FALSE; + services[i] = info; + } + + return service_run_main_thread(); +} + +/****************************************************************************** + * StartServiceCtrlDispatcherW (sechost.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) +{ + struct service_data *info; + unsigned int i; + + TRACE("%p\n", servent); + + if (nb_services) + { + SetLastError( ERROR_SERVICE_ALREADY_RUNNING ); + return FALSE; + } + while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + services = heap_alloc( nb_services * sizeof(*services) ); + + for (i = 0; i < nb_services; i++) + { + DWORD len = wcslen( servent[i].lpServiceName ) + 1; + DWORD sz = FIELD_OFFSET( struct service_data, name[len] ); + info = heap_alloc_zero( sz ); + wcscpy( info->name, servent[i].lpServiceName ); + info->proc.w = servent[i].lpServiceProc; + info->unicode = TRUE; + services[i] = info; + } + + return service_run_main_thread(); +} diff --git a/dlls/advapi32/svcctl.idl b/dlls/sechost/svcctl.idl similarity index 100% rename from dlls/advapi32/svcctl.idl rename to dlls/sechost/svcctl.idl -- 2.26.2

1 0

[PATCH 1/5] quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify from the VMR9.
by Zebediah Figura 28 Apr '20

28 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e78d20a4118..4bba6f74319 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -298,7 +298,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 389166db3ed..c847b9c448d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -91,6 +91,11 @@ struct quartz_vmr HANDLE run_event; }; +static inline BOOL is_vmr9(const struct quartz_vmr *filter) +{ + return IsEqualGUID(&filter->renderer.filter.clsid, &CLSID_VideoMixingRenderer9); +} + static inline struct quartz_vmr *impl_from_video_window(struct video_window *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlWindow); @@ -435,7 +440,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M return E_FAIL; } - if (IsEqualGUID(&filter->renderer.filter.clsid, &CLSID_VideoMixingRenderer)) + if (!is_vmr9(filter)) { switch (filter->bmiheader.biBitCount) { @@ -621,7 +626,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) *out = &filter->IVMRMonitorConfig9_iface; - else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless) + else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) + && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter)) *out = &filter->IVMRSurfaceAllocatorNotify_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) && filter->mode == VMR9Mode_Renderless) *out = &filter->IVMRSurfaceAllocatorNotify9_iface; -- 2.26.2

1 4

[PATCH 6/6] include: Add d3d11 video processor capability flags.
by Henri Verbeet 28 Apr '20

28 Apr '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 184353. include/d3d11.idl | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 9ecb3af091a..507cfd012a0 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -360,6 +360,72 @@ typedef enum D3D11_VIDEO_PROCESSOR_ROTATION D3D11_VIDEO_PROCESSOR_ROTATION_270 = 3, } D3D11_VIDEO_PROCESSOR_ROTATION; +typedef enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS +{ + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_LINEAR_SPACE = 0x00000001, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_xvYCC = 0x00000002, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_RGB_RANGE_CONVERSION = 0x00000004, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_YCbCr_MATRIX_CONVERSION = 0x00000008, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_NOMINAL_RANGE = 0x00000010, +} D3D11_VIDEO_PROCESSOR_DEVICE_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS +{ + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_FILL = 0x00000001, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_CONSTRICTION = 0x00000002, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LUMA_KEY = 0x00000004, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_PALETTE = 0x00000008, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LEGACY = 0x00000010, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_STEREO = 0x00000020, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ROTATION = 0x00000040, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM = 0x00000080, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_PIXEL_ASPECT_RATIO = 0x00000100, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR = 0x00000200, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE = 0x00000400, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_METADATA_HDR10 = 0x00000800, +} D3D11_VIDEO_PROCESSOR_FEATURE_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS +{ + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS = 0x00000001, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST = 0x00000002, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE = 0x00000004, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION = 0x00000008, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_NOISE_REDUCTION = 0x00000010, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_EDGE_ENHANCEMENT = 0x00000020, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_ANAMORPHIC_SCALING = 0x00000040, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT = 0x00000080, +} D3D11_VIDEO_PROCESSOR_FILTER_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS +{ + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_INTERLACED = 0x00000001, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_PROCAMP = 0x00000002, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_LUMA_KEY = 0x00000004, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_PALETTE_INTERLACED = 0x00000008, +} D3D11_VIDEO_PROCESSOR_FORMAT_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS +{ + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DENOISE = 0x00000001, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DERINGING = 0x00000002, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_EDGE_ENHANCEMENT = 0x00000004, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_COLOR_CORRECTION = 0x00000008, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_FLESH_TONE_MAPPING = 0x00000010, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_IMAGE_STABILIZATION = 0x00000020, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_SUPER_RESOLUTION = 0x00000040, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_ANAMORPHIC_SCALING = 0x00000080, +} D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_CAPS +{ + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_MONO_OFFSET = 0x00000001, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_ROW_INTERLEAVED = 0x00000002, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_COLUMN_INTERLEAVED = 0x00000004, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_CHECKERBOARD = 0x00000008, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_FLIP_MODE = 0x00000010, +} D3D11_VIDEO_PROCESSOR_STEREO_CAPS; + typedef enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS { D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND = 0x01, -- 2.20.1

1 0

[PATCH 5/6] wined3d: Use DISCARD maps in wined3d_buffer_vk_upload_ranges() if possible.
by Henri Verbeet 28 Apr '20

28 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1444ac9b633..703a8aee70e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1649,6 +1649,7 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc const struct wined3d_range *range; struct wined3d_bo_address dst; unsigned int i = range_count; + uint32_t flags; void *map_ptr; if (!range_count) @@ -1657,7 +1658,10 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc dst.buffer_object = buffer->buffer_object; dst.addr = NULL; - if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, WINED3D_MAP_WRITE))) + flags = WINED3D_MAP_WRITE; + if (!ranges->offset && ranges->size == resource->size) + flags |= WINED3D_MAP_DISCARD; + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n"); return; -- 2.20.1

1 0

[PATCH 4/6] wined3d: Implement WINED3D_MAP_DISCARD support in adapter_vk_map_bo_address().
by Henri Verbeet 28 Apr '20

28 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b6a0eea7852..f9b3e4721a2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -813,8 +813,8 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; + struct wined3d_bo_vk *bo, tmp; VkMappedMemoryRange range; - struct wined3d_bo_vk *bo; void *map_ptr; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) @@ -826,6 +826,19 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if (map_flags & WINED3D_MAP_NOOVERWRITE) goto map; + if ((map_flags & WINED3D_MAP_DISCARD) && bo->command_buffer_id > context_vk->completed_command_buffer_id) + { + if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) + { + wined3d_context_vk_destroy_bo(context_vk, bo); + *bo = tmp; + + goto map; + } + + ERR("Failed to create new buffer object.\n"); + } + if (map_flags & WINED3D_MAP_READ) { if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) -- 2.20.1

1 0

[PATCH 3/6] wined3d: Add Vulkan format information for WINED3DFMT_D24_UNORM_S8_UINT.
by Henri Verbeet 28 Apr '20

28 Apr '20

On some implementations we could use VK_FORMAT_D24_UNORM_S8_UINT instead, but that's not universally supported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index be3ad90107a..5e9673f2c76 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4203,6 +4203,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 2/6] wined3d: Add Vulkan format information for WINED3DFMT_X32_TYPELESS_G8X24_UINT.
by Henri Verbeet 28 Apr '20

28 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b5df4a2b106..be3ad90107a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4202,6 +4202,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 1/6] wined3d: Add Vulkan format information for WINED3DFMT_R32_FLOAT_X8X24_TYPELESS.
by Henri Verbeet 28 Apr '20

28 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0397056441f..b5df4a2b106 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4201,6 +4201,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 1/5] d3dcompiler: Make printed IR a bit more readable.
by Zebediah Figura 28 Apr '20

28 Apr '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dcompiler_43/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0c8b918d139..d24341329d3 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1904,7 +1904,10 @@ static void debug_dump_instr_list(const struct list *list) static void debug_dump_src(const struct hlsl_ir_node *node) { - wine_dbg_printf("%p", node); + if (node->index) + wine_dbg_printf("@%u", node->index); + else + wine_dbg_printf("%p", node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) @@ -2178,7 +2181,10 @@ static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) static void debug_dump_instr(const struct hlsl_ir_node *instr) { - wine_dbg_printf("%4u: %p: ", instr->index, instr); + if (instr->index) + wine_dbg_printf("%4u: ", instr->index); + else + wine_dbg_printf("%p: ", instr); switch (instr->type) { case HLSL_IR_EXPR: -- 2.26.0

4 14

[PATCH] d3dx9/tests: Remove useless '\n' within some ok() messages.
by Matteo Bruni 28 Apr '20

28 Apr '20

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index ae7c5f2010c..81f902291de 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10126,10 +10126,10 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, test_context->device, &mesh_clone); - ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); - ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); /* Check declaration elements */ for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { @@ -10315,8 +10315,7 @@ static void test_valid_mesh(void) } hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); - todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " - "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); + todo_wine ok(hr == tc[i].exp_hr, "Test %u, got unexpected hr %#x, expected %#x.\n", i, hr, tc[i].exp_hr); /* Note errors_and_warnings is deliberately not checked because that * would require copying wast amounts of the text output. */ @@ -10459,8 +10458,7 @@ static void test_optimize_faces(void) hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); - ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++) @@ -10477,15 +10475,13 @@ static void test_optimize_faces(void) hr = D3DXOptimizeFaces(tc[0].indices, tc[0].num_faces, tc[0].num_vertices, tc[0].indices_are_32bit, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " - "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Number of faces must be smaller than 2^15 */ hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, tc[0].num_vertices, FALSE, &smallest_face_remap); - ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " - "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); } static HRESULT clear_normals(ID3DXMesh *mesh) -- 2.24.1

3 2

[PATCH 2/2] fsutil: Add support for creating hardlinks
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

From: Micheal Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22749

1 0

[PATCH 1/2] winbase.h: Support using int for LONG in MSVC interlocked functions.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winbase.h | 53 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-)

1 0

[PATCH] directmanipulation: New stub dll
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] include/xapo.idl: Add XAPO registration flags
by Andrew Eikum 28 Apr '20

28 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- include/xapo.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/xapo.idl b/include/xapo.idl index 7b28ac9f43..841793d4fa 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -20,6 +20,13 @@ import "unknwn.idl"; #define XAPO_REGISTRATION_STRING_LENGTH 256 +cpp_quote("#define XAPO_FLAG_CHANNELS_MUST_MATCH 0x1") +cpp_quote("#define XAPO_FLAG_FRAMERATE_MUST_MATCH 0x2") +cpp_quote("#define XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH 0x4") +cpp_quote("#define XAPO_FLAG_BUFFERCOUNT_MUST_MATCH 0x8") +cpp_quote("#define XAPO_FLAG_INPLACE_SUPPORTED 0x10") +cpp_quote("#define XAPO_FLAG_INPLACE_REQUIRED 0x20") + cpp_quote("#if 0") typedef struct WAVEFORMATEX { -- 2.26.2

1 0

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] server: Delay setting system registers until suspending select is waken.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] server: Don't try to synchronize system registers on not initialized threads in get_thread_context request.
by Jacek Caban 28 Apr '20

28 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[RFC PATCH v3 1/2] ntdll/tests: Test updating TickCount in user_shared_data.
by Rémi Bernon 28 Apr '20

28 Apr '20

Original patch from: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Server-side implementation of USD timestamp updates. The system time check still has some large diffs compared to native after patch #2, probably because of some different clock granularity between server and client. I didn't include an InterruptTime test because depending on the Windows versions, RtlQueryUnbiasedInterruptTime sometimes doesn't match the USD clock. I'm sending it as RFC as it's still a little bit rough on the edges, and I only tested on Linux so far. dlls/ntdll/tests/time.c | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d8..cc6e9f226e63 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static ULONG (WINAPI *pNtGetTickCount)(void); static const int MonthLengths[2][12] = { @@ -153,12 +156,60 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static ULONG64 read_ksystem_time(volatile KSYSTEM_TIME *time) +{ + ULONG64 high, low; + + do + { + high = time->High1Time; + low = time->LowPart; + } + while (high != time->High2Time); + + return high << 32 | low; +} + +static void test_NtGetTickCount(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONG64 usd_time; + ULONG diff; + int i; + + for (i = 0; i < 5; ++i) + { + LARGE_INTEGER system_time; + + if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) + usd_time = ((ULONG64)user_shared_data->TickCountLowDeprecated * user_shared_data->TickCountMultiplier) >> 24; + else + usd_time = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + + if (!pNtGetTickCount) + diff = GetTickCount() - usd_time; + else + diff = pNtGetTickCount() - usd_time; + todo_wine + ok(diff < 100, "NtGetTickCount - USD->TickCount too high, expected < 100 got %d\n", diff); + + usd_time = read_ksystem_time(&user_shared_data->SystemTime); + NtQuerySystemTime(&system_time); + diff = system_time.QuadPart - usd_time; + todo_wine + ok(diff < 100, "NtQuerySystemTime - USD->SystemTime too high, expected < 100 got %d\n", diff); + + Sleep(50); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount"); pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = @@ -169,5 +220,6 @@ START_TEST(time) else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_NtGetTickCount(); test_RtlQueryTimeZoneInformation(); } -- 2.26.1

3 6

[PATCH 2/2 v2] msvcrt: Improve string to double conversion accuracy.
by Piotr Caban 28 Apr '20

28 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 266 +++++++++++++++++++++++------------ dlls/ucrtbase/tests/string.c | 2 +- 2 files changed, 178 insertions(+), 90 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Fix overflow checks in parse_double.
by Piotr Caban 28 Apr '20

28 Apr '20

Old check is optimized out in gcc 9.3.0 when -O2 optimization is enabled. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v5 1/2] find.exe/tests: Add test for multiple files at once
by Fabian Maurer 28 Apr '20

28 Apr '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/tests/find.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b8345034b5..a15b5d2966 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -264,6 +264,56 @@ static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_ run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } +static void run_find_file_multi(void) +{ + char path_temp_file1[MAX_PATH]; + char path_temp_file2[MAX_PATH]; + char path_temp_file3[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + char out_expected[500]; + const char* input = "ab\nbd"; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file1); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file2); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file3); + handle_file = CreateFileA(path_temp_file1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + handle_file = CreateFileA(path_temp_file2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"\"b\" C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs", path_temp_file1, path_temp_file2, path_temp_file3); + + /* Keep file open during the test */ + handle_file = CreateFileA(path_temp_file3, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + CharUpperA(path_temp_file1); + CharUpperA(path_temp_file2); + CharUpperA(path_temp_file3); + wsprintfA(out_expected, + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "File not found - %s\r\n", + path_temp_file1, path_temp_file2, path_temp_file3); + + todo_wine + run_find_stdin_(commandline_new, (BYTE*)"", 0, (BYTE*)out_expected, strlen(out_expected), 0, __FILE__, __LINE__); + + CloseHandle(handle_file); + DeleteFileA(path_temp_file1); + DeleteFileA(path_temp_file2); + DeleteFileA(path_temp_file3); +} + static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); @@ -411,6 +461,7 @@ START_TEST(find) else { test_errors(); + run_find_file_multi(); } test_singleline_without_switches(); test_multiline(); -- 2.26.2

1 1

[PATCH v4 1/6] qcap/videocapture: Store capabilities information.
by Zebediah Figura 28 Apr '20

28 Apr '20

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/v4l.c | 126 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 6fe92d2d0a..53f379d80b 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -93,9 +93,19 @@ static BOOL video_init(void) #endif } +struct caps +{ + __u32 pixelformat; + AM_MEDIA_TYPE media_type; + VIDEOINFOHEADER video_info; + VIDEO_STREAM_CONFIG_CAPS config; +}; + struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; + struct caps *caps; + LONG caps_count; BOOL swresize; struct strmbase_source *pin; @@ -116,13 +126,14 @@ static int xioctl(int fd, int request, void * arg) return r; } -HRESULT qcap_driver_destroy(Capture *capBox) +HRESULT qcap_driver_destroy(Capture *device) { - TRACE("%p\n", capBox); + if (device->fd != -1) + video_close(device->fd); + if (device->caps_count) + heap_free(device->caps); + heap_free(device); - if( capBox->fd != -1 ) - video_close(capBox->fd); - CoTaskMemFree(capBox); return S_OK; } @@ -495,18 +506,55 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("Failed to decommit allocator, hr %#x.\n", hr); } + +static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, + __u32 max_fps, __u32 min_fps, struct caps *caps) +{ + LONG depth = 24; + + caps->video_info.dwBitRate = width * height * depth * max_fps; + caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); + caps->video_info.bmiHeader.biWidth = width; + caps->video_info.bmiHeader.biHeight = height; + caps->video_info.bmiHeader.biPlanes = 1; + caps->video_info.bmiHeader.biBitCount = depth; + caps->video_info.bmiHeader.biCompression = BI_RGB; + caps->video_info.bmiHeader.biSizeImage = width * height * depth / 8; + caps->media_type.majortype = MEDIATYPE_Video; + caps->media_type.subtype = MEDIASUBTYPE_RGB24; + caps->media_type.bFixedSizeSamples = TRUE; + caps->media_type.bTemporalCompression = FALSE; + caps->media_type.lSampleSize = width * height * depth / 8; + caps->media_type.formattype = FORMAT_VideoInfo; + caps->media_type.pUnk = NULL; + caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); + /* We reallocate the caps array, so pbFormat has to be set after all caps + * have been enumerated. */ + caps->config.MaxFrameInterval = 10000000 * max_fps; + caps->config.MinFrameInterval = 10000000 * min_fps;; + caps->config.MaxOutputSize.cx = width; + caps->config.MaxOutputSize.cy = height; + caps->config.MinOutputSize.cx = width; + caps->config.MinOutputSize.cy = height; + caps->config.guid = FORMAT_VideoInfo; + caps->config.MinBitsPerSecond = width * height * depth * min_fps; + caps->config.MaxBitsPerSecond = width * height * depth * max_fps; + caps->pixelformat = pixelformat; +} + Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { + struct v4l2_frmsizeenum frmsize = {0}; struct v4l2_capability caps = {{0}}; struct v4l2_format format = {0}; Capture *device = NULL; BOOL have_libv4l2; char path[20]; - int fd; + int fd, i; have_libv4l2 = video_init(); - if (!(device = CoTaskMemAlloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", card); @@ -559,6 +607,70 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_TRY_FMT, &format) == -1 + || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) + { + ERR("This device doesn't support V4L2_PIX_FMT_BGR24 format.\n"); + goto error; + } + + frmsize.pixel_format = V4L2_PIX_FMT_BGR24; + while (xioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize) != -1) + { + struct v4l2_frmivalenum frmival = {0}; + __u32 max_fps = 30, min_fps = 30; + struct caps *new_caps; + + frmival.pixel_format = format.fmt.pix.pixelformat; + if (frmsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) + { + frmival.width = frmsize.discrete.width; + frmival.height = frmsize.discrete.height; + } + else if (frmsize.type == V4L2_FRMSIZE_TYPE_STEPWISE) + { + frmival.width = frmsize.stepwise.max_width; + frmival.height = frmsize.stepwise.min_height; + } + else + { + FIXME("Unhandled frame size type: %d.\n", frmsize.type); + continue; + } + + if (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) + { + if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) + { + max_fps = frmival.discrete.denominator / frmival.discrete.numerator; + min_fps = max_fps; + } + else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE + || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) + { + max_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + min_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + } + } + else + ERR("Failed to get fps: %s.\n", strerror(errno)); + + new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + if (!new_caps) + goto error; + device->caps = new_caps; + fill_caps(format.fmt.pix.pixelformat, frmsize.discrete.width, frmsize.discrete.height, + max_fps, min_fps, &device->caps[device->caps_count]); + device->caps_count++; + + frmsize.index++; + } + + /* We reallocate the caps array, so we have to delay setting pbFormat. */ + for (i = 0; i < device->caps_count; ++i) + device->caps[i].media_type.pbFormat = (BYTE *)&device->caps[i].video_info; + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) -- 2.26.2

1 5

[PATCH v3 1/6] qcap/videocapture: Store capabilities information.
by Zebediah Figura 28 Apr '20

28 Apr '20

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Clean up qcap_driver_destroy() a bit while we're at it, and use early return in qcap_driver_init() to save a level of indentation. Also fix a bug where pbFormat would be trashed if the array was reallocated. Sorry I didn't catch that one before. dlls/qcap/v4l.c | 126 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 6fe92d2d0a..53f379d80b 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -93,9 +93,19 @@ static BOOL video_init(void) #endif } +struct caps +{ + __u32 pixelformat; + AM_MEDIA_TYPE media_type; + VIDEOINFOHEADER video_info; + VIDEO_STREAM_CONFIG_CAPS config; +}; + struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; + struct caps *caps; + LONG caps_count; BOOL swresize; struct strmbase_source *pin; @@ -116,13 +126,14 @@ static int xioctl(int fd, int request, void * arg) return r; } -HRESULT qcap_driver_destroy(Capture *capBox) +HRESULT qcap_driver_destroy(Capture *device) { - TRACE("%p\n", capBox); + if (device->fd != -1) + video_close(device->fd); + if (device->caps_count) + heap_free(device->caps); + heap_free(device); - if( capBox->fd != -1 ) - video_close(capBox->fd); - CoTaskMemFree(capBox); return S_OK; } @@ -495,18 +506,55 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("Failed to decommit allocator, hr %#x.\n", hr); } + +static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, + __u32 max_fps, __u32 min_fps, struct caps *caps) +{ + LONG depth = 24; + + caps->video_info.dwBitRate = width * height * depth * max_fps; + caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); + caps->video_info.bmiHeader.biWidth = width; + caps->video_info.bmiHeader.biHeight = height; + caps->video_info.bmiHeader.biPlanes = 1; + caps->video_info.bmiHeader.biBitCount = depth; + caps->video_info.bmiHeader.biCompression = BI_RGB; + caps->video_info.bmiHeader.biSizeImage = width * height * depth / 8; + caps->media_type.majortype = MEDIATYPE_Video; + caps->media_type.subtype = MEDIASUBTYPE_RGB24; + caps->media_type.bFixedSizeSamples = TRUE; + caps->media_type.bTemporalCompression = FALSE; + caps->media_type.lSampleSize = width * height * depth / 8; + caps->media_type.formattype = FORMAT_VideoInfo; + caps->media_type.pUnk = NULL; + caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); + /* We reallocate the caps array, so pbFormat has to be set after all caps + * have been enumerated. */ + caps->config.MaxFrameInterval = 10000000 * max_fps; + caps->config.MinFrameInterval = 10000000 * min_fps;; + caps->config.MaxOutputSize.cx = width; + caps->config.MaxOutputSize.cy = height; + caps->config.MinOutputSize.cx = width; + caps->config.MinOutputSize.cy = height; + caps->config.guid = FORMAT_VideoInfo; + caps->config.MinBitsPerSecond = width * height * depth * min_fps; + caps->config.MaxBitsPerSecond = width * height * depth * max_fps; + caps->pixelformat = pixelformat; +} + Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { + struct v4l2_frmsizeenum frmsize = {0}; struct v4l2_capability caps = {{0}}; struct v4l2_format format = {0}; Capture *device = NULL; BOOL have_libv4l2; char path[20]; - int fd; + int fd, i; have_libv4l2 = video_init(); - if (!(device = CoTaskMemAlloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", card); @@ -559,6 +607,70 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_TRY_FMT, &format) == -1 + || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) + { + ERR("This device doesn't support V4L2_PIX_FMT_BGR24 format.\n"); + goto error; + } + + frmsize.pixel_format = V4L2_PIX_FMT_BGR24; + while (xioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize) != -1) + { + struct v4l2_frmivalenum frmival = {0}; + __u32 max_fps = 30, min_fps = 30; + struct caps *new_caps; + + frmival.pixel_format = format.fmt.pix.pixelformat; + if (frmsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) + { + frmival.width = frmsize.discrete.width; + frmival.height = frmsize.discrete.height; + } + else if (frmsize.type == V4L2_FRMSIZE_TYPE_STEPWISE) + { + frmival.width = frmsize.stepwise.max_width; + frmival.height = frmsize.stepwise.min_height; + } + else + { + FIXME("Unhandled frame size type: %d.\n", frmsize.type); + continue; + } + + if (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) + { + if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) + { + max_fps = frmival.discrete.denominator / frmival.discrete.numerator; + min_fps = max_fps; + } + else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE + || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) + { + max_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + min_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + } + } + else + ERR("Failed to get fps: %s.\n", strerror(errno)); + + new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + if (!new_caps) + goto error; + device->caps = new_caps; + fill_caps(format.fmt.pix.pixelformat, frmsize.discrete.width, frmsize.discrete.height, + max_fps, min_fps, &device->caps[device->caps_count]); + device->caps_count++; + + frmsize.index++; + } + + /* We reallocate the caps array, so we have to delay setting pbFormat. */ + for (i = 0; i < device->caps_count; ++i) + device->caps[i].media_type.pbFormat = (BYTE *)&device->caps[i].video_info; + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) -- 2.26.2

2 6

[PATCH v2 3/3] windowscodecs: Add stub implementation for IWICDdsFrameDecode.
by Ziqing Hui 28 Apr '20

28 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 62 ++++++++++++++++++++++++++++++++++ include/wincodec.idl | 28 +++++++++++++++ 2 files changed, 90 insertions(+)

2 1

[PATCH v2 2/3] windowscodecs: Add stub implementation for IWICDdsDecoder.
by Ziqing Hui 28 Apr '20

28 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 60 +++++++++++++++++++++++++++++++--- include/wincodec.idl | 45 +++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-)

2 1

[PATCH v2 1/3] windowscodecs: Add stub for DdsFrameDecode.
by Ziqing Hui 28 Apr '20

28 Apr '20

v2: return hr in GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 155 ++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-)

2 1

[PATCH] msvcrt: Improve string to double conversion accuracy.
by Piotr Caban 28 Apr '20

28 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- This implementation should match with ucrtbase on all inputs. It also passes all chromium string to double conversion tests. dlls/msvcrt/string.c | 266 +++++++++++++++++++++++------------ dlls/ucrtbase/tests/string.c | 2 +- 2 files changed, 178 insertions(+), 90 deletions(-)

2 1

[opengl32] Add stub for wglSwapMultipleBuffers
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

supercedes 183300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] winex11.drv: Handle WM_GETMINMAXINFO while resizing resizable window.
by Jactry Zeng 28 Apr '20

28 Apr '20

This patch only sets minimum tracking width/height when both ptMinTrackSize.x and ptMinTrackSize.y are non-zero value. And it didn't handle ptMaxTrackSize's case. Windows has a more complex behaviour which allows application to set minimum/maximum tracking width or height individually, but this patch already made some applications happy. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/winex11.drv/window.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 52e345ceb6..3c3e4bc9a5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -694,6 +694,19 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; } + else + { + MINMAXINFO minmax; + + memset( &minmax, 0, sizeof(minmax) ); + SendMessageW( data->hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax ); + if (minmax.ptMinTrackSize.x && minmax.ptMinTrackSize.y) + { + size_hints->min_width = minmax.ptMinTrackSize.x; + size_hints->min_height = minmax.ptMinTrackSize.y; + size_hints->flags |= PMinSize; + } + } } XSetWMNormalHints( data->display, data->whole_window, size_hints ); XFree( size_hints ); -- 2.26.2

1 0

[PATCH v3 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Remove warnings Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/2] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Added more checks and tests >From : Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju 28 Apr '20

28 Apr '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[website v2] zh-cn: Update forums page.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/forums.template | 81 +++++++++++++++------------------ 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a33228fa..7304801e 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -1,18 +1,17 @@  - <h1 class="title">主要的邮件列表/论坛</h1> - Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： +Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： <ul> - <li><a href="//forums.winehq.org"> WineHQ 论坛</a></li> + <li><a href="//forum.winehq.org">WineHQ 论坛</a></li> - <li> Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> + <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce"> Wine-Announce 邮件列表 </a></li> + <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul> 请不要新建英文的 Wine 论坛了（除非是一个流行发行版主要论坛上的 Wine 板块）。 @@ -22,90 +21,84 @@ <h2>所有 WineHQ 邮件列表</h2> WineHQ 分别有用于提交 patches、追踪 Git 提交、讨论 Wine 的邮件列表。他们拥有可定制的用户订阅配置，可以<a href="//www.winehq.org/mailman/listinfo">通过 -WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表名称-request(a)winehq.org 来订阅。 -如果想取消订阅，则使用“unsubscribe 密码”作为标题，密码是你在你订阅时获得的。 +WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <code><指定列表名称>-request(a)winehq.org</code> 来订阅。 +如果想取消订阅，则使用 <code>"unsubscribe <密码>"</code> 作为标题，密码是你在你订阅时获得的。或者直接使用 <a href="//www.winehq.org/mailman/listinfo">Mailman web 界面</a>。 +<div class="alert alert-warning"> + <h3 class="nomargin-top"> Web 界面需要密码登录</h3> + + 因为邮件列表不断得受到爬虫干扰，访问 Mailman 的 web 界面开启了密码保护。 + + + 用户名： <code>mailman</code> + 密码： <code>getalist</code> + + 密码会时不时更新，请从这里获取最新的密码。 +</div> + 注意： 你必须订阅后才能发送邮件到列表，否则你的邮件将被邮件列表软件判定为垃圾邮件。 <ul class="roomy"> <li> + <a href="mailto:wine-announce@winehq.org">wine-announce(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] - <a href="mailto:wine-announce@winehq.org">wine-announce(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] 一个低流量（2封/月）的只读列表，用于宣布发布和其他主要的 Wine 或者 WineHQ 消息。 </li> <li> - [<a href="//www.winehq.org/pipermail/wine-users/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">存档 2</a>] - 一个中等流量（50封/天）的开放性列表，用于终端用户讨论。 - </li> - - <li> + <a href="mailto:wine-zh@freelists.org">wine-zh(a)freelists.org</a> [<a href="http://www.freelists.org/list/wine-zh">（取消）订阅</a>] - [<a href="http://www.freelists.org/archive/wine-zh/">存档</a>] - <a href="mailto:wine-zh@freelists.org">wine-zh(a)freelists.org</a> + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] 一个低流量（10封/天）的开放性列表，用于中文终端用户讨论。 </li> <li> + <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] - <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] + 一个已经废弃的用于提交补丁的列表。请使用 <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> 代替。 </li> <li> + <a href="mailto:wine-cvs@winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] - <a href="mailto:wine-cvs@winehq.org">wine-cvs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li> <li> + <a href="mailto:wine-releases@winehq.org">wine-releases(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] - <a href="mailto:wine-releases@winehq.org">wine-releases(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] 一个低流量（2封/月）的只读列表，用于接收每个 Wine official release 的大体积 diff 文件。 </li> <li> - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">存档 1</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] - - 已经关闭的列表，用于讨论与 Wine 有关的法律议题，包括许可证议题。（关闭于 2004-12-16） - </li> - - <li> + <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-bugs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] - <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li> <li> + <a href="mailto:wine-tests-results@winehq.org">wine-tests-results(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-tests-results">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] - <a href="mailto:wine-tests-results@winehq.org">wine-tests-results(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] 一个中等流量（10封/天）的开放性列表，用于提交测试结果。 </li> -- 2.26.2

1 0

[PATCH v2 6/6] qcap/videocapture: Reimplement source_get_media_type().
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/vfwcapture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 967bdba22e..14542ec7fc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -522,11 +522,13 @@ static HRESULT source_get_media_type(struct strmbase_pin *pin, VfwCapture *filter = impl_from_strmbase_pin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; + LONG count; - if (iPosition > 0) + count = qcap_driver_get_caps_count(filter->driver_info); + if (iPosition >= count) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(filter->driver_info, &vfw_pmt); + hr = qcap_driver_get_caps(filter->driver_info, iPosition, &vfw_pmt, NULL); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt); -- 2.26.2

1 0

[PATCH v2 5/6] qcap/videocapture: Implement IAMStreamConfig_GetStreamCaps().
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/videocapture.c | 22 ++++++++++++++++++++++ dlls/qcap/v4l.c | 19 +++++++++++++++++++ dlls/qcap/vfwcapture.c | 11 +++++++---- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index e34c33fb0f..f67936d15b 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -27,6 +27,7 @@ Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_caps(Capture *device,LONG index,AM_MEDIA_TYPE **pmt,BYTE *vscc) DECLSPEC_HIDDEN; LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index ab9e19b461..448136791b 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -64,6 +64,7 @@ static void test_stream_config(IPin *pin) { VIDEOINFOHEADER *video_info, *video_info2; AM_MEDIA_TYPE *format, *format2; + VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; LONG depth, compression; LONG count, size; @@ -127,6 +128,12 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, NULL, &size); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, NULL, (BYTE *)&vscc); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, &size); @@ -134,6 +141,21 @@ static void test_stream_config(IPin *pin) ok(count != 0xdeadbeef, "Got wrong count: %d.\n", count); ok(size == sizeof(VIDEO_STREAM_CONFIG_CAPS), "Got wrong size: %d.\n", size); + hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, NULL, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + FreeMediaType(format); + IAMStreamConfig_Release(stream_config); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 33e05dd545..6af456aae7 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -625,6 +625,20 @@ error: return NULL; } +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **type, BYTE *vscc) +{ + if (index >= device->caps_count) + return S_FALSE; + + *type = CreateMediaType(&device->caps[index].media_type); + if (!*type) + return E_OUTOFMEMORY; + + if (vscc) + memcpy(vscc, &device->caps[index].config, sizeof(VIDEO_STREAM_CONFIG_CAPS)); + return S_OK; +} + LONG qcap_driver_get_caps_count(Capture *device) { return device->caps_count; @@ -704,6 +718,11 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("v4l absent: shouldn't be called\n"); } +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **type, BYTE *vscc) +{ + FAIL_WITH_ERR; +} + LONG qcap_driver_get_caps_count(Capture *device) { ERR("v4l absent: shouldn't be called\n"); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 652b213ccc..967bdba22e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -259,11 +259,14 @@ AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int * } static HRESULT WINAPI -AMStreamConfig_GetStreamCaps( IAMStreamConfig *iface, int iIndex, - AM_MEDIA_TYPE **pmt, BYTE *pSCC ) +AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, int index, + AM_MEDIA_TYPE **pmt, BYTE *vscc) { - FIXME("%p: %d %p %p - stub, intentional\n", iface, iIndex, pmt, pSCC); - return E_NOTIMPL; /* Not implemented for this interface */ + VfwCapture *This = impl_from_IAMStreamConfig(iface); + + TRACE("(%p, %d, %p, %p).\n", iface, index, pmt, vscc); + + return qcap_driver_get_caps(This->driver_info, index, pmt, vscc); } static const IAMStreamConfigVtbl IAMStreamConfig_VTable = -- 2.26.2

1 0

[PATCH v2 4/6] qcap/videocapture: Implement IAMStreamConfig_GetNumberOfCapabilities().
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/videocapture.c | 18 ++++++++++++++++++ dlls/qcap/v4l.c | 11 +++++++++++ dlls/qcap/vfwcapture.c | 19 +++++++++++++------ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index fa48324dd6..e34c33fb0f 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -27,6 +27,7 @@ Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; +LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 39535adece..ab9e19b461 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -66,6 +66,7 @@ static void test_stream_config(IPin *pin) AM_MEDIA_TYPE *format, *format2; IAMStreamConfig *stream_config; LONG depth, compression; + LONG count, size; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -116,6 +117,23 @@ static void test_stream_config(IPin *pin) ok(hr == E_FAIL, "Got hr %#x.\n", hr); FreeMediaType(format); + count = 0xdeadbeef; + size = 0xdeadbeef; + /* Crash on Windows */ + if (0) + { + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, NULL, &size); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count != 0xdeadbeef, "Got wrong count: %d.\n", count); + ok(size == sizeof(VIDEO_STREAM_CONFIG_CAPS), "Got wrong size: %d.\n", size); + IAMStreamConfig_Release(stream_config); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b065478d3a..33e05dd545 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -625,6 +625,11 @@ error: return NULL; } +LONG qcap_driver_get_caps_count(Capture *device) +{ + return device->caps_count; +} + #else Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) @@ -699,4 +704,10 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("v4l absent: shouldn't be called\n"); } +LONG qcap_driver_get_caps_count(Capture *device) +{ + ERR("v4l absent: shouldn't be called\n"); + return 0; +} + #endif /* defined(VIDIOCMCAPTURE) */ diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6c9cc3ce51..652b213ccc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -167,7 +167,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_cleanup_stream = vfw_capture_cleanup_stream, }; -/* AMStreamConfig interface, we only need to implement {G,S}etFormat */ +/* AMStreamConfig interface */ static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out) { VfwCapture *filter = impl_from_IAMStreamConfig(iface); @@ -243,12 +243,19 @@ AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt ) } static HRESULT WINAPI -AMStreamConfig_GetNumberOfCapabilities( IAMStreamConfig *iface, int *piCount, - int *piSize ) +AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int *size) { - FIXME("%p: %p %p - stub, intentional\n", iface, piCount, piSize); - *piCount = 0; - return E_NOTIMPL; /* Not implemented for this interface */ + VfwCapture *This = impl_from_IAMStreamConfig(iface); + + TRACE("(%p, %p, %p).\n", iface, count, size); + + if (!count || !size) + return E_POINTER; + + *count = qcap_driver_get_caps_count(This->driver_info); + *size = sizeof(VIDEO_STREAM_CONFIG_CAPS); + + return S_OK; } static HRESULT WINAPI -- 2.26.2

1 0

[PATCH v2 3/6] qcap/videocapture: Remove code for resizing.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/v4l.c | 84 +++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 66 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 42637d3af8..b065478d3a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -103,11 +103,9 @@ struct caps struct _Capture { - UINT outputwidth, outputheight; const struct caps *current_caps; struct caps *caps; LONG caps_count; - BOOL swresize; struct strmbase_source *pin; int fd, mmap; @@ -199,9 +197,6 @@ static BOOL set_caps(Capture *device, const struct caps *caps) } device->current_caps = caps; - device->outputwidth = width; - device->outputheight = height; - device->swresize = FALSE; return TRUE; } @@ -307,63 +302,26 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, return S_OK; } -static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) +static void reverse_image(const Capture *device, LPBYTE output, const BYTE *input) { - UINT width, height, bitdepth, depth; + int inoffset, outoffset, ow; + UINT width, height, depth; - width = capBox->current_caps->video_info.bmiHeader.biWidth; - height = capBox->current_caps->video_info.bmiHeader.biHeight; - bitdepth = capBox->current_caps->video_info.bmiHeader.biBitCount; - depth = bitdepth / 8; + width = device->current_caps->video_info.bmiHeader.biWidth; + height = device->current_caps->video_info.bmiHeader.biHeight; + depth = device->current_caps->video_info.bmiHeader.biBitCount / 8; /* the whole image needs to be reversed, because the dibs are messed up in windows */ - if (!capBox->swresize) + outoffset = width * height * depth; + ow = width * depth; + inoffset = 0; + while (outoffset > 0) { - int inoffset = 0, outoffset = width * height * depth; - int ow = width * depth; - while (outoffset > 0) - { - int x; - outoffset -= ow; - for (x = 0; x < ow; x++) - output[outoffset + x] = input[inoffset + x]; - inoffset += ow; - } - } - else - { - HDC dc_s, dc_d; - HBITMAP bmp_s, bmp_d; - int inoffset = 0, outoffset = (capBox->outputheight) * capBox->outputwidth * depth; - int ow = capBox->outputwidth * depth; - LPBYTE myarray; - - /* FIXME: Improve software resizing: add error checks and optimize */ - - myarray = CoTaskMemAlloc(capBox->outputwidth * capBox->outputheight * depth); - dc_s = CreateCompatibleDC(NULL); - dc_d = CreateCompatibleDC(NULL); - bmp_s = CreateBitmap(width, height, 1, bitdepth, input); - bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, bitdepth, NULL); - SelectObject(dc_s, bmp_s); - SelectObject(dc_d, bmp_d); - StretchBlt(dc_d, 0, 0, capBox->outputwidth, capBox->outputheight, - dc_s, 0, 0, width, height, SRCCOPY); - GetBitmapBits(bmp_d, capBox->outputwidth * capBox->outputheight * depth, myarray); - while (outoffset > 0) - { - int i; - - outoffset -= ow; - for (i = 0; i < ow; i++) - output[outoffset + i] = myarray[inoffset + i]; - inoffset += ow; - } - CoTaskMemFree(myarray); - DeleteObject(dc_s); - DeleteObject(dc_d); - DeleteObject(bmp_s); - DeleteObject(bmp_d); + int x; + outoffset -= ow; + for (x = 0; x < ow; x++) + output[outoffset + x] = input[inoffset + x]; + inoffset += ow; } } @@ -397,10 +355,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) { int len; - if (!capBox->swresize) - len = width * height * depth; - else - len = capBox->outputheight * capBox->outputwidth * depth; + len = width * height * depth; IMediaSample_SetActualDataLength(pSample, len); len = IMediaSample_GetActualDataLength(pSample); @@ -417,7 +372,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - Resize(capBox, pTarget, image_data); + reverse_image(capBox, pTarget, image_data); hr = IMemInputPin_Receive(capBox->pin->pMemInputPin, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -439,10 +394,7 @@ void qcap_driver_init_stream(Capture *device) HRESULT hr; req_props.cBuffers = 3; - if (!device->swresize) - req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; - else - req_props.cbBuffer = device->outputwidth * device->outputheight; + req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; req_props.cbBuffer = (req_props.cbBuffer * device->current_caps->video_info.bmiHeader.biBitCount) / 8; req_props.cbAlign = 1; req_props.cbPrefix = 0; -- 2.26.2

1 0

[PATCH v2 2/6] qcap/videocapture: Use formats from capabilities instead of hard coding.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 63 ++++++++++ dlls/qcap/v4l.c | 204 ++++++++++++++------------------- dlls/qcap/vfwcapture.c | 3 + 3 files changed, 155 insertions(+), 115 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 5532654650..39535adece 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "dshow.h" #include "wine/test.h" +#include "wine/strmbase.h" static void test_media_types(IPin *pin) { @@ -59,6 +60,65 @@ static void test_media_types(IPin *pin) ok(hr != S_OK, "Got hr %#x.\n", hr); } +static void test_stream_config(IPin *pin) +{ + VIDEOINFOHEADER *video_info, *video_info2; + AM_MEDIA_TYPE *format, *format2; + IAMStreamConfig *stream_config; + LONG depth, compression; + HRESULT hr; + + hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&format->majortype)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format->majortype = MEDIATYPE_Audio; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + format->majortype = MEDIATYPE_Video; + video_info = (VIDEOINFOHEADER *)format->pbFormat; + video_info->bmiHeader.biWidth--; + video_info->bmiHeader.biHeight--; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + depth = video_info->bmiHeader.biBitCount; + compression = video_info->bmiHeader.biCompression; + video_info->bmiHeader.biWidth++; + video_info->bmiHeader.biHeight++; + video_info->bmiHeader.biBitCount = 0; + video_info->bmiHeader.biCompression = 0; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format2->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&format2->majortype)); + video_info2 = (VIDEOINFOHEADER *)format2->pbFormat; + ok(video_info2->bmiHeader.biBitCount == depth, "Got wrong depth: %d.\n", + video_info2->bmiHeader.biBitCount); + ok(video_info2->bmiHeader.biCompression == compression, + "Got wrong compression: %d.\n", video_info2->bmiHeader.biCompression); + FreeMediaType(format2); + + video_info->bmiHeader.biWidth = 10000000; + video_info->bmiHeader.biHeight = 10000000; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + FreeMediaType(format); + + IAMStreamConfig_Release(stream_config); +} + static void test_capture(IBaseFilter *filter) { IEnumPins *enum_pins; @@ -73,7 +133,10 @@ static void test_capture(IBaseFilter *filter) PIN_DIRECTION pin_direction; IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) + { test_media_types(pin); + test_stream_config(pin); + } IPin_Release(pin); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index a370c7583a..42637d3af8 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -103,7 +103,8 @@ struct caps struct _Capture { - UINT width, height, bitDepth, fps, outputwidth, outputheight; + UINT outputwidth, outputheight; + const struct caps *current_caps; struct caps *caps; LONG caps_count; BOOL swresize; @@ -139,126 +140,96 @@ HRESULT qcap_driver_destroy(Capture *capBox) return S_OK; } +static const struct caps *find_caps(Capture *device, const AM_MEDIA_TYPE *mt) +{ + VIDEOINFOHEADER *video_info = (VIDEOINFOHEADER *)mt->pbFormat; + LONG index; + + if (mt->cbFormat < sizeof(VIDEOINFOHEADER) + || !video_info) + return NULL; + + for (index = 0; index < device->caps_count; index++) + { + struct caps *caps = &device->caps[index]; + + if (IsEqualIID(&mt->formattype, &caps->media_type.formattype) + && video_info->bmiHeader.biWidth == caps->video_info.bmiHeader.biWidth + && video_info->bmiHeader.biHeight == caps->video_info.bmiHeader.biHeight) + return caps; + } + return NULL; +} + HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) { - HRESULT hr; TRACE("device %p, mt %p.\n", device, mt); if (!mt) return E_POINTER; if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) - return S_FALSE; + return E_FAIL; + + if (find_caps(device, mt)) + return S_OK; + + return E_FAIL; +} + +static BOOL set_caps(Capture *device, const struct caps *caps) +{ + struct v4l2_format format = {0}; + LONG width, height; + + width = caps->video_info.bmiHeader.biWidth; + height = caps->video_info.bmiHeader.biHeight; - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) && mt->pbFormat - && mt->cbFormat >= sizeof(VIDEOINFOHEADER)) + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + format.fmt.pix.pixelformat = caps->pixelformat; + format.fmt.pix.width = width; + format.fmt.pix.height = height; + if (xioctl(device->fd, VIDIOC_S_FMT, &format) == -1 + || format.fmt.pix.pixelformat != caps->pixelformat + || format.fmt.pix.width != width + || format.fmt.pix.height != height) { - VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; - if (vih->bmiHeader.biBitCount == 24 && vih->bmiHeader.biCompression == BI_RGB) - hr = S_OK; - else - { - FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, - vih->bmiHeader.biBitCount); - hr = S_FALSE; - } + ERR("Failed to set pixel format: %s.\n", strerror(errno)); + return FALSE; } - else - hr = VFW_E_INVALIDMEDIATYPE; - return hr; + device->current_caps = caps; + device->outputwidth = width; + device->outputheight = height; + device->swresize = FALSE; + + return TRUE; } HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) { - struct v4l2_format format = {0}; - int newheight, newwidth; - VIDEOINFOHEADER *vih; - int fd = device->fd; - HRESULT hr; + const struct caps *caps; - if (FAILED(hr = qcap_driver_check_format(device, mt))) - return hr; - vih = (VIDEOINFOHEADER *)mt->pbFormat; - - newwidth = vih->bmiHeader.biWidth; - newheight = vih->bmiHeader.biHeight; + caps = find_caps(device, mt); + if (!caps) + return E_FAIL; - if (device->height == newheight && device->width == newwidth) + if (device->current_caps == caps) return S_OK; - format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) - { - ERR("Failed to get current format: %s\n", strerror(errno)); + if (!set_caps(device, caps)) return VFW_E_TYPE_NOT_ACCEPTED; - } - format.fmt.pix.width = newwidth; - format.fmt.pix.height = newheight; - - if (!xioctl(fd, VIDIOC_S_FMT, &format) - && format.fmt.pix.width == newwidth - && format.fmt.pix.height == newheight) - { - device->width = newwidth; - device->height = newheight; - device->swresize = FALSE; - } - else - { - TRACE("Using software resize: %dx%d -> %dx%d.\n", - format.fmt.pix.width, format.fmt.pix.height, device->width, device->height); - device->swresize = TRUE; - } - device->outputwidth = format.fmt.pix.width; - device->outputheight = format.fmt.pix.height; return S_OK; } -HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) +HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) { - VIDEOINFOHEADER *vi; - - mT[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - if (!mT[0]) - return E_OUTOFMEMORY; - vi = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)); - mT[0]->cbFormat = sizeof(VIDEOINFOHEADER); - if (!vi) - { - CoTaskMemFree(mT[0]); - mT[0] = NULL; + *mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!*mt) return E_OUTOFMEMORY; - } - mT[0]->majortype = MEDIATYPE_Video; - mT[0]->subtype = MEDIASUBTYPE_RGB24; - mT[0]->formattype = FORMAT_VideoInfo; - mT[0]->bFixedSizeSamples = TRUE; - mT[0]->bTemporalCompression = FALSE; - mT[0]->pUnk = NULL; - mT[0]->lSampleSize = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8; - TRACE("Output format: %dx%d - %d bits = %u KB\n", capBox->outputwidth, - capBox->outputheight, capBox->bitDepth, mT[0]->lSampleSize/1024); - vi->rcSource.left = 0; vi->rcSource.top = 0; - vi->rcTarget.left = 0; vi->rcTarget.top = 0; - vi->rcSource.right = capBox->width; vi->rcSource.bottom = capBox->height; - vi->rcTarget.right = capBox->outputwidth; vi->rcTarget.bottom = capBox->outputheight; - vi->dwBitRate = capBox->fps * mT[0]->lSampleSize; - vi->dwBitErrorRate = 0; - vi->AvgTimePerFrame = (LONGLONG)10000000.0 / (LONGLONG)capBox->fps; - vi->bmiHeader.biSize = 40; - vi->bmiHeader.biWidth = capBox->outputwidth; - vi->bmiHeader.biHeight = capBox->outputheight; - vi->bmiHeader.biPlanes = 1; - vi->bmiHeader.biBitCount = 24; - vi->bmiHeader.biCompression = BI_RGB; - vi->bmiHeader.biSizeImage = mT[0]->lSampleSize; - vi->bmiHeader.biClrUsed = vi->bmiHeader.biClrImportant = 0; - vi->bmiHeader.biXPelsPerMeter = 100; - vi->bmiHeader.biYPelsPerMeter = 100; - mT[0]->pbFormat = (void *)vi; - return S_OK; + + return CopyMediaType(*mt, &device->current_caps->media_type); } static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) @@ -338,13 +309,18 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { + UINT width, height, bitdepth, depth; + + width = capBox->current_caps->video_info.bmiHeader.biWidth; + height = capBox->current_caps->video_info.bmiHeader.biHeight; + bitdepth = capBox->current_caps->video_info.bmiHeader.biBitCount; + depth = bitdepth / 8; /* the whole image needs to be reversed, because the dibs are messed up in windows */ if (!capBox->swresize) { - int depth = capBox->bitDepth / 8; - int inoffset = 0, outoffset = capBox->height * capBox->width * depth; - int ow = capBox->width * depth; + int inoffset = 0, outoffset = width * height * depth; + int ow = width * depth; while (outoffset > 0) { int x; @@ -358,7 +334,6 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { HDC dc_s, dc_d; HBITMAP bmp_s, bmp_d; - int depth = capBox->bitDepth / 8; int inoffset = 0, outoffset = (capBox->outputheight) * capBox->outputwidth * depth; int ow = capBox->outputwidth * depth; LPBYTE myarray; @@ -368,12 +343,12 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) myarray = CoTaskMemAlloc(capBox->outputwidth * capBox->outputheight * depth); dc_s = CreateCompatibleDC(NULL); dc_d = CreateCompatibleDC(NULL); - bmp_s = CreateBitmap(capBox->width, capBox->height, 1, capBox->bitDepth, input); - bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, capBox->bitDepth, NULL); + bmp_s = CreateBitmap(width, height, 1, bitdepth, input); + bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, bitdepth, NULL); SelectObject(dc_s, bmp_s); SelectObject(dc_d, bmp_d); StretchBlt(dc_d, 0, 0, capBox->outputwidth, capBox->outputheight, - dc_s, 0, 0, capBox->width, capBox->height, SRCCOPY); + dc_s, 0, 0, width, height, SRCCOPY); GetBitmapBits(bmp_d, capBox->outputwidth * capBox->outputheight * depth, myarray); while (outoffset > 0) { @@ -400,8 +375,12 @@ static DWORD WINAPI ReadThread(LPVOID lParam) ULONG framecount = 0; unsigned char *pTarget, *image_data; unsigned int image_size; + UINT width, height, depth; - image_size = capBox->height * capBox->width * 3; + width = capBox->current_caps->video_info.bmiHeader.biWidth; + height = capBox->current_caps->video_info.bmiHeader.biHeight; + depth = capBox->current_caps->video_info.bmiHeader.biBitCount / 8; + image_size = width * height * 3; if (!(image_data = heap_alloc(image_size))) { ERR("Failed to allocate memory.\n"); @@ -419,9 +398,9 @@ static DWORD WINAPI ReadThread(LPVOID lParam) int len; if (!capBox->swresize) - len = capBox->height * capBox->width * capBox->bitDepth / 8; + len = width * height * depth; else - len = capBox->outputheight * capBox->outputwidth * capBox->bitDepth / 8; + len = capBox->outputheight * capBox->outputwidth * depth; IMediaSample_SetActualDataLength(pSample, len); len = IMediaSample_GetActualDataLength(pSample); @@ -461,10 +440,10 @@ void qcap_driver_init_stream(Capture *device) req_props.cBuffers = 3; if (!device->swresize) - req_props.cbBuffer = device->width * device->height; + req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; else req_props.cbBuffer = device->outputwidth * device->outputheight; - req_props.cbBuffer = (req_props.cbBuffer * device->bitDepth) / 8; + req_props.cbBuffer = (req_props.cbBuffer * device->current_caps->video_info.bmiHeader.biBitCount) / 8; req_props.cbAlign = 1; req_props.cbPrefix = 0; @@ -671,9 +650,7 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } - format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; - if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 - || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) + if (!set_caps(device, &device->caps[0])) { ERR("Failed to set pixel format: %s\n", strerror(errno)); if (!have_libv4l2) @@ -681,16 +658,13 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } - device->outputwidth = device->width = format.fmt.pix.width; - device->outputheight = device->height = format.fmt.pix.height; - device->swresize = FALSE; - device->bitDepth = 24; device->pin = pin; - device->fps = 3; device->state = State_Stopped; device->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - TRACE("Format: %d bpp - %dx%d.\n", device->bitDepth, device->width, device->height); + TRACE("Format: %d bpp - %dx%d.\n", device->current_caps->video_info.bmiHeader.biBitCount, + device->current_caps->video_info.bmiHeader.biWidth, + device->current_caps->video_info.bmiHeader.biHeight); return device; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 4b1d14082a..6c9cc3ce51 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -207,6 +207,9 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return E_POINTER; } + if (!IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video)) + return E_FAIL; + if (This->source.pin.peer) { hr = IPin_QueryAccept(This->source.pin.peer, pmt); -- 2.26.2

1 0

[PATCH v2 1/6] qcap/videocapture: Storage capabilities information.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/v4l.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 6fe92d2d0a..a370c7583a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -93,9 +93,19 @@ static BOOL video_init(void) #endif } +struct caps +{ + __u32 pixelformat; + AM_MEDIA_TYPE media_type; + VIDEOINFOHEADER video_info; + VIDEO_STREAM_CONFIG_CAPS config; +}; + struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; + struct caps *caps; + LONG caps_count; BOOL swresize; struct strmbase_source *pin; @@ -120,9 +130,12 @@ HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); - if( capBox->fd != -1 ) + if (capBox->fd != -1) video_close(capBox->fd); - CoTaskMemFree(capBox); + if (capBox->caps_count) + heap_free(capBox->caps); + heap_free(capBox); + return S_OK; } @@ -495,6 +508,41 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("Failed to decommit allocator, hr %#x.\n", hr); } + +static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, + __u32 max_fps, __u32 min_fps, struct caps *caps) +{ + LONG depth = 24; + + caps->video_info.dwBitRate = width * height * depth * max_fps; + caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); + caps->video_info.bmiHeader.biWidth = width; + caps->video_info.bmiHeader.biHeight = height; + caps->video_info.bmiHeader.biPlanes = 1; + caps->video_info.bmiHeader.biBitCount = depth; + caps->video_info.bmiHeader.biCompression = BI_RGB; + caps->video_info.bmiHeader.biSizeImage = width * height * depth / 8; + caps->media_type.majortype = MEDIATYPE_Video; + caps->media_type.subtype = MEDIASUBTYPE_RGB24; + caps->media_type.bFixedSizeSamples = TRUE; + caps->media_type.bTemporalCompression = FALSE; + caps->media_type.lSampleSize = width * height * depth / 8; + caps->media_type.formattype = FORMAT_VideoInfo; + caps->media_type.pUnk = NULL; + caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); + caps->media_type.pbFormat = (void *)&caps->video_info; + caps->config.MaxFrameInterval = 10000000 * max_fps; + caps->config.MinFrameInterval = 10000000 * min_fps;; + caps->config.MaxOutputSize.cx = width; + caps->config.MaxOutputSize.cy = height; + caps->config.MinOutputSize.cx = width; + caps->config.MinOutputSize.cy = height; + caps->config.guid = FORMAT_VideoInfo; + caps->config.MinBitsPerSecond = width * height * depth * min_fps; + caps->config.MaxBitsPerSecond = width * height * depth * max_fps; + caps->pixelformat = pixelformat; +} + Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { struct v4l2_capability caps = {{0}}; @@ -506,7 +554,7 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) have_libv4l2 = video_init(); - if (!(device = CoTaskMemAlloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", card); @@ -559,6 +607,70 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_TRY_FMT, &format) != -1 + && format.fmt.pix.pixelformat == V4L2_PIX_FMT_BGR24) + { + struct v4l2_frmsizeenum frmsize = {0}; + + frmsize.pixel_format = format.fmt.pix.pixelformat; + while(xioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize) != -1) + { + struct v4l2_frmivalenum frmival = {0}; + __u32 max_fps = 30, min_fps = 30; + struct caps *new_caps; + + frmival.pixel_format = format.fmt.pix.pixelformat; + if (frmsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) + { + frmival.width = frmsize.discrete.width; + frmival.height = frmsize.discrete.height; + } + else if (frmsize.type == V4L2_FRMSIZE_TYPE_STEPWISE) + { + frmival.width = frmsize.stepwise.max_width; + frmival.height = frmsize.stepwise.min_height; + } + else + { + FIXME("Unhandled frame size type: %d.\n", frmsize.type); + continue; + } + + if (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) + { + if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) + { + max_fps = frmival.discrete.denominator / frmival.discrete.numerator; + min_fps = max_fps; + } + else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE + || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) + { + max_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + min_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + } + } + else + ERR("Failed to get fps: %s.\n", strerror(errno)); + + new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + if (!new_caps) + goto error; + device->caps = new_caps; + fill_caps(format.fmt.pix.pixelformat, frmsize.discrete.width, frmsize.discrete.height, + max_fps, min_fps, &device->caps[device->caps_count]); + device->caps_count++; + + frmsize.index++; + } + } + else + { + ERR("This device doesn't support V4L2_PIX_FMT_BGR24 format.\n"); + goto error; + } + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) -- 2.26.2

1 0

[PATCH 2/2]winmm: Fix no sound or recording when use waveform-audio
by dead ash 28 Apr '20

28 Apr '20

from MSDN, the waveInGetDevCaps and waveOutGetDevCaps function of parameter uDeviceID can be either a device identifier or a handle of an open waveform-audio input or output device. now the function not support handle. also same as waveOutOpen and waveInOpen.

3 4

[PATCH 2/2] winmm-wave: fixed waveOutOpen and waveInOpen
by dead ash 28 Apr '20

28 Apr '20

1 0

[PATCH] rpcrt4: Use str/wstr parameters for A/W functions.
by Serge Gautherie 28 Apr '20

28 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab..c1db5ba 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -9,8 +9,8 @@ @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stdcall DceErrorInqTextA (long ptr) -@ stdcall DceErrorInqTextW (long ptr) +@ stdcall DceErrorInqTextA(long str) +@ stdcall DceErrorInqTextW(long wstr) @ stdcall -private DllRegisterServer() @ stub GlobalMutexClearExternal @ stub GlobalMutexRequestExternal @@ -196,7 +196,7 @@ @ stdcall NdrFullPointerQueryPointer(ptr ptr long ptr) @ stdcall NdrFullPointerQueryRefId(ptr long long ptr) @ stdcall NdrFullPointerXlatFree(ptr) -@ stdcall NdrFullPointerXlatInit(long long) +@ stdcall NdrFullPointerXlatInit(long long) @ stdcall NdrGetBuffer(ptr long ptr) @ stub NdrGetDcomProtocolVersion @ stub NdrGetPartialBuffer @@ -341,7 +341,7 @@ @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) -@ stdcall RpcBindingFromStringBindingA(str ptr) +@ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) @ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long) @@ -434,7 +434,7 @@ @ stdcall RpcServerInqDefaultPrincNameW(long ptr) @ stub RpcServerInqIf @ stdcall RpcServerListen(long long long) -@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) +@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) @ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr) @@ -448,8 +448,8 @@ @ stub RpcServerUseAllProtseqsIf @ stub RpcServerUseAllProtseqsIfEx @ stdcall RpcServerUseProtseqA(str long ptr) -@ stdcall RpcServerUseProtseqEpA(str long str ptr) -@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) +@ stdcall RpcServerUseProtseqEpA(str long str ptr) +@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr) @ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) @ stub RpcServerUseProtseqExA @@ -483,9 +483,9 @@ @ stub RpcSsSetClientAllocFree @ stub RpcSsSetThreadHandle @ stub RpcSsSwapClientAllocFree -@ stdcall RpcStringBindingComposeA(str str str str str ptr) +@ stdcall RpcStringBindingComposeA(str str str str str ptr) @ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr) -@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) +@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) @ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr) @ stdcall RpcStringFreeA(ptr) @ stdcall RpcStringFreeW(ptr) -- 2.10.0.windows.1

3 2

[PATCH 1/5] advapi32: Replace usage of internal SERV_ functions with exported functions.
by Zebediah Figura 28 Apr '20

28 Apr '20

From: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/advapi32_misc.h | 3 -- dlls/advapi32/security.c | 70 ++++++++++++++++------------------- dlls/advapi32/service.c | 6 +-- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a648..77b56420ba3 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -32,9 +32,6 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; -DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4bea26d1557..7315f9b51a9 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -415,16 +415,15 @@ static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HAN /* helper function for SE_SERVICE objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) { - SC_HANDLE manager = 0; - DWORD err; - - err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); - if (err == ERROR_SUCCESS) + SC_HANDLE manager = OpenSCManagerW( NULL, NULL, access ); + if (manager) { - err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + *service = OpenServiceW( manager, full_service_name, access); CloseServiceHandle( manager ); + if (*service) + return ERROR_SUCCESS; } - return err; + return GetLastError(); } /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ @@ -1779,16 +1778,13 @@ BOOL WINAPI PrivilegedServiceAuditAlarmA( LPCSTR SubsystemName, LPCSTR ServiceNa * RETURNS * ERROR_SUCCESS if all's well, and a WIN32 error code otherwise. */ -DWORD WINAPI GetSecurityInfo( - HANDLE hObject, SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, PSID *ppsidOwner, - PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, - PSECURITY_DESCRIPTOR *ppSecurityDescriptor -) +DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFORMATION SecurityInfo, + PSID *ppsidOwner, PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, + PSECURITY_DESCRIPTOR *ppSecurityDescriptor ) { PSECURITY_DESCRIPTOR sd; NTSTATUS status; - ULONG n1, n2; + ULONG size; BOOL present, defaulted; /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ @@ -1802,35 +1798,33 @@ DWORD WINAPI GetSecurityInfo( || ((SecurityInfo & SACL_SECURITY_INFORMATION) && !ppSacl) )) return ERROR_INVALID_PARAMETER; - switch (ObjectType) + if (type == SE_SERVICE) { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); - break; - } - if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) - return RtlNtStatusToDosError(status); + if (!QueryServiceObjectSecurity( handle, SecurityInfo, NULL, 0, &size ) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); - sd = LocalAlloc(0, n1); - if (!sd) - return ERROR_NOT_ENOUGH_MEMORY; + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; - switch (ObjectType) - { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); - break; + if (!QueryServiceObjectSecurity( handle, SecurityInfo, sd, size, &size )) + { + LocalFree(sd); + return GetLastError(); + } } - if (status != STATUS_SUCCESS) + else { - LocalFree(sd); - return RtlNtStatusToDosError(status); + status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + return RtlNtStatusToDosError( status ); + + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; + + if ((status = NtQuerySecurityObject( handle, SecurityInfo, sd, size, &size ))) + { + LocalFree(sd); + return RtlNtStatusToDosError( status ); + } } if (ppsidOwner) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 231f0267e98..2781a128239 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -897,7 +897,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, +static DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD r; @@ -1049,7 +1049,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, +static DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD err; @@ -2484,7 +2484,7 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, +static NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) -- 2.26.2

2 5

[PATCH] quartz/tests: Relax a test for PresentImage().
by Zebediah Figura 28 Apr '20

28 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 35776e85ff7..e78d20a4118 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2704,12 +2704,12 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) thread = send_frame(input); hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.26.2

1 1

[PATCH] rpcrt4: Add NdrCreateServerInterfaceFromStub() stub.
by Serge Gautherie 28 Apr '20

28 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=70704. I confirm it is already on XP x86. Follow-up to 98eaef3ad945eae570f92184725115613f6a3951. Sorry. --- dlls/rpcrt4/rpcrt4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab..64b46d5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -123,6 +123,7 @@ @ stdcall NdrByteCountPointerFree(ptr ptr ptr) @ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) @ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long) +@ stub NdrCreateServerInterfaceFromStub @ stdcall NdrCStdStubBuffer2_Release(ptr ptr) @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) -- 2.10.0.windows.1

1 0

[PATCH 1/2] quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Zebediah Figura 27 Apr '20

27 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7196f79a54..a5b52425b0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_DSoundRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AudioRender, &CLSID_LegacyAmFilterCategory, L"Audio Renderer", -- 2.26.2

1 1

[PATCH] ksproxy.ax: New stub DLL.
by Zebediah Figura 27 Apr '20

27 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47688 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 1 + dlls/ksproxy.ax/Makefile.in | 3 +++ dlls/ksproxy.ax/ksproxy.ax.spec | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 dlls/ksproxy.ax/Makefile.in create mode 100644 dlls/ksproxy.ax/ksproxy.ax.spec diff --git a/configure.ac b/configure.ac index 63991f8614..ca7ac9f45a 100644 --- a/configure.ac +++ b/configure.ac @@ -3381,6 +3381,7 @@ WINE_CONFIG_MAKEFILE(dlls/kernelbase/tests) WINE_CONFIG_MAKEFILE(dlls/keyboard.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/krnl386.exe16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/ksecdd.sys) +WINE_CONFIG_MAKEFILE(dlls/ksproxy.ax) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) diff --git a/dlls/ksproxy.ax/Makefile.in b/dlls/ksproxy.ax/Makefile.in new file mode 100644 index 0000000000..db6565855d --- /dev/null +++ b/dlls/ksproxy.ax/Makefile.in @@ -0,0 +1,3 @@ +MODULE = ksproxy.ax + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ksproxy.ax/ksproxy.ax.spec b/dlls/ksproxy.ax/ksproxy.ax.spec new file mode 100644 index 0000000000..db7e2112f0 --- /dev/null +++ b/dlls/ksproxy.ax/ksproxy.ax.spec @@ -0,0 +1,10 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub KsGetMediaType +@ stub KsGetMediaTypeCount +@ stub KsGetMultiplePinFactoryItems +@ stub KsOpenDefaultDevice +@ stub KsResolveRequiredAttributes +@ stub KsSynchronousDeviceControl -- 2.26.2

1 0

[PATCH 1/5] wined3d: Implement depth/stencil clears in the Vulkan blitter.
by Henri Verbeet 27 Apr '20

27 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 54 ++++++++++++++++++++++++--- dlls/wined3d/texture.c | 68 ++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 117 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 427dc064055..e8fcc391782 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -630,7 +630,7 @@ static void wined3d_context_vk_destroy_bo_slab(struct wine_rb_entry *entry, void } static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *key, - const struct wined3d_fb_state *fb, unsigned int rt_count) + const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) { struct wined3d_render_pass_attachment_vk *a; struct wined3d_rendertarget_view *view; @@ -649,6 +649,17 @@ static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *k a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; key->rt_mask |= 1u << i; } + + if (depth_stencil && (view = fb->depth_stencil)) + { + a = &key->ds; + a->vk_format = wined3d_format_vk(view->format)->vk_format; + a->vk_samples = max(1, wined3d_resource_get_sample_count(view->resource)); + a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; + key->rt_mask |= 1u << WINED3D_MAX_RENDER_TARGETS; + } + + key->clear_flags = clear_flags; } static void wined3d_render_pass_vk_cleanup(struct wined3d_render_pass_vk *pass, @@ -668,6 +679,8 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, VkAttachmentDescription attachments[WINED3D_MAX_RENDER_TARGETS + 1]; const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_render_pass_attachment_vk *a; + VkAttachmentReference ds_attachment_reference; + VkAttachmentReference *ds_reference = NULL; unsigned int attachment_count, rt_count, i; VkAttachmentDescription *attachment; VkSubpassDescription sub_pass_desc; @@ -687,7 +700,10 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment->flags = 0; attachment->format = a->vk_format; attachment->samples = a->vk_samples; - attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + if (key->clear_flags & WINED3DCLEAR_TARGET) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; @@ -709,6 +725,34 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment_references[i].layout = VK_IMAGE_LAYOUT_UNDEFINED; } + if (key->rt_mask & (1u << WINED3D_MAX_RENDER_TARGETS)) + { + a = &key->ds; + + attachment = &attachments[attachment_count]; + attachment->flags = 0; + attachment->format = a->vk_format; + attachment->samples = a->vk_samples; + if (key->clear_flags & WINED3DCLEAR_ZBUFFER) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; + if (key->clear_flags & WINED3DCLEAR_STENCIL) + attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + attachment->initialLayout = a->vk_layout; + attachment->finalLayout = a->vk_layout; + + ds_reference = &ds_attachment_reference; + ds_reference->attachment = attachment_count; + ds_reference->layout = a->vk_layout; + + ++attachment_count; + } + sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0; @@ -716,7 +760,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, sub_pass_desc.colorAttachmentCount = rt_count; sub_pass_desc.pColorAttachments = attachment_references; sub_pass_desc.pResolveAttachments = NULL; - sub_pass_desc.pDepthStencilAttachment = NULL; + sub_pass_desc.pDepthStencilAttachment = ds_reference; sub_pass_desc.preserveAttachmentCount = 0; sub_pass_desc.pPreserveAttachments = NULL; @@ -742,13 +786,13 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, } VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, - const struct wined3d_fb_state *fb, unsigned int rt_count) + const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) { struct wined3d_render_pass_key_vk key; struct wined3d_render_pass_vk *pass; struct wine_rb_entry *entry; - wined3d_render_pass_key_vk_init(&key, fb, rt_count); + wined3d_render_pass_key_vk_init(&key, fb, rt_count, depth_stencil, clear_flags); if ((entry = wine_rb_get(&context_vk->render_passes, &key))) return WINE_RB_ENTRY_VALUE(entry, struct wined3d_render_pass_vk, entry)->vk_render_pass; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef5f3cd48e5..4f55abb5e2b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6052,8 +6052,8 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { - VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS]; - VkImageView views[WINED3D_MAX_RENDER_TARGETS]; + VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS + 1]; + VkImageView views[WINED3D_MAX_RENDER_TARGETS + 1]; struct wined3d_rendertarget_view_vk *rtv_vk; struct wined3d_rendertarget_view *view; const struct wined3d_vk_info *vk_info; @@ -6065,6 +6065,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; VkRenderPass vk_render_pass; + bool depth_stencil = false; unsigned int layer_count; VkClearColorValue *c; VkResult vr; @@ -6078,6 +6079,9 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk device_vk = wined3d_device_vk(context_vk->c.device); vk_info = context_vk->vk_info; + if (!(flags & WINED3DCLEAR_TARGET)) + rt_count = 0; + for (i = 0, attachment_count = 0, layer_count = 1; i < rt_count; ++i) { if (!(view = fb->render_targets[i])) @@ -6115,7 +6119,33 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk ++attachment_count; } - if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, fb, rt_count))) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && (view = fb->depth_stencil)) + { + if (!is_full_clear(view, draw_rect, clear_rects)) + wined3d_rendertarget_view_load_location(view, &context_vk->c, view->resource->draw_binding); + else + wined3d_rendertarget_view_prepare_location(view, &context_vk->c, view->resource->draw_binding); + wined3d_rendertarget_view_validate_location(view, view->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(view, ~view->resource->draw_binding); + + rtv_vk = wined3d_rendertarget_view_vk(view); + views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); + + clear_values[attachment_count].depthStencil.depth = depth; + clear_values[attachment_count].depthStencil.stencil = stencil; + + if (view->layer_count > layer_count) + layer_count = view->layer_count; + + depth_stencil = true; + ++attachment_count; + } + + if (!attachment_count) + return; + + if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, fb, + rt_count, flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL), flags))) { ERR("Failed to get render pass.\n"); return; @@ -6183,6 +6213,19 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk texture_vk->layout, texture_vk->layout, texture_vk->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); } + + if (depth_stencil) + { + view = fb->depth_stencil; + wined3d_context_vk_reference_rendertarget_view(context_vk, wined3d_rendertarget_view_vk(view)); + texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(view->resource)); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + texture_vk->layout, texture_vk->layout, + texture_vk->vk_image, vk_aspect_mask_from_format(texture_vk->t.resource.format)); + } } static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -6228,7 +6271,10 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev } } - if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && fb->depth_stencil) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) + && (!view->format->depth_size || (flags & WINED3DCLEAR_ZBUFFER)) + && (!view->format->stencil_size || (flags & WINED3DCLEAR_STENCIL)) + && blitter_use_cpu_clear(view)) { next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); @@ -6247,6 +6293,13 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev have_identical_size = false; previous = view; } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = fb->depth_stencil; + + if (previous && (previous->width != view->width || previous->height != view->height)) + have_identical_size = false; + } if (have_identical_size) { @@ -6265,6 +6318,13 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev vk_blitter_clear_rendertargets(context_vk, 1, &tmp_fb, rect_count, clear_rects, draw_rect, WINED3DCLEAR_TARGET, colour, depth, stencil); } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + tmp_fb.render_targets[0] = NULL; + tmp_fb.depth_stencil = fb->depth_stencil; + vk_blitter_clear_rendertargets(context_vk, 0, &tmp_fb, rect_count, + clear_rects, draw_rect, flags & ~WINED3DCLEAR_TARGET, colour, depth, stencil); + } } context_release(&context_vk->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd8e03d35d9..db86d746b5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2272,7 +2272,9 @@ struct wined3d_render_pass_attachment_vk struct wined3d_render_pass_key_vk { struct wined3d_render_pass_attachment_vk rt[WINED3D_MAX_RENDER_TARGETS]; + struct wined3d_render_pass_attachment_vk ds; uint32_t rt_mask; + uint32_t clear_flags; }; struct wined3d_render_pass_vk @@ -2330,7 +2332,8 @@ void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, - const struct wined3d_fb_state *fb, unsigned int rt_count) DECLSPEC_HIDDEN; + const struct wined3d_fb_state *fb, unsigned int rt_count, + bool depth_stencil, uint32_t clear_flags) DECLSPEC_HIDDEN; void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, VkImageLayout old_layout, -- 2.20.1

2 1

[PATCH 1/3] quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Zebediah Figura 27 Apr '20

27 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7196f79a54..a5b52425b0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_DSoundRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AudioRender, &CLSID_LegacyAmFilterCategory, L"Audio Renderer", -- 2.26.2

1 0

[PATCH 5/5] wined3d: Add Vulkan format information for WINED3DFMT_D32_FLOAT_S8X24_UINT.
by Henri Verbeet 27 Apr '20

27 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 125 ++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 12e8ed2c716..0397056441f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4138,68 +4138,69 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } vulkan_formats[] = { - {WINED3DFMT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, }, - {WINED3DFMT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, }, - {WINED3DFMT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, }, - {WINED3DFMT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, }, - {WINED3DFMT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, }, - {WINED3DFMT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, }, - {WINED3DFMT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, }, - {WINED3DFMT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, }, - {WINED3DFMT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, }, - {WINED3DFMT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, }, - {WINED3DFMT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, }, - {WINED3DFMT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, }, - {WINED3DFMT_R32G32_UINT, VK_FORMAT_R32G32_UINT, }, - {WINED3DFMT_R32G32_SINT, VK_FORMAT_R32G32_SINT, }, - {WINED3DFMT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32,}, - {WINED3DFMT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, }, - {WINED3DFMT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, }, - {WINED3DFMT_R8G8_UINT, VK_FORMAT_R8G8_UINT, }, - {WINED3DFMT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, }, - {WINED3DFMT_R8G8_SINT, VK_FORMAT_R8G8_SINT, }, - {WINED3DFMT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, }, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, }, - {WINED3DFMT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, }, - {WINED3DFMT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, }, - {WINED3DFMT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, }, - {WINED3DFMT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, }, - {WINED3DFMT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, }, - {WINED3DFMT_R16G16_UINT, VK_FORMAT_R16G16_UINT, }, - {WINED3DFMT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, }, - {WINED3DFMT_R16G16_SINT, VK_FORMAT_R16G16_SINT, }, - {WINED3DFMT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, }, - {WINED3DFMT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, }, - {WINED3DFMT_R32_UINT, VK_FORMAT_R32_UINT, }, - {WINED3DFMT_R32_SINT, VK_FORMAT_R32_SINT, }, - {WINED3DFMT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, }, - {WINED3DFMT_D16_UNORM, VK_FORMAT_D16_UNORM, }, - {WINED3DFMT_R16_UNORM, VK_FORMAT_R16_UNORM, }, - {WINED3DFMT_R16_UINT, VK_FORMAT_R16_UINT, }, - {WINED3DFMT_R16_SNORM, VK_FORMAT_R16_SNORM, }, - {WINED3DFMT_R16_SINT, VK_FORMAT_R16_SINT, }, - {WINED3DFMT_R8_UNORM, VK_FORMAT_R8_UNORM, }, - {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, - {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, - {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, - {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, - {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, - {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, - {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, - {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, - {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, - {WINED3DFMT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, }, - {WINED3DFMT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, }, - {WINED3DFMT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, }, - {WINED3DFMT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, }, - {WINED3DFMT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, }, - {WINED3DFMT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, }, - {WINED3DFMT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, }, - {WINED3DFMT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, }, - {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, - {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, - {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, - {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, + {WINED3DFMT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, }, + {WINED3DFMT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, }, + {WINED3DFMT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, }, + {WINED3DFMT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, }, + {WINED3DFMT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, }, + {WINED3DFMT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, }, + {WINED3DFMT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, }, + {WINED3DFMT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, }, + {WINED3DFMT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, }, + {WINED3DFMT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, }, + {WINED3DFMT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, }, + {WINED3DFMT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, }, + {WINED3DFMT_R32G32_UINT, VK_FORMAT_R32G32_UINT, }, + {WINED3DFMT_R32G32_SINT, VK_FORMAT_R32G32_SINT, }, + {WINED3DFMT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32,}, + {WINED3DFMT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, }, + {WINED3DFMT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, }, + {WINED3DFMT_R8G8_UINT, VK_FORMAT_R8G8_UINT, }, + {WINED3DFMT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, }, + {WINED3DFMT_R8G8_SINT, VK_FORMAT_R8G8_SINT, }, + {WINED3DFMT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, }, + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, }, + {WINED3DFMT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, }, + {WINED3DFMT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, }, + {WINED3DFMT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, }, + {WINED3DFMT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, }, + {WINED3DFMT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, }, + {WINED3DFMT_R16G16_UINT, VK_FORMAT_R16G16_UINT, }, + {WINED3DFMT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, }, + {WINED3DFMT_R16G16_SINT, VK_FORMAT_R16G16_SINT, }, + {WINED3DFMT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, }, + {WINED3DFMT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, }, + {WINED3DFMT_R32_UINT, VK_FORMAT_R32_UINT, }, + {WINED3DFMT_R32_SINT, VK_FORMAT_R32_SINT, }, + {WINED3DFMT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, }, + {WINED3DFMT_D16_UNORM, VK_FORMAT_D16_UNORM, }, + {WINED3DFMT_R16_UNORM, VK_FORMAT_R16_UNORM, }, + {WINED3DFMT_R16_UINT, VK_FORMAT_R16_UINT, }, + {WINED3DFMT_R16_SNORM, VK_FORMAT_R16_SNORM, }, + {WINED3DFMT_R16_SINT, VK_FORMAT_R16_SINT, }, + {WINED3DFMT_R8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, + {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, + {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, + {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, + {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, + {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, + {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, + {WINED3DFMT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, }, + {WINED3DFMT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, }, + {WINED3DFMT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, }, + {WINED3DFMT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, }, + {WINED3DFMT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, }, + {WINED3DFMT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, }, + {WINED3DFMT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, }, + {WINED3DFMT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, }, + {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, + {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, + {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, + {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Add Vulkan format information for WINED3DFMT_R9G9B9E5_SHAREDEXP.
by Henri Verbeet 27 Apr '20

27 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 06857f22845..12e8ed2c716 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4199,6 +4199,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Make the adapter responsible for draws.
by Henri Verbeet 27 Apr '20

27 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 343dfff0eea..29496f2556e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5101,6 +5101,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = .adapter_create_query = adapter_gl_create_query, .adapter_destroy_query = adapter_gl_destroy_query, .adapter_flush_context = adapter_gl_flush_context, + .adapter_draw_primitive = draw_primitive, .adapter_dispatch_compute = dispatch_compute, .adapter_clear_uav = adapter_gl_clear_uav, }; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7c635620867..b6a0eea7852 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_vk_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -1457,6 +1463,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = .adapter_create_query = adapter_vk_create_query, .adapter_destroy_query = adapter_vk_destroy_query, .adapter_flush_context = adapter_vk_flush_context, + .adapter_draw_primitive = adapter_vk_draw_primitive, .adapter_dispatch_compute = adapter_vk_dispatch_compute, .adapter_clear_uav = adapter_vk_clear_uav, }; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 930351d092c..85e696d4d19 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -888,7 +888,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } state->gl_patch_vertices = op->patch_vertex_count; - draw_primitive(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); if (op->parameters.indirect) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 40221ab7dee..b6a9b502d82 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_no3d_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -2886,6 +2892,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = .adapter_create_query = adapter_no3d_create_query, .adapter_destroy_query = adapter_no3d_destroy_query, .adapter_flush_context = adapter_no3d_flush_context, + .adapter_draw_primitive = adapter_no3d_draw_primitive, .adapter_dispatch_compute = adapter_no3d_dispatch_compute, .adapter_clear_uav = adapter_no3d_clear_uav, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5d22600013..a7983b31b7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_draw_primitive)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_draw_parameters *parameters); void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context, -- 2.20.1

1 0

[PATCH 2/5] wined3d: Make the adapter responsible for compute dispatch.
by Henri Verbeet 27 Apr '20

27 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 61 ++++++++++++++++--------------- dlls/wined3d/adapter_vk.c | 67 +++++++++++++++++++--------------- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 67 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 108 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index eaeb13b46cc..343dfff0eea 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5072,36 +5072,37 @@ void adapter_gl_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { - adapter_gl_destroy, - adapter_gl_create_device, - adapter_gl_destroy_device, - adapter_gl_acquire_context, - adapter_gl_release_context, - adapter_gl_get_wined3d_caps, - adapter_gl_check_format, - adapter_gl_init_3d, - adapter_gl_uninit_3d, - adapter_gl_map_bo_address, - adapter_gl_unmap_bo_address, - adapter_gl_copy_bo_address, - adapter_gl_create_swapchain, - adapter_gl_destroy_swapchain, - adapter_gl_create_buffer, - adapter_gl_destroy_buffer, - adapter_gl_create_texture, - adapter_gl_destroy_texture, - adapter_gl_create_rendertarget_view, - adapter_gl_destroy_rendertarget_view, - adapter_gl_create_shader_resource_view, - adapter_gl_destroy_shader_resource_view, - adapter_gl_create_unordered_access_view, - adapter_gl_destroy_unordered_access_view, - adapter_gl_create_sampler, - adapter_gl_destroy_sampler, - adapter_gl_create_query, - adapter_gl_destroy_query, - adapter_gl_flush_context, - adapter_gl_clear_uav, + .adapter_destroy = adapter_gl_destroy, + .adapter_create_device = adapter_gl_create_device, + .adapter_destroy_device = adapter_gl_destroy_device, + .adapter_acquire_context = adapter_gl_acquire_context, + .adapter_release_context = adapter_gl_release_context, + .adapter_get_wined3d_caps = adapter_gl_get_wined3d_caps, + .adapter_check_format = adapter_gl_check_format, + .adapter_init_3d = adapter_gl_init_3d, + .adapter_uninit_3d = adapter_gl_uninit_3d, + .adapter_map_bo_address = adapter_gl_map_bo_address, + .adapter_unmap_bo_address = adapter_gl_unmap_bo_address, + .adapter_copy_bo_address = adapter_gl_copy_bo_address, + .adapter_create_swapchain = adapter_gl_create_swapchain, + .adapter_destroy_swapchain = adapter_gl_destroy_swapchain, + .adapter_create_buffer = adapter_gl_create_buffer, + .adapter_destroy_buffer = adapter_gl_destroy_buffer, + .adapter_create_texture = adapter_gl_create_texture, + .adapter_destroy_texture = adapter_gl_destroy_texture, + .adapter_create_rendertarget_view = adapter_gl_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_gl_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_gl_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_gl_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_gl_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_gl_destroy_unordered_access_view, + .adapter_create_sampler = adapter_gl_create_sampler, + .adapter_destroy_sampler = adapter_gl_destroy_sampler, + .adapter_create_query = adapter_gl_create_query, + .adapter_destroy_query = adapter_gl_destroy_query, + .adapter_flush_context = adapter_gl_flush_context, + .adapter_dispatch_compute = dispatch_compute, + .adapter_clear_uav = adapter_gl_clear_uav, }; static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1641de78522..7c635620867 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_dispatch_compute(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { @@ -1422,36 +1428,37 @@ void adapter_vk_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { - adapter_vk_destroy, - adapter_vk_create_device, - adapter_vk_destroy_device, - adapter_vk_acquire_context, - adapter_vk_release_context, - adapter_vk_get_wined3d_caps, - adapter_vk_check_format, - adapter_vk_init_3d, - adapter_vk_uninit_3d, - adapter_vk_map_bo_address, - adapter_vk_unmap_bo_address, - adapter_vk_copy_bo_address, - adapter_vk_create_swapchain, - adapter_vk_destroy_swapchain, - adapter_vk_create_buffer, - adapter_vk_destroy_buffer, - adapter_vk_create_texture, - adapter_vk_destroy_texture, - adapter_vk_create_rendertarget_view, - adapter_vk_destroy_rendertarget_view, - adapter_vk_create_shader_resource_view, - adapter_vk_destroy_shader_resource_view, - adapter_vk_create_unordered_access_view, - adapter_vk_destroy_unordered_access_view, - adapter_vk_create_sampler, - adapter_vk_destroy_sampler, - adapter_vk_create_query, - adapter_vk_destroy_query, - adapter_vk_flush_context, - adapter_vk_clear_uav, + .adapter_destroy = adapter_vk_destroy, + .adapter_create_device = adapter_vk_create_device, + .adapter_destroy_device = adapter_vk_destroy_device, + .adapter_acquire_context = adapter_vk_acquire_context, + .adapter_release_context = adapter_vk_release_context, + .adapter_get_wined3d_caps = adapter_vk_get_wined3d_caps, + .adapter_check_format = adapter_vk_check_format, + .adapter_init_3d = adapter_vk_init_3d, + .adapter_uninit_3d = adapter_vk_uninit_3d, + .adapter_map_bo_address = adapter_vk_map_bo_address, + .adapter_unmap_bo_address = adapter_vk_unmap_bo_address, + .adapter_copy_bo_address = adapter_vk_copy_bo_address, + .adapter_create_swapchain = adapter_vk_create_swapchain, + .adapter_destroy_swapchain = adapter_vk_destroy_swapchain, + .adapter_create_buffer = adapter_vk_create_buffer, + .adapter_destroy_buffer = adapter_vk_destroy_buffer, + .adapter_create_texture = adapter_vk_create_texture, + .adapter_destroy_texture = adapter_vk_destroy_texture, + .adapter_create_rendertarget_view = adapter_vk_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_vk_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_vk_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_vk_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_vk_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_vk_destroy_unordered_access_view, + .adapter_create_sampler = adapter_vk_create_sampler, + .adapter_destroy_sampler = adapter_vk_destroy_sampler, + .adapter_create_query = adapter_vk_create_query, + .adapter_destroy_query = adapter_vk_destroy_query, + .adapter_flush_context = adapter_vk_flush_context, + .adapter_dispatch_compute = adapter_vk_dispatch_compute, + .adapter_clear_uav = adapter_vk_clear_uav, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 899d5a712e4..930351d092c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -785,7 +785,7 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_dispatch *op = data; struct wined3d_state *state = &cs->state; - dispatch_compute(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_dispatch_compute(cs->device, state, &op->parameters); if (op->parameters.indirect) wined3d_resource_release(&op->parameters.u.indirect.buffer->resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c44d06f2b5b..40221ab7dee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_dispatch_compute(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + void adapter_no3d_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { @@ -2851,36 +2857,37 @@ void adapter_no3d_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { - adapter_no3d_destroy, - adapter_no3d_create_device, - adapter_no3d_destroy_device, - adapter_no3d_acquire_context, - adapter_no3d_release_context, - adapter_no3d_get_wined3d_caps, - adapter_no3d_check_format, - adapter_no3d_init_3d, - adapter_no3d_uninit_3d, - adapter_no3d_map_bo_address, - adapter_no3d_unmap_bo_address, - adapter_no3d_copy_bo_address, - adapter_no3d_create_swapchain, - adapter_no3d_destroy_swapchain, - adapter_no3d_create_buffer, - adapter_no3d_destroy_buffer, - adapter_no3d_create_texture, - adapter_no3d_destroy_texture, - adapter_no3d_create_rendertarget_view, - adapter_no3d_destroy_rendertarget_view, - adapter_no3d_create_shader_resource_view, - adapter_no3d_destroy_shader_resource_view, - adapter_no3d_create_unordered_access_view, - adapter_no3d_destroy_unordered_access_view, - adapter_no3d_create_sampler, - adapter_no3d_destroy_sampler, - adapter_no3d_create_query, - adapter_no3d_destroy_query, - adapter_no3d_flush_context, - adapter_no3d_clear_uav, + .adapter_destroy = adapter_no3d_destroy, + .adapter_create_device = adapter_no3d_create_device, + .adapter_destroy_device = adapter_no3d_destroy_device, + .adapter_acquire_context = adapter_no3d_acquire_context, + .adapter_release_context = adapter_no3d_release_context, + .adapter_get_wined3d_caps = adapter_no3d_get_wined3d_caps, + .adapter_check_format = adapter_no3d_check_format, + .adapter_init_3d = adapter_no3d_init_3d, + .adapter_uninit_3d = adapter_no3d_uninit_3d, + .adapter_map_bo_address = adapter_no3d_map_bo_address, + .adapter_unmap_bo_address = adapter_no3d_unmap_bo_address, + .adapter_copy_bo_address = adapter_no3d_copy_bo_address, + .adapter_create_swapchain = adapter_no3d_create_swapchain, + .adapter_destroy_swapchain = adapter_no3d_destroy_swapchain, + .adapter_create_buffer = adapter_no3d_create_buffer, + .adapter_destroy_buffer = adapter_no3d_destroy_buffer, + .adapter_create_texture = adapter_no3d_create_texture, + .adapter_destroy_texture = adapter_no3d_destroy_texture, + .adapter_create_rendertarget_view = adapter_no3d_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_no3d_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_no3d_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_no3d_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_no3d_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_no3d_destroy_unordered_access_view, + .adapter_create_sampler = adapter_no3d_create_sampler, + .adapter_destroy_sampler = adapter_no3d_destroy_sampler, + .adapter_create_query = adapter_no3d_create_query, + .adapter_destroy_query = adapter_no3d_destroy_query, + .adapter_flush_context = adapter_no3d_flush_context, + .adapter_dispatch_compute = adapter_no3d_dispatch_compute, + .adapter_clear_uav = adapter_no3d_clear_uav, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db86d746b5f..a5d22600013 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; -- 2.20.1

1 0

[PATCH 0/9] First patches for PPC64
by André Hentschel 27 Apr '20

27 Apr '20

Since some weeks I keep splitting/cleaning up/rebasing the PowerPC64le patchset from last year: [1] It's a horrible time for rebasing as so many things are changing in Wine right now, so I want to at least send out the easier ones, hoping I could then better concentrate on the harder ones. What it means is that this patchset alone won't build on PPC64 yet [1] https://github.com/madscientist159/wine/commits/master

3 12

[PATCH v6 1/3] qedit: Retrieve the pin media type using a helper function.
by Zebediah Figura 27 Apr '20

27 Apr '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v6: Simplify error handling a bit. This supersedes <https://source.winehq.org/patches/data/184349>. dlls/qedit/mediadet.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 392320560b8..3c00a85b9ed 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -103,6 +103,24 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) return hr; } +static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) +{ + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + if (FAILED(hr = IPin_EnumMediaTypes(pin, &enummt))) + return hr; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + IEnumMediaTypes_Release(enummt); + if (hr != S_OK) + return E_NOINTERFACE; + + *out = *pmt; + CoTaskMemFree(pmt); + return S_OK; +} + static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; @@ -611,9 +629,6 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - IEnumMediaTypes *types; - AM_MEDIA_TYPE *pmt; - HRESULT hr; TRACE("(%p)\n", This); @@ -623,22 +638,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, if (!This->cur_pin) return E_INVALIDARG; - hr = IPin_EnumMediaTypes(This->cur_pin, &types); - if (SUCCEEDED(hr)) - { - hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK - ? S_OK - : E_NOINTERFACE); - IEnumMediaTypes_Release(types); - } - - if (SUCCEEDED(hr)) - { - *pVal = *pmt; - CoTaskMemFree(pmt); - } - - return hr; + return get_pin_media_type(This->cur_pin, pVal); } static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, -- 2.26.2

2 4

[PATCH v2 3/3] windowscodecs/tests: Add the tests for GIF encoder and decoder.
by Dmitry Timoshkov 27 Apr '20

27 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 61 +++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0a7e7238aa..7936c5e653 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1132,6 +1132,40 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } +static void check_gif_format(IStream *stream, const WICPixelFormatGUID *format) +{ +#include "pshpack1.h" + struct logical_screen_descriptor + { + char signature[6]; + USHORT width; + USHORT height; + BYTE packed; + /* global_color_table_flag : 1; + * color_resolution : 3; + * sort_flag : 1; + * global_color_table_size : 3; + */ + BYTE background_color_index; + BYTE pixel_aspect_ratio; + } lsd; +#include "poppack.h" + UINT color_resolution; + HRESULT hr; + + memset(&lsd, 0, sizeof(lsd)); + hr = IStream_Read(stream, &lsd, sizeof(lsd), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(!memcmp(lsd.signature, "GIF89a", 6), "wrong GIF signature %.6s\n", lsd.signature); + + ok(lsd.width == 32, "wrong width %u\n", lsd.width); + ok(lsd.height == 2, "wrong height %u\n", lsd.height); + color_resolution = 1 << (((lsd.packed >> 4) & 0x07) + 1); + ok(color_resolution == 256, "wrong color resolution %u\n", color_resolution); + ok(lsd.pixel_aspect_ratio == 0, "wrong pixel_aspect_ratio %u\n", lsd.pixel_aspect_ratio); +} + static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; @@ -1147,6 +1181,8 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) check_tiff_format(stream, format); + else if (IsEqualGUID(encoder, &CLSID_WICGifEncoder)) + check_gif_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -1241,6 +1277,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls container_format = &GUID_ContainerFormatTiff; else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) container_format = &GUID_ContainerFormatJpeg; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + container_format = &GUID_ContainerFormatGif; else ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); @@ -1265,7 +1303,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "CoCreateInstance(%s) failed, hr=%x\n", wine_dbgstr_guid(clsid_encoder), hr); if (SUCCEEDED(hr)) { hglobal = GlobalAlloc(GMEM_MOVEABLE, 0); @@ -1290,7 +1328,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); - ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + ok(hr == S_OK, "SetPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); hr = S_OK; } @@ -1429,13 +1470,19 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == WINCODEC_ERR_WRONGSTATE, "wrong error %#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING) /* XP */, "CopyPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = S_OK; i=0; @@ -1495,7 +1542,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || - IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder)) + IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder) || + IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) { if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormatBlackWhite) || IsEqualGUID(&pixelformat, &GUID_WICPixelFormat8bppIndexed)) @@ -1845,6 +1893,9 @@ START_TEST(converter) test_default_converter(); test_converter_8bppIndexed(); + test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, + &testdata_8bppIndexed, &CLSID_WICGifDecoder, "GIF encoder 8bppIndexed"); + test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, -- 2.26.2

3 2

[PATCH v2 2/3] windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder.
by Dmitry Timoshkov 27 Apr '20

27 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/gifformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index fc8f4b1c3e..5d5a3a07a2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1187,6 +1187,9 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet TRACE("(%p,%p)\n", iface, palette); + if (!This->gif) + return WINCODEC_ERR_WRONGSTATE; + cm = This->gif->SColorMap; if (cm) { -- 2.26.2

2 1

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-devel