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

Hans Leidekker : msi: Avoid a crash in RemoveFiles if the component directory is invalid.
by Alexandre Julliard March 25, 2019

March 25, 2019

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

Mark Jansen : imagehlp/tests: Add tests for ImageLoad, ImageUnload, GetImageUnusedHeaderBytes.
by Alexandre Julliard March 25, 2019

March 25, 2019

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

Detlef Riekenberg : hid/tests: Do not access uninitialized memory.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: f5f34fe018f2d2d0c0663027bddb4a073f5308d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f34fe018f2d2d0c0663027… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:48 2019 +0100 hid/tests: Do not access uninitialized memory. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index f20677f..ff17229 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -82,7 +82,8 @@ static void run_for_each_device(device_test *test) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError()); - test(file); + if (file != INVALID_HANDLE_VALUE) + test(file); CloseHandle(file); }

1 0

Michael Müller : imagehlp: Implement ImageLoad and cleanup ImageUnload.
by Alexandre Julliard March 25, 2019

March 25, 2019

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

Gabriel Ivăncescu : include/commctrl: Add style definitions for split buttons.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: e5bde584112e57c319c8471fa58259f31bcf00be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bde584112e57c319c8471f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 14:20:59 2019 +0200 include/commctrl: Add style definitions for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 9b86bdb..4706946 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1096,6 +1096,16 @@ typedef struct tagNMBCHOTITEM #define BS_COMMANDLINK 0x0000000E #define BS_DEFCOMMANDLINK 0x0000000F +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 + +#define BCSS_NOSPLIT 0x00000001 +#define BCSS_STRETCH 0x00000002 +#define BCSS_ALIGNLEFT 0x00000004 +#define BCSS_IMAGE 0x00000008 + /* Button macros */ #define Button_SetNote(button, note) \ (BOOL)SNDMSG(button, BCM_SETNOTE, 0, (LPARAM)(note))

1 0

Jacek Caban : mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 12ec83f75b479299c39afc1cd95b33a27b4e10c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ec83f75b479299c39afc1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 15:14:50 2019 +0100 mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 1239 ++++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.h | 15 +- 2 files changed, 637 insertions(+), 617 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12ec83f75b479299c39a…

1 0

Nikolay Sivov : mfreadwrite: Set url hint from stream content.
by Alexandre Julliard March 25, 2019

March 25, 2019

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: Append the custom action client PID to the endpoint name.
by Alexandre Julliard March 25, 2019

March 25, 2019

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 March 25, 2019

March 25, 2019

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

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 5b2113de2d62a22828d793a3fd82741c8f181c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b2113de2d62a22828d793a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 10:06:05 2019 +0100 wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46895 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 11 +++++++++++ dlls/wbemprox/tests/query.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fc04f3f..d4c2630 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -314,6 +314,8 @@ static const WCHAR prop_numlogicalprocessorsW[] = {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR prop_numprocessorsW[] = {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; +static const WCHAR prop_operatingsystemskuW[] = + {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = @@ -588,6 +590,7 @@ static const struct column col_os[] = { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_operatingsystemskuW, CIM_UINT32, VT_I4 }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -1015,6 +1018,7 @@ struct record_operatingsystem const WCHAR *localdatetime; const WCHAR *locale; const WCHAR *name; + UINT32 operatingsystemsku; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3197,6 +3201,12 @@ static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) if (ret) sprintfW( ret, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } +static DWORD get_operatingsystemsku(void) +{ + DWORD ret = PRODUCT_UNDEFINED; + GetProductInfo( 6, 0, 0, 0, &ret ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -3222,6 +3232,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); rec->name = get_osname( rec->caption ); + rec->operatingsystemsku = get_operatingsystemsku(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b622ac2..510e7aa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1234,6 +1234,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR operatingsystemskuW[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; @@ -1315,6 +1316,18 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, operatingsystemskuW, 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "operatingsystemsku: %08x\n", V_I4( &val ) ); + VariantClear( &val ); + } + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, osproductsuiteW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0