March 2019 - Wine-commits - list.winehq.org

Mark Jansen : imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 3eca7c1f8e4c34f35c3f25dc107d15c4a3e86cce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eca7c1f8e4c34f35c3f25dc… Author: Mark Jansen <learn0more(a)gmail.com> Date: Sat Mar 23 02:20:53 2019 +0100 imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/image.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index c0a26c3..4bc7a90 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -33,6 +33,10 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); +static DWORD (WINAPI *pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); +static PLOADED_IMAGE (WINAPI *pImageLoad)(PCSTR, PCSTR); +static BOOL (WINAPI *pImageUnload)(PLOADED_IMAGE); + /* minimal PE file image */ #define VA_START 0x400000 @@ -425,6 +429,88 @@ static void test_bind_image_ex(void) DeleteFileA(temp_file); } +static void test_image_load(void) +{ + char temp_file[MAX_PATH]; + PLOADED_IMAGE img; + DWORD ret, count; + HANDLE file; + + if (!pImageLoad || !pImageUnload || !pGetImageUnusedHeaderBytes) + { + win_skip("ImageLoad functions are not available\n"); + return; + } + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + img = pImageLoad(temp_file, NULL); + ok(img != NULL, "ImageLoad unexpectedly failed\n"); + + if (img) + { + todo_wine ok(!strcmp(img->ModuleName, temp_file), + "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); + todo_wine ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + if (img->MappedAddress) + { + ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), + "MappedAddress doesn't point to IMAGE_DOS_HEADER\n"); + } + ok(img->FileHeader != NULL, "FileHeader != NULL\n"); + if (img->FileHeader) + { + todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); + } + todo_wine ok(img->NumberOfSections == 3, + "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); + if (img->NumberOfSections >= 3) + { + ok(!strcmp((const char *)img->Sections[0].Name, ".text"), + "unexpected name for section 0, expected .text, got %s\n", + (const char *)img->Sections[0].Name); + ok(!strcmp((const char *)img->Sections[1].Name, ".bss"), + "unexpected name for section 1, expected .bss, got %s\n", + (const char *)img->Sections[1].Name); + ok(!strcmp((const char *)img->Sections[2].Name, ".idata"), + "unexpected name for section 2, expected .idata, got %s\n", + (const char *)img->Sections[2].Name); + } + todo_wine ok(img->Characteristics == 0x102, + "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); + ok(img->fSystemImage == 0, + "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); + ok(img->fDOSImage == 0, + "unexpected fDOSImage, got %d instead of 0\n", img->fDOSImage); + todo_wine ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, + "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); + todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, + "unexpected Version, got %d instead of 1\n", img->Version); + todo_wine ok(img->SizeOfImage == 0x600, + "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); + + count = 0xdeadbeef; + ret = pGetImageUnusedHeaderBytes(img, &count); + todo_wine + ok(ret == 448, "GetImageUnusedHeaderBytes returned %u instead of 448\n", ret); + todo_wine + ok(count == 64, "unexpected size for unused header bytes, got %u instead of 64\n", count); + + pImageUnload(img); + } + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -437,9 +523,13 @@ START_TEST(image) pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); + pGetImageUnusedHeaderBytes = (void *) GetProcAddress(hImageHlp, "GetImageUnusedHeaderBytes"); + pImageLoad = (void *) GetProcAddress(hImageHlp, "ImageLoad"); + pImageUnload = (void *) GetProcAddress(hImageHlp, "ImageUnload"); test_get_digest_stream(); test_bind_image_ex(); + test_image_load(); FreeLibrary(hImageHlp); }

1 0

