wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : quartz/tests: Add tests for VMR9 pin interfaces.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: ea30abde1804c544ae967e791b6a342da65c840a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea30abde1804c544ae967e79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:46 2019 -0500 quartz/tests: Add tests for VMR9 pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 88b0562..a0d2ea1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -178,8 +178,10 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO static void test_interfaces(void) { + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; IBaseFilter *filter = create_vmr9(0); ULONG ref; + IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -220,6 +222,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); @@ -236,6 +252,20 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Renderless); @@ -251,6 +281,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Zebediah Figura : quartz/tests: Fix some VMR9 test failures.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 409c60f95c483102d87af39ee40ea677e9381ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409c60f95c483102d87af39e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:45 2019 -0500 quartz/tests: Fix some VMR9 test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21..88b0562 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE);

1 0

Piotr Caban : wineps.drv: Don't use strcasecmp.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: c191a1d44dc4464ed7c6c69b03253d239f17743e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c191a1d44dc4464ed7c6c69b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:50 2019 +0200 wineps.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e2106d3..75485cd 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -28,6 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -168,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, /* Look for a matching font family */ for(family = physDev->pi->Fonts; family; family = family->next) { - if(!strcasecmp(FaceName, family->FamilyName)) + if(!_strnicmp(FaceName, family->FamilyName, -1)) break; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index c8ec976..5c5033c 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winnls.h" #include "winspool.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -93,8 +94,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) for (i = 0; i < physDev->pi->FontSubTableSize; ++i) { - if (!strcasecmp (FaceName, - physDev->pi->FontSubTable[i].pValueName)) + if (!_strnicmp (FaceName, + physDev->pi->FontSubTable[i].pValueName, -1)) { TRACE ("substituting facename '%s' for '%s'\n", (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index f8919e3..788fb6e 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -190,8 +190,8 @@ static void read_afms(FILE *f_c, FILE *f_h) char *cp, linebuf[256], font_family[128]; int i, num_metrics; - cp = strrchr(de->d_name, '.'); /* Does it end in */ - if (cp == NULL || strcasecmp(cp, ".afm") != 0) /* .afm or .AFM? */ + cp = strrchr(de->d_name, '.'); /* Does it end in */ + if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ continue; f = fopen(de->d_name, "r"); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index f8de57b..08d07b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -30,6 +30,7 @@ #include <assert.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "psdrv.h" @@ -748,7 +749,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*ColorDevice", tuple.key)) { - if(!strcasecmp(tuple.value, "true")) + if(!_strnicmp(tuple.value, "true", -1)) ppd->ColorDevice = CD_True; else ppd->ColorDevice = CD_False; @@ -966,13 +967,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*TTRasterizer", tuple.key)) { - if(!strcasecmp("None", tuple.value)) + if(!_strnicmp("None", tuple.value, -1)) ppd->TTRasterizer = RO_None; - else if(!strcasecmp("Accept68K", tuple.value)) + else if(!_strnicmp("Accept68K", tuple.value, -1)) ppd->TTRasterizer = RO_Accept68K; - else if(!strcasecmp("Type42", tuple.value)) + else if(!_strnicmp("Type42", tuple.value, -1)) ppd->TTRasterizer = RO_Type42; - else if(!strcasecmp("TrueImage", tuple.value)) + else if(!_strnicmp("TrueImage", tuple.value, -1)) ppd->TTRasterizer = RO_TrueImage; else { FIXME("Unknown option %s for *TTRasterizer\n", @@ -988,14 +989,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) duplex->Name = tuple.option; duplex->FullName = tuple.opttrans; duplex->InvocationString = tuple.value; - if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) - || !strcasecmp("Simplex", tuple.option)) + if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) + || !_strnicmp("Simplex", tuple.option, -1)) duplex->WinDuplex = DMDUP_SIMPLEX; - else if(!strcasecmp("DuplexNoTumble", tuple.option)) + else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_VERTICAL; - else if(!strcasecmp("DuplexTumble", tuple.option)) + else if(!_strnicmp("DuplexTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_HORIZONTAL; - else if(!strcasecmp("Notcapable", tuple.option)) + else if(!_strnicmp("Notcapable", tuple.option, -1)) duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index f9a8bcb..19bb2d3 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -48,6 +48,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -464,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "false") == 0) + if (_strnicmp(sz, "false", -1) == 0) { afm->IsFixedPitch = FALSE; *p_found = TRUE; @@ -472,7 +473,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "true") == 0) + if (_strnicmp(sz, "true", -1) == 0) { afm->IsFixedPitch = TRUE; *p_found = TRUE; @@ -1142,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) CHAR *file_extension = strchr(dent->d_name, '.'); int fn_len; - if (file_extension == NULL || strcasecmp(file_extension, ".afm") != 0) + if (file_extension == NULL || _strnicmp(file_extension, ".afm", -1) != 0) continue; fn_len = snprintf(filename, 256, "%s/%s", dirname, dent->d_name);