Michael Müller : imagehlp: Implement ImageLoad and cleanup ImageUnload.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 55a62c739c02135d18aa5af6ede304465cb0e030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a62c739c02135d18aa5af6… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 23 02:20:54 2019 +0100 imagehlp: Implement ImageLoad and cleanup ImageUnload. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/access.c | 78 ++++++++++++++++++++++++--------------------- dlls/imagehlp/tests/image.c | 12 +++---- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 6a33c0c..66c3036 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** * Data */ - -static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; +static LIST_ENTRY image_list = { &image_list, &image_list }; DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; @@ -69,57 +68,62 @@ DWORD WINAPI GetImageUnusedHeaderBytes( /*********************************************************************** * ImageLoad (IMAGEHLP.@) */ -PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath) +PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) { - PLOADED_IMAGE pLoadedImage; - - FIXME("(%s, %s): stub\n", DllName, DllPath); - - pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)); - if (pLoadedImage) - pLoadedImage->FileHeader = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(IMAGE_NT_HEADERS)); - - return pLoadedImage; + LOADED_IMAGE *image; + + TRACE("(%s, %s)\n", dll_name, dll_path); + + image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + if (!image) return NULL; + + if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) + { + HeapFree(IMAGEHLP_hHeap, 0, image); + return NULL; + } + + image->Links.Flink = image_list.Flink; + image->Links.Blink = &image_list; + image_list.Flink->Blink = &image->Links; + image_list.Flink = &image->Links; + + return image; } /*********************************************************************** * ImageUnload (IMAGEHLP.@) */ -BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) +BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) { - LIST_ENTRY *pCurrent, *pFind; + LIST_ENTRY *entry, *mark; + PLOADED_IMAGE image; + + TRACE("(%p)\n", loaded_image); - TRACE("(%p)\n", pLoadedImage); - - if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage) + /* FIXME: do we really need to check this? */ + mark = &image_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + image = CONTAINING_RECORD(entry, LOADED_IMAGE, Links); + if (image == loaded_image) + break; } - pFind=&pLoadedImage->Links; - pCurrent=&IMAGEHLP_pFirstLoadedImage->Links; - while((pCurrent != pFind) && - (pCurrent != NULL)) - pCurrent = pCurrent->Flink; - if(!pCurrent) + if (entry == mark) { - /* Not found */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + /* Not found */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - if(pCurrent->Blink) - pCurrent->Blink->Flink = pCurrent->Flink; - else - IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD( - pCurrent->Flink, LOADED_IMAGE, Links):NULL; + entry->Blink->Flink = entry->Flink; + entry->Flink->Blink = entry->Blink; - if(pCurrent->Flink) - pCurrent->Flink->Blink = pCurrent->Blink; + UnMapAndLoad(loaded_image); + HeapFree(IMAGEHLP_hHeap, 0, loaded_image); - return FALSE; + return TRUE; } /*********************************************************************** diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 4bc7a90..875d919 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -457,9 +457,9 @@ static void test_image_load(void) if (img) { - todo_wine ok(!strcmp(img->ModuleName, temp_file), + ok(!strcmp(img->ModuleName, temp_file), "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); - todo_wine ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); if (img->MappedAddress) { ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), @@ -468,10 +468,10 @@ static void test_image_load(void) ok(img->FileHeader != NULL, "FileHeader != NULL\n"); if (img->FileHeader) { - todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); } - todo_wine ok(img->NumberOfSections == 3, + ok(img->NumberOfSections == 3, "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); if (img->NumberOfSections >= 3) { @@ -485,7 +485,7 @@ static void test_image_load(void) "unexpected name for section 2, expected .idata, got %s\n", (const char *)img->Sections[2].Name); } - todo_wine ok(img->Characteristics == 0x102, + ok(img->Characteristics == 0x102, "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); ok(img->fSystemImage == 0, "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); @@ -495,7 +495,7 @@ static void test_image_load(void) "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, "unexpected Version, got %d instead of 1\n", img->Version); - todo_wine ok(img->SizeOfImage == 0x600, + ok(img->SizeOfImage == 0x600, "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); count = 0xdeadbeef;

1 0

Alexandre Julliard : imagehlp: Get rid of the custom heap.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: e4b2b82e6c7f84b347a12eaeb314b0026bed87f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b2b82e6c7f84b347a12eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 22:09:07 2019 +0100 imagehlp: Get rid of the custom heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/access.c | 7 +++---- dlls/imagehlp/imagehlp_main.c | 21 --------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 66c3036..29315f1 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); */ static LIST_ENTRY image_list = { &image_list, &image_list }; -DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) @@ -74,12 +73,12 @@ PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) TRACE("(%s, %s)\n", dll_name, dll_path); - image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)); if (!image) return NULL; if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) { - HeapFree(IMAGEHLP_hHeap, 0, image); + HeapFree(GetProcessHeap(), 0, image); return NULL; } @@ -121,7 +120,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) entry->Flink->Blink = entry->Blink; UnMapAndLoad(loaded_image); - HeapFree(IMAGEHLP_hHeap, 0, loaded_image); + HeapFree(GetProcessHeap(), 0, loaded_image); return TRUE; } diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index e505126..183b744 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -25,27 +25,6 @@ #include "imagehlp.h" #include "wine/debug.h" -/**********************************************************************/ -DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; - -/*********************************************************************** - * DllMain (IMAGEHLP.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); - break; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - HeapDestroy(IMAGEHLP_hHeap); - break; - } - return TRUE; -} /*********************************************************************** * MarkImageAsRunFromSwap (IMAGEHLP.@)

1 0

Hans Leidekker : msi: Avoid a crash in RemoveFiles if the component directory is invalid.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: c7f323107b3b956d206d8d0ee28851d60f19841c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f323107b3b956d206d8d0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 21:12:04 2019 +0100 msi: Avoid a crash in RemoveFiles if the component directory is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 92a98f1..68b8954 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1645,7 +1645,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) else { MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (folder) remove_folder( folder ); } } return ERROR_SUCCESS;

1 0

Nikolay Sivov : mfplat: Use existing helper for BeginWrite() too.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 493b375f0064e7f06d2cf6e17223791118a421ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=493b375f0064e7f06d2cf6e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:43:02 2019 +0300 mfplat: Use existing helper for BeginWrite() too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 385eb25..57bed4a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2339,33 +2339,10 @@ static HRESULT WINAPI bytestream_BeginWrite(IMFByteStream *iface, const BYTE *da IMFAsyncCallback *callback, IUnknown *state) { struct bytestream *stream = impl_from_IMFByteStream(iface); - struct async_stream_op *op; - IMFAsyncResult *request; - HRESULT hr; TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); - op = heap_alloc(sizeof(*op)); - if (!op) - return E_OUTOFMEMORY; - - op->IUnknown_iface.lpVtbl = &async_stream_op_vtbl; - op->refcount = 1; - op->u.src = data; - op->requested_length = size; - op->type = ASYNC_STREAM_OP_WRITE; - if (FAILED(hr = MFCreateAsyncResult((IUnknown *)iface, callback, state, &op->caller))) - goto failed; - - if (FAILED(hr = MFCreateAsyncResult(&op->IUnknown_iface, &stream->write_callback, NULL, &request))) - goto failed; - - MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, request); - IMFAsyncResult_Release(request); - -failed: - IUnknown_Release(&op->IUnknown_iface); - return hr; + return bytestream_create_io_request(stream, ASYNC_STREAM_OP_WRITE, data, size, callback, state); } static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written)

1 0

Nikolay Sivov : mfreadwrite: Use single helper for source reader creation functions.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 0319a2dd3f2b38636858bc0f536251abeb573425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0319a2dd3f2b38636858bc0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:45:16 2019 +0300 mfreadwrite: Use single helper for source reader creation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 65 +++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 516b592..3936b5b 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -838,6 +838,35 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) +{ + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + + if (source) + { + UINT32 disconnect = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); + hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); + } + else if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; +} + /*********************************************************************** * MFCreateSourceReaderFromByteStream (mfreadwrite.@) */ @@ -846,23 +875,18 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr { TRACE("%p, %p, %p.\n", stream, attributes, reader); - return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)stream, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) */ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) + IMFSourceReader **reader) { - UINT32 disconnect = 0; - TRACE("%p, %p, %p.\n", source, attributes, reader); - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - - return create_source_reader_from_source(source, attributes, !disconnect, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)source, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** @@ -924,30 +948,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) { - IMFMediaSource *source = NULL; - IMFByteStream *stream = NULL; - - hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); - if (FAILED(hr)) - hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); - - if (stream) - hr = create_source_reader_from_stream(stream, attributes, riid, out); - else if (source) - { - UINT32 disconnect = 0; - - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); - } - - if (source) - IMFMediaSource_Release(source); - if (stream) - IMFByteStream_Release(stream); - - return hr; + return create_source_reader_from_object(unk, attributes, riid, out); } else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) {

1 0

Nikolay Sivov : mfreadwrite: Set url hint from stream content.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: a5fe3d65aac7373468502d53f230fff5c5253c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5fe3d65aac7373468502d53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:45:17 2019 +0300 mfreadwrite: Set url hint from stream content. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3936b5b..9bed201 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -576,6 +576,71 @@ failed: return hr; } +static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) +{ + static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR asfW[] = {'.','a','s','f',0}; + static const struct stream_content_url_hint + { + const UINT8 *magic; + UINT32 magic_len; + const WCHAR *url; + } + url_hints[] = + { + { asfmagic, sizeof(asfmagic), asfW }, + }; + IMFAttributes *attributes; + UINT32 length = 0; + UINT8 buffer[16]; + DWORD caps = 0; + QWORD position; + unsigned int i; + HRESULT hr; + + *url = NULL; + + if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) + { + IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &length); + IMFAttributes_Release(attributes); + } + + if (length) + return S_OK; + + if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) + return hr; + + if (!(caps & MFBYTESTREAM_IS_SEEKABLE)) + return S_OK; + + if (FAILED(hr = IMFByteStream_GetCurrentPosition(stream, &position))) + return hr; + + hr = IMFByteStream_Read(stream, buffer, sizeof(buffer), &length); + IMFByteStream_SetCurrentPosition(stream, position); + if (FAILED(hr)) + return hr; + + if (length < sizeof(buffer)) + return S_OK; + + for (i = 0; i < ARRAY_SIZE(url_hints); ++i) + { + if (!memcmp(buffer, url_hints[i].magic, min(url_hints[i].magic_len, length))) + { + *url = url_hints[i].url; + break; + } + } + + if (!*url) + WARN("Unrecognized content type %s.\n", debugstr_an((char *)buffer, length)); + + return S_OK; +} + static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { @@ -583,8 +648,13 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib IMFSourceResolver *resolver; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; + const WCHAR *url; HRESULT hr; + /* If stream does not have content type set, try to guess from starting byte sequence. */ + if (FAILED(hr = bytestream_get_url_hint(stream, &url))) + return hr; + if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; @@ -592,7 +662,7 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, props, + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, url, MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source); IMFSourceResolver_Release(resolver); if (props)

1 0

Zebediah Figura : msi: Don' t fail the BindImage action if the BindImage table is absent.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: a3dfd2f251f336f1cc570863edb60251227cdf5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3dfd2f251f336f1cc570863… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 24 12:06:45 2019 -0500 msi: Don't fail the BindImage action if the BindImage table is absent. This fixes a regression introduced with 15f852015a0332313821804cc1fbad79216408c6 and observable with several installers, including dotnet472. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46885 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/tests/install.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b51a21d..e2f91c3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7809,10 +7809,10 @@ static UINT ACTION_BindImage( MSIPACKAGE *package ) r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r == ERROR_SUCCESS) { - r = MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); + MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); msiobj_release( &view->hdr ); } - return r; + return ERROR_SUCCESS; } static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9c8652b..27dc83f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -135,6 +135,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "ResolveSource\t\t950\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" + "BindImage\t\t4100\n" "DuplicateFiles\t\t4500\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n"

1 0

Zebediah Figura : msi: Append the custom action client PID to the endpoint name.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 27a7952a84d157caed21a663dd827728a02c443e URL: https://source.winehq.org/git/wine.git/?a=commit;h=27a7952a84d157caed21a663… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 22 21:17:17 2019 -0500 msi: Append the custom action client PID to the endpoint name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46833 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 14 ++++++++++---- dlls/msi/msi.spec | 2 +- programs/msiexec/msiexec.c | 9 +++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8bf0902..facb1d8 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -477,7 +477,7 @@ static void handle_msi_break(LPCSTR target) } static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; -static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; +static WCHAR endpoint_fmtW[] = {'m','s','i','%','x',0}; #ifdef __i386__ /* wrapper for apps that don't declare the thread function correctly */ @@ -502,7 +502,7 @@ static UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hins } #endif -UINT CDECL __wine_msi_call_dll_function(const GUID *guid) +UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) { MsiCustomActionEntryPoint fn; MSIHANDLE remote_package = 0; @@ -519,7 +519,10 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (!rpc_handle) { - status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, client_pid); + status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint, NULL, &binding_str); if (status != RPC_S_OK) { ERR("RpcStringBindingCompose failed: %#x\n", status); @@ -740,8 +743,11 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!package->rpc_server_started) { + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, GetCurrentProcessId()); status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); + endpoint, NULL); if (status != RPC_S_OK) { ERR("RpcServerUseProtseqEp failed: %#x\n", status); diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index aecba1b..eeb9ea7 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -295,4 +295,4 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ cdecl __wine_msi_call_dll_function(ptr) +@ cdecl __wine_msi_call_dll_function(long ptr) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index efbcb5c..3340ade 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -397,19 +397,20 @@ static DWORD DoUnregServer(void) return ret; } -extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); +extern UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid); + +static DWORD client_pid; static DWORD CALLBACK custom_action_thread(void *arg) { GUID guid = *(GUID *)arg; heap_free(arg); - return __wine_msi_call_dll_function(&guid); + return __wine_msi_call_dll_function(client_pid, &guid); } static int custom_action_server(const WCHAR *arg) { static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; - DWORD client_pid = atoiW(arg); GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -419,7 +420,7 @@ static int custom_action_server(const WCHAR *arg) TRACE("%s\n", debugstr_w(arg)); - if (!client_pid) + if (!(client_pid = atoiW(arg))) { ERR("Invalid parameter %s\n", debugstr_w(arg)); return 1;

1 0

Hans Leidekker : wbemprox: Implement Win32_PhysicalMemory.DeviceLocator.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 66b2b3ea6836838e8c49e963ffceddb42836ee5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b2b3ea6836838e8c49e963… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 10:06:04 2019 +0100 wbemprox: Implement Win32_PhysicalMemory.DeviceLocator. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46894 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 ++++++++++++------ dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b206a2a..fc04f3f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -204,6 +204,8 @@ static const WCHAR prop_destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; +static const WCHAR prop_devicelocatorW[] = + {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR prop_dhcpenabledW[] = {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = @@ -617,8 +619,9 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 }, - { prop_memorytypeW, CIM_UINT16, VT_I4 } + { prop_capacityW, CIM_UINT64 }, + { prop_devicelocatorW, CIM_STRING }, + { prop_memorytypeW, CIM_UINT16, VT_I4 } }; static const struct column col_pnpentity[] = { @@ -1043,8 +1046,9 @@ struct record_physicalmedia }; struct record_physicalmemory { - UINT64 capacity; - UINT16 memorytype; + UINT64 capacity; + const WCHAR *devicelocator; + UINT16 memorytype; }; struct record_pnpentity { @@ -2639,6 +2643,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond ) { + static const WCHAR dimm0W[] = {'D','I','M','M',' ','0',0}; struct record_physicalmemory *rec; enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; @@ -2646,8 +2651,9 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; - rec->capacity = get_total_physical_memory(); - rec->memorytype = 9; /* RAM */ + rec->capacity = get_total_physical_memory(); + rec->devicelocator = heap_strdupW( dimm0W ); + rec->memorytype = 9; /* RAM */ if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e8ddbcc..b622ac2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1489,6 +1489,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR devicelocatorW[] = {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; @@ -1523,6 +1524,15 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, devicelocatorW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get devicelocator %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "devicelocator %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get memory type %08x\n", hr ); ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0