1 0

Piotr Caban : msi: Use case sensitive compare in handle_msi_break.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 8c4b75f252dd5f127320144a43472d4558489af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4b75f252dd5f127320144a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 19:57:05 2019 +0200 msi: Use case sensitive compare in handle_msi_break. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index facb1d8..647961c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -468,7 +468,7 @@ static void handle_msi_break(LPCSTR target) if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) return; - if (strcasecmp(val, target)) + if (strcmp(val, target)) return; sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId());

1 0

Vijay Kiran Kamuju : taskmgr: Use StrFormatKBSizeW/ StrFormatByteSizeW to show memory usage.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 17056908acae1d5c7cf5d255ec232210abfe86da URL: https://source.winehq.org/git/wine.git/?a=commit;h=17056908acae1d5c7cf5d255… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 3 15:18:37 2019 +0200 taskmgr: Use StrFormatKBSizeW/StrFormatByteSizeW to show memory usage. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/graph.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 48313e9..6006ac3 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e1..9a8f569 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commctrl.h> +#include <shlwapi.h> #include <winnt.h> #include "taskmgr.h" @@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - /* * Get the client area rectangle */ @@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); + if (CommitChargeTotal < 1024) + StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); + else + StrFormatByteSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); /* * Draw the font text onto the graph

1 0

Detlef Riekenberg : iphlpapi/tests: Remove a test with a wrong assumption.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: f0db9c4b3be1f44289d2f7e26d4fa3548edf6d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db9c4b3be1f44289d2f7e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 18:25:22 2019 +0200 iphlpapi/tests: Remove a test with a wrong assumption. The order of the interfaces is not fixed and can change, Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1be9f3c..a2be862 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -285,9 +285,6 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - /* loopback must never be the first when more than one interface is found */ - if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) - ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Detlef Riekenberg : combase/tests: Remove a no longer useful test.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: baac17030cfb9d6aec5549125f117c5ff47c0b86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baac17030cfb9d6aec554912… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 17:43:39 2019 +0200 combase/tests: Remove a no longer useful test. Microsoft changed the behavior from returning NULL into returning a valid pointer. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 7a705da..04d0f3e 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -227,7 +227,6 @@ static void test_string_buffer(void) /* Test creation of an empty buffer */ ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); - ok(buf == NULL, "Empty string buffer isn't a null string\n"); ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n");

1 0

Vincent Povirk : mscoree: Don't return from _CorExeMain.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: fe4f00681e8e4f1c63ab253490af0d3acfd0262c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4f00681e8e4f1c63ab2534… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:21:59 2019 -0500 mscoree: Don't return from _CorExeMain. Testing on Windows shows that unmanaged threads do not keep the process open after a .NET program's entry point and all .NET foreground threads have exited. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ca8ba0d..95f6a9a 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1524,6 +1524,8 @@ __int32 WINAPI _CorExeMain(void) mono_runtime_quit(); } + ExitProcess(exit_code); + return exit_code; }

1 0

Vincent Povirk : mscoree: Update install process to account for shared installs.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 23181b40c5d8eba1275ffa41f30e84d30660064e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23181b40c5d8eba1275ffa41… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:32 2019 -0500 mscoree: Update install process to account for shared installs. This will install the support MSI if it's found in a shared install. Otherwise, it'll fall back to appwiz as before. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 4 +- dlls/mscoree/mscoree_main.c | 166 +++++++++++++++++++++++++++++------------ dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 122 insertions(+), 50 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3c4f803..50d43b3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -129,8 +129,6 @@ void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); -static BOOL get_mono_path(LPWSTR path); - static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); @@ -772,7 +770,7 @@ static BOOL get_mono_path_datadir(LPWSTR path) return ret; } -static BOOL get_mono_path(LPWSTR path) +BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || get_mono_path_registry(path) || diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7bb6359..6393af8 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -665,30 +665,81 @@ static void parse_msi_version_string(const char *version, int *parts) } } +static int compare_versions(const char *a, const char *b) +{ + int a_parts[3], b_parts[3], i; + + parse_msi_version_string(a, a_parts); + parse_msi_version_string(b, b_parts); + + for (i=0; i<3; i++) + if (a_parts[i] != b_parts[i]) + return a_parts[i] - b_parts[i]; + + return 0; +} + +static BOOL invoke_appwiz(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + WCHAR *args; + LONG len; + BOOL ret; + + static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; + static const WCHAR argsW[] = + {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; + + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); + memcpy(app+len, controlW, sizeof(controlW)); + + args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); + if(!args) + return FALSE; + + memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); + memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, args); + if (ret) { + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + } + + return ret; +} + static BOOL install_wine_mono(void) { + static const WCHAR support_msi_relative[] = {'\\','s','u','p','p','o','r','t','\\','w','i','n','e','m','o','n','o','-','s','u','p','p','o','r','t','.','m','s','i',0}; BOOL is_wow64 = FALSE; - HMODULE hmsi; + HMODULE hmsi = NULL; + HRESULT initresult = E_FAIL; UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); + UINT (WINAPI *pMsiOpenPackageW)(LPCWSTR,ULONG*); + UINT (WINAPI *pMsiGetProductPropertyA)(ULONG,LPCSTR,LPSTR,LPDWORD); + UINT (WINAPI *pMsiCloseHandle)(ULONG); + UINT (WINAPI *pMsiInstallProductW)(LPCWSTR,LPCWSTR); char versionstringbuf[15]; char productcodebuf[39]; UINT res; DWORD buffer_size; - PROCESS_INFORMATION pi; - STARTUPINFOW si; - WCHAR app[MAX_PATH]; - WCHAR *args; - LONG len; + ULONG msiproduct; BOOL ret; + WCHAR mono_path[MAX_PATH]; + WCHAR support_msi_path[MAX_PATH]; - static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; - static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; - static const WCHAR argsW[] = - {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; - IsWow64Process(GetCurrentProcess(), &is_wow64); if (is_wow64) @@ -697,6 +748,16 @@ static BOOL install_wine_mono(void) return TRUE; } + TRACE("searching for mono runtime\n"); + + if (!get_mono_path(mono_path)) + { + TRACE("mono runtime not found\n"); + return invoke_appwiz(); + } + + TRACE("mono runtime is at %s\n", debugstr_w(mono_path)); + hmsi = LoadLibraryA("msi"); if (!hmsi) @@ -722,57 +783,68 @@ static BOOL install_wine_mono(void) ERR("MsiEnumRelatedProducts failed, err=%u\n", res); } - FreeLibrary(hmsi); + if (res == ERROR_SUCCESS) + { + TRACE("found installed support package %s\n", versionstringbuf); + + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("support package is at least %s, quitting\n", WINE_MONO_VERSION); + ret = TRUE; + goto end; + } + } + + strcpyW(support_msi_path, mono_path); + strcatW(support_msi_path, support_msi_relative); + + initresult = CoInitialize(NULL); + + pMsiOpenPackageW = (void*)GetProcAddress(hmsi, "MsiOpenPackageW"); + + res = pMsiOpenPackageW(support_msi_path, &msiproduct); if (res == ERROR_SUCCESS) { - int current_version[3], wanted_version[3], i; + buffer_size = sizeof(versionstringbuf); - TRACE("found installed version %s\n", versionstringbuf); + pMsiGetProductPropertyA = (void*)GetProcAddress(hmsi, "MsiGetProductPropertyA"); - parse_msi_version_string(versionstringbuf, current_version); - parse_msi_version_string(mono_version, wanted_version); + res = pMsiGetProductPropertyA(msiproduct, "ProductVersion", versionstringbuf, &buffer_size); - for (i=0; i<3; i++) - { - if (current_version[i] < wanted_version[i]) - break; - else if (current_version[i] > wanted_version[i]) - { - TRACE("installed version is newer than %s, quitting\n", mono_version); - return TRUE; - } - } + pMsiCloseHandle = (void*)GetProcAddress(hmsi, "MsiCloseHandle"); - if (i == 3) - { - TRACE("version %s is already installed, quitting\n", mono_version); - return TRUE; - } + pMsiCloseHandle(msiproduct); } - len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); - memcpy(app+len, controlW, sizeof(controlW)); + if (res == ERROR_SUCCESS) { + TRACE("found support msi version %s at %s\n", versionstringbuf, debugstr_w(support_msi_path)); - args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); - if(!args) - return FALSE; + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("installing support msi\n"); - memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + pMsiInstallProductW = (void*)GetProcAddress(hmsi, "MsiInstallProductW"); - TRACE("starting %s\n", debugstr_w(args)); + res = pMsiInstallProductW(support_msi_path, NULL); - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - HeapFree(GetProcessHeap(), 0, args); - if (ret) { - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); + if (res == ERROR_SUCCESS) + { + ret = TRUE; + goto end; + } + else + ERR("MsiInstallProduct failed, err=%i\n", res); + } } + ret = invoke_appwiz(); + +end: + if (hmsi) + FreeLibrary(hmsi); + if (SUCCEEDED(initresult)) + CoUninitialize(); return ret; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7761099..43209fd 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -108,6 +108,8 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; +extern BOOL get_mono_path(LPWSTR path) DECLSPEC_HIDDEN; + extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Search shared addon locations for mono runtime.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: dc2c580bdfab2b6850241afae66d7dee5db94c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc2c580bdfab2b6850241afa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:31 2019 -0500 mscoree: Search shared addon locations for mono runtime. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 2 ++ dlls/mscoree/metahost.c | 67 +++++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 2 +- dlls/mscoree/mscoree_private.h | 2 ++ 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 634869e..9ae43df 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ mscoree_main.c IDL_SRCS = mscoree_classes.idl + +metahost_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d6af7b6..3c4f803 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -712,10 +712,75 @@ static BOOL get_mono_path_registry(LPWSTR path) return ret; } +static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) +{ + static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); + LPWSTR dos_dir; + WCHAR mono_dll_path[MAX_PATH]; + BOOL ret; + + if (!p_wine_get_dos_file_name) + { + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + if (!p_wine_get_dos_file_name) + return FALSE; + } + + dos_dir = p_wine_get_dos_file_name(unix_dir); + if (!dos_dir) + return FALSE; + + ret = find_mono_dll(dos_dir, mono_dll_path); + if (ret) + strcpyW(path, dos_dir); + + heap_free(dos_dir); + + return ret; +} + +static BOOL get_mono_path_datadir(LPWSTR path) +{ + const char *data_dir; + char *package_dir; + int len; + BOOL ret; + + if((data_dir = wine_get_data_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/mono/wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/mono/wine-mono-" WINE_MONO_VERSION); + } + else if((data_dir = wine_get_build_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/../wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/../wine-mono-" WINE_MONO_VERSION); + } + else + { + return FALSE; + } + + ret = get_mono_path_unix(package_dir, path); + + heap_free(package_dir); + + return ret; +} + static BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || - get_mono_path_registry(path); + get_mono_path_registry(path) || + get_mono_path_datadir(path) || + get_mono_path_unix(INSTALL_DATADIR "/wine/mono/wine-mono-" WINE_MONO_VERSION, path) || + (strcmp(INSTALL_DATADIR, "/usr/share") && + get_mono_path_unix("/usr/share/wine/mono/wine-mono-" WINE_MONO_VERSION, path)) || + get_mono_path_unix("/opt/wine/mono/wine-mono-" WINE_MONO_VERSION, path); } struct InstalledRuntimeEnum diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 198e279..7bb6359 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.1"; + static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 4e7ee01..7761099 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,6 +45,8 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; +#define WINE_MONO_VERSION "4.8.1" + /* Mono embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly;

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
81
Older →

Jump to page:

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-commits April 2019