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

Zebediah Figura : setupapi/tests: Add tests for SetupDiGetActualSectionToInstall().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 6244f05941f13bf330d68208849d74ae54f116a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6244f05941f13bf330d68208… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:09 2019 -0500 setupapi/tests: Add tests for SetupDiGetActualSectionToInstall(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 203 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 182 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9107d82..8372a7b 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -41,6 +41,19 @@ static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c, BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); +static void create_file(const char *name, const char *data) +{ + HANDLE file; + DWORD size; + BOOL ret; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create %s, error %u.\n", name, GetLastError()); + ret = WriteFile(file, data, strlen(data), &size, NULL); + ok(ret && size == strlen(data), "Failed to write %s, error %u.\n", name, GetLastError()); + CloseHandle(file); +} + static void test_create_device_list_ex(void) { static const WCHAR machine[] = { 'd','u','m','m','y',0 }; @@ -103,26 +116,6 @@ todo_wine RegCloseKey(root_key); } -static void create_inf_file(LPCSTR filename) -{ - DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - static const char data[] = - "[Version]\n" - "Signature=\"$Chicago$\"\n" - "Class=Bogus\n" - "ClassGUID={6a55b5a4-3f65-11db-b704-0011955c2bdb}\n" - "[ClassInstall32]\n" - "AddReg=BogusClass.NT.AddReg\n" - "[BogusClass.NT.AddReg]\n" - "HKR,,,,\"Wine test devices\"\n"; - - WriteFile(hf, data, sizeof(data) - 1, &dwNumberOfBytesWritten, NULL); - CloseHandle(hf); -} - static void get_temp_filename(LPSTR path) { static char curr[MAX_PATH] = { 0 }; @@ -148,10 +141,20 @@ static void test_install_class(void) char tmpfile[MAX_PATH]; BOOL ret; + static const char inf_data[] = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "Class=Bogus\n" + "ClassGUID={6a55b5a4-3f65-11db-b704-0011955c2bdb}\n" + "[ClassInstall32]\n" + "AddReg=BogusClass.NT.AddReg\n" + "[BogusClass.NT.AddReg]\n" + "HKR,,,,\"Wine test devices\"\n"; + tmpfile[0] = '.'; tmpfile[1] = '\\'; get_temp_filename(tmpfile + 2); - create_inf_file(tmpfile + 2); + create_file(tmpfile + 2, inf_data); ret = SetupDiInstallClassA(NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); @@ -1952,10 +1955,168 @@ static void test_device_install_params(void) SetupDiDestroyDeviceInfoList(set); } +#ifdef __i386__ +#define MYEXT "x86" +#define WOWEXT "AMD64" +#define WRONGEXT "ARM" +#elif defined(__x86_64__) +#define MYEXT "AMD64" +#define WOWEXT "x86" +#define WRONGEXT "ARM64" +#elif defined(__arm__) +#define MYEXT "ARM" +#define WOWEXT "ARM64" +#define WRONGEXT "x86" +#elif defined(__aarch64__) +#define MYEXT "ARM64" +#define WOWEXT "ARM" +#define WRONGEXT "AMD64" +#else +#define MYEXT +#define WOWEXT +#define WRONGEXT +#endif + +static void test_get_actual_section(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[section1]\n" + "[section2]\n" + "[section2.nt]\n" + "[section3]\n" + "[section3.nt" MYEXT "]\n" + "[section4]\n" + "[section4.nt]\n" + "[section4.nt" MYEXT "]\n" + "[section5.nt]\n" + "[section6.nt" MYEXT "]\n" + "[section7]\n" + "[section7.nt" WRONGEXT "]\n" + "[section8.nt" WRONGEXT "]\n" + "[section9.nt" MYEXT "]\n" + "[section9.nt" WOWEXT "]\n" + "[section10.nt" WOWEXT "]\n"; + + char inf_path[MAX_PATH], section[LINE_LEN], *extptr; + DWORD size; + HINF hinf; + BOOL ret; + + GetTempPathA(sizeof(inf_path), inf_path); + strcat(inf_path, "setupapi_test.inf"); + create_file(inf_path, inf_data); + + hinf = SetupOpenInfFileA(inf_path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, NULL); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcmp(section, "section1"), "Got unexpected section %s.\n", section); + + size = 0xdeadbeef; + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", NULL, 5, &size, NULL); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(size == 9, "Got size %u.\n", size); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, 5, &size, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(size == 9, "Got size %u.\n", size); + + SetLastError(0xdeadbeef); + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), &size, NULL); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); + ok(size == 9, "Got size %u.\n", size); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section2", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section2.NT"), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section3", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section3.NT" MYEXT), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section4", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section4.NT" MYEXT), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section5", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section5.NT"), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section6", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section6.NT" MYEXT), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + +todo_wine { + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); +} + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section9.NT" MYEXT), "Got unexpected section %s.\n", section); + ok(extptr == section + 8, "Got extension %s.\n", extptr); + +todo_wine { + if (0) + { + /* For some reason, this call hangs on Windows 10 1809. */ + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section10", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section10"), "Got unexpected section %s.\n", section); + ok(!extptr, "Got extension %s.\n", extptr); + } +} + + SetupCloseInfFile(hinf); + ret = DeleteFileA(inf_path); + ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError()); +} + START_TEST(devinst) { HKEY hkey; + test_get_actual_section(); + if ((hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS)) == INVALID_HANDLE_VALUE) { skip("needs admin rights\n");

1 0

Zebediah Figura : setupapi: Return the section name in SetupDiGetActualSectionToInstall() even if it doesn't exist.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 23320d05b628575ab9ccb44e4482a30268e9a93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23320d05b628575ab9ccb44e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:10 2019 -0500 setupapi: Return the section name in SetupDiGetActualSectionToInstall() even if it doesn't exist. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 12 +----------- dlls/setupapi/tests/devinst.c | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e41389b..943f7bb 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1879,17 +1879,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallW( } if (lLineCount == -1) - { - /* Test section name without extension */ - szBuffer[dwLength] = 0; - lLineCount = SetupGetLineCountW(InfHandle, szBuffer); - } - - if (lLineCount == -1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + szBuffer[dwLength] = 0; dwFullLength = lstrlenW(szBuffer); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 8372a7b..afb431f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2074,7 +2074,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); -todo_wine { extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2086,7 +2085,6 @@ todo_wine { ok(ret, "Failed to get section, error %#x.\n", GetLastError()); ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); -} extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr); @@ -2094,7 +2092,6 @@ todo_wine { ok(!strcasecmp(section, "section9.NT" MYEXT), "Got unexpected section %s.\n", section); ok(extptr == section + 8, "Got extension %s.\n", extptr); -todo_wine { if (0) { /* For some reason, this call hangs on Windows 10 1809. */ @@ -2104,7 +2101,6 @@ todo_wine { ok(!strcasecmp(section, "section10"), "Got unexpected section %s.\n", section); ok(!extptr, "Got extension %s.\n", extptr); } -} SetupCloseInfFile(hinf); ret = DeleteFileA(inf_path);

1 0

Zebediah Figura : quartz: Use CONTAINING_RECORD instead of casting.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 69e654a684dd0acbebcdf3b814eccdd1a7253f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e654a684dd0acbebcdf3b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:03 2019 -0500 quartz: Use CONTAINING_RECORD instead of casting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 10 +++++++--- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/vmr9.c | 23 ++++++++++++++--------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f55ebf2..a422f45 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -105,6 +105,11 @@ static inline AVISplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, AVISplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); } +static inline AVISplitterImpl *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, AVISplitterImpl, Parser.filter.IBaseFilter_iface); +} + /* The threading stuff cries for an explanation * * PullPin starts processing and calls AVISplitter_first_request @@ -1025,6 +1030,7 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface); static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, ALLOCATOR_PROPERTIES *props) { PullPin *This = impl_PullPin_from_IPin(iface); + AVISplitterImpl *pAviSplit = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); HRESULT hr; RIFFLIST list; LONGLONG pos = 0; /* in bytes */ @@ -1034,8 +1040,6 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, ULONG x; DWORD indexes; - AVISplitterImpl * pAviSplit = (AVISplitterImpl *)This->pin.pinInfo.pFilter; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list); @@ -1264,7 +1268,7 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface) static ULONG WINAPI AVISplitter_Release(IBaseFilter *iface) { - AVISplitterImpl *This = (AVISplitterImpl *)iface; + AVISplitterImpl *This = impl_from_IBaseFilter(iface); ULONG ref; ref = InterlockedDecrement(&This->Parser.filter.refCount); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b9eb149..31862d2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -759,8 +759,8 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { + DSoundRenderImpl *This = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 226fcac..c4cf93b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -485,7 +485,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { PullPin *pPin = impl_PullPin_from_IPin(iface); - MPEGSplitterImpl *This = (MPEGSplitterImpl*)pPin->pin.pinInfo.pFilter; + MPEGSplitterImpl *This = impl_from_IBaseFilter(pPin->pin.pinInfo.pFilter); HRESULT hr; LONGLONG pos = 0; /* in bytes */ BYTE header[10]; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3d22f12..847dc40 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -206,6 +206,11 @@ static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRSurfaceAllocatorE static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); +static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); +} + static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *info, LPBYTE data, DWORD size) { @@ -286,7 +291,7 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -351,7 +356,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE * pmt) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video) || !pmt->pbFormat) return S_FALSE; @@ -445,7 +450,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) static VOID WINAPI VMR9_OnStartStreaming(BaseRenderer* iface) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); TRACE("(%p)\n", This); @@ -463,7 +468,7 @@ static VOID WINAPI VMR9_OnStartStreaming(BaseRenderer* iface) static VOID WINAPI VMR9_OnStopStreaming(BaseRenderer* iface) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); TRACE("(%p)\n", This); @@ -481,7 +486,7 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) { - struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This; + struct quartz_vmr *pVMR9 = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr; TRACE("(%p)\n", This); @@ -495,7 +500,7 @@ static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin static HRESULT WINAPI VMR9_BreakConnect(BaseRenderer *This) { - struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This; + struct quartz_vmr *pVMR9 = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; if (!pVMR9->mode) @@ -863,7 +868,7 @@ static const IUnknownVtbl IInner_VTable = static HRESULT WINAPI VMR9_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(iface); if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -893,7 +898,7 @@ static HRESULT WINAPI VMR9_QueryInterface(IBaseFilter * iface, REFIID riid, LPVO static ULONG WINAPI VMR9_AddRef(IBaseFilter * iface) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(iface); LONG ret; if (This->outer_unk && This->bUnkOuterValid) @@ -908,7 +913,7 @@ static ULONG WINAPI VMR9_AddRef(IBaseFilter * iface) static ULONG WINAPI VMR9_Release(IBaseFilter * iface) { - struct quartz_vmr *This = (struct quartz_vmr*)iface; + struct quartz_vmr *This = impl_from_IBaseFilter(iface); LONG ret; if (This->outer_unk && This->bUnkOuterValid)

1 0

Zebediah Figura : qedit/samplegrabber: Correctly delegate IUnknown methods on the IMemInputPin interface.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 5351870ea10a20abfda9755a4a888013d9d80847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5351870ea10a20abfda9755a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:04 2019 -0500 qedit/samplegrabber: Correctly delegate IUnknown methods on the IMemInputPin interface. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9474a58..56947a1 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -672,31 +672,22 @@ SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB return S_OK; } - -/* SampleGrabber implementation of IMemInputPin interface */ - -/* IUnknown */ -static HRESULT WINAPI -SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv) +static HRESULT WINAPI SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_QueryInterface(&filter->pin_in.IPin_iface, iid, out); } -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) +static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_AddRef(This->outer_unk); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_AddRef(&filter->pin_in.IPin_iface); } -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) +static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_Release(This->outer_unk); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_Release(&filter->pin_in.IPin_iface); } /* IMemInputPin */

1 0

Zebediah Figura : amstream: Reimplement IMediaStreamFilter::EnumPins().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: f423c6e7079f797f81fe2f32db089eed5320b4d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f423c6e7079f797f81fe2f32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:05 2019 -0500 amstream: Reimplement IMediaStreamFilter::EnumPins(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 1 + dlls/amstream/mediastreamfilter.c | 167 +++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 16 ++-- 3 files changed, 174 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 8f25b8e..3cbc5c8 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -32,6 +32,7 @@ #include "mmstream.h" #include "austream.h" #include "amstream.h" +#include "wine/heap.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index a61d1e7..e9f98b6 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -34,6 +34,142 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); +struct enum_pins +{ + IEnumPins IEnumPins_iface; + LONG refcount; + + IPin **pins; + unsigned int count, index; +}; + +static const IEnumPinsVtbl enum_pins_vtbl; + +static struct enum_pins *impl_from_IEnumPins(IEnumPins *iface) +{ + return CONTAINING_RECORD(iface, struct enum_pins, IEnumPins_iface); +} + +static HRESULT WINAPI enum_pins_QueryInterface(IEnumPins *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumPins)) + { + IEnumPins_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_pins_AddRef(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + ULONG refcount = InterlockedIncrement(&enum_pins->refcount); + TRACE("%p increasing refcount to %u.\n", enum_pins, refcount); + return refcount; +} + +static ULONG WINAPI enum_pins_Release(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + ULONG refcount = InterlockedDecrement(&enum_pins->refcount); + unsigned int i; + + TRACE("%p decreasing refcount to %u.\n", enum_pins, refcount); + if (!refcount) + { + for (i = 0; i < enum_pins->count; ++i) + IPin_Release(enum_pins->pins[i]); + heap_free(enum_pins->pins); + heap_free(enum_pins); + } + return refcount; +} + +static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, ULONG *ret_count) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + unsigned int i; + + TRACE("iface %p, count %u, pins %p, ret_count %p.\n", iface, count, pins, ret_count); + + if (!pins || (count > 1 && !ret_count)) + return E_POINTER; + + for (i = 0; i < count && enum_pins->index < enum_pins->count; ++i) + { + IPin_AddRef(pins[i] = enum_pins->pins[i]); + enum_pins->index++; + } + + if (ret_count) *ret_count = i; + return i == count ? S_OK : S_FALSE; +} + +static HRESULT WINAPI enum_pins_Skip(IEnumPins *iface, ULONG count) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + + TRACE("iface %p, count %u.\n", iface, count); + + enum_pins->index += count; + + return enum_pins->index >= enum_pins->count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enum_pins_Reset(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + + TRACE("iface %p.\n", iface); + + enum_pins->index = 0; + return S_OK; +} + +static HRESULT WINAPI enum_pins_Clone(IEnumPins *iface, IEnumPins **out) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + struct enum_pins *object; + unsigned int i; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; + object->refcount = 1; + object->count = enum_pins->count; + object->index = enum_pins->index; + if (!(object->pins = heap_alloc(enum_pins->count * sizeof(*object->pins)))) + { + heap_free(object); + return E_OUTOFMEMORY; + } + for (i = 0; i < enum_pins->count; ++i) + IPin_AddRef(object->pins[i] = enum_pins->pins[i]); + + *out = &object->IEnumPins_iface; + return S_OK; +} + +static const IEnumPinsVtbl enum_pins_vtbl = +{ + enum_pins_QueryInterface, + enum_pins_AddRef, + enum_pins_Release, + enum_pins_Next, + enum_pins_Skip, + enum_pins_Reset, + enum_pins_Clone, +}; + typedef struct { BaseFilter filter; ULONG nb_streams; @@ -153,8 +289,35 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *if static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - return BaseFilterImpl_EnumPins(&This->filter.IBaseFilter_iface, enum_pins); + IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct enum_pins *object; + unsigned int i; + + TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); + + if (!enum_pins) + return E_POINTER; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; + object->refcount = 1; + object->count = filter->nb_streams; + object->index = 0; + if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) + { + heap_free(object); + return E_OUTOFMEMORY; + } + for (i = 0; i < filter->nb_streams; ++i) + { + if (FAILED(IAMMediaStream_QueryInterface(filter->streams[i], &IID_IPin, (void **)&object->pins[i]))) + WARN("Stream %p does not support IPin.\n", filter->streams[i]); + } + + *enum_pins = &object->IEnumPins_iface; + return S_OK; } static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 148e6bd..7215775 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -652,7 +652,7 @@ static void test_enum_pins(void) hr = IMediaStreamFilter_EnumPins(filter, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -666,7 +666,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 0); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 1); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -682,7 +682,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); IEnumPins_Release(enum1); @@ -690,7 +690,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - ok(ref == 4, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -700,7 +700,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); ref = get_refcount(filter); - ok(ref == 4, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -723,7 +723,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, &count); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -741,7 +741,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 1); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -759,7 +759,7 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); IMediaStream_Release(stream); ref = IPin_Release(pin); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_find_pin(void)

1 0

Zebediah Figura : amstream: Reimplement IBaseFilter methods in the media stream filter.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 7ef5f3be5aaf6317414826a5b979a6c288b13697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef5f3be5aaf6317414826a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:06 2019 -0500 amstream: Reimplement IBaseFilter methods in the media stream filter. In the long (or even short) term we probably want to decouple amstream from strmbase entirely. The fact that pins and filters belong to separate objects (and either one can even be provided by the application) prevents us from performing some helpful restructuring. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 225 ++++++++++++++++++++++++-------------- 1 file changed, 144 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef5f3be5aaf63174148…

1 0

Roman Stingler : kernel32: Add stub WerUnregisterRuntimeExceptionModule.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: e9dad9d733b8628b17e016898adda345fc83475e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dad9d733b8628b17e01689… Author: Roman Stingler <roman.stingler(a)gmail.com> Date: Thu May 16 21:14:34 2019 +0200 kernel32: Add stub WerUnregisterRuntimeExceptionModule. Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/wer.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/werapi.h | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 180ffed..0404830 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -5,6 +5,6 @@ @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -@ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule @ stub WerpNotifyLoadStringResource @ stub WerpNotifyUseStringResource diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 691cc60..13d9351 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1591,7 +1591,7 @@ @ stdcall WerSetFlags(long) # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpCleanupMessageMapping # @ stub WerpInitiateRemoteRecovery # @ stub WerpNotifyLoadStringResource diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index 3c517c4..2a7853b 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -81,3 +81,12 @@ HRESULT WINAPI WerUnregisterMemoryBlock(void *block) FIXME("(%p) stub\n", block); return E_NOTIMPL; } + +/*********************************************************************** + * WerUnregisterRuntimeExceptionModule (KERNEL32.@) + */ +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) +{ + FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); + return S_OK; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8294c95..9739644 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1709,7 +1709,7 @@ @ stdcall WerSetFlags(long) kernel32.WerSetFlags # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule # @ stub WerpNotifyLoadStringResource # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/include/werapi.h b/include/werapi.h index c66195f..247c612 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -186,6 +186,8 @@ HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); HRESULT WINAPI WerSetFlags(DWORD flags); HRESULT WINAPI WerUnregisterMemoryBlock(void *block); +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); + #ifdef __cplusplus }

1 0

Jacek Caban : urlmon/tests: Make ParseUrl call tests more strict.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: a9b27c2b0d2ac196fc627c75310bda4b4bd44fcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b27c2b0d2ac196fc627c75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 21:59:39 2019 +0200 urlmon/tests: Make ParseUrl call tests more strict. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ff0f24e..de0c654 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -61,6 +61,7 @@ DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA }while(0) DEFINE_EXPECT(ParseUrl); +DEFINE_EXPECT(ParseUrl_ENCODE); DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); @@ -875,9 +876,9 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - CHECK_EXPECT2(ParseUrl); - - if(ParseAction == PARSE_SECURITY_URL) { + switch(ParseAction) { + case PARSE_SECURITY_URL: + CHECK_EXPECT2(ParseUrl); if(pcchResult) *pcchResult = ARRAY_SIZE(url1); @@ -886,6 +887,12 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface memcpy(pwzResult, url1, sizeof(url1)); return S_OK; + case PARSE_ENCODE: + CHECK_EXPECT2(ParseUrl_ENCODE); + break; + default: + CHECK_EXPECT2(ParseUrl); + break; } return E_NOTIMPL; @@ -1030,24 +1037,24 @@ static void test_NameSpace(void) expect_cf = &test_protocol_cf; SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(CreateInstance); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(CreateInstance); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); qiret = S_OK; SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); @@ -1097,38 +1104,38 @@ static void test_NameSpace(void) ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); expect_cf = &test_protocol_cf2; SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres);

1 0

Marcus Meissner : setupapi: Fix size to MultiByteToWideChar().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 92919001f37f2d07fb7efb2b1c79ab1611ce57b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92919001f37f2d07fb7efb2b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 17 09:40:08 2019 +0200 setupapi: Fix size to MultiByteToWideChar(). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 943f7bb..5a49247 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3596,7 +3596,7 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, paramsW.FileQueue = params->FileQueue; paramsW.ClassInstallReserved = params->ClassInstallReserved; paramsW.Reserved = params->Reserved; - MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, ARRAY_SIZE(paramsW.DriverPath)); return SetupDiSetDeviceInstallParamsW(devinfo, device_data, &paramsW); }

1 0

Alexandre Julliard : winebuild: Don' t change %fs and %gs when calling 16-bit register functions.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 075e561f5cff26a80d2c21a7bb6d74d4a4585cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075e561f5cff26a80d2c21a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:43:06 2019 +0200 winebuild: Don't change %fs and %gs when calling 16-bit register functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 2 -- dlls/krnl386.exe16/ne_module.c | 2 -- dlls/krnl386.exe16/ne_segment.c | 4 ---- dlls/krnl386.exe16/thunk.c | 8 -------- dlls/system.drv16/system.c | 2 -- tools/winebuild/relay.c | 4 ---- 6 files changed, 22 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 99da47a..5b72bfa 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -222,8 +222,6 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR memset( &context, 0, sizeof(context) ); context.SegDs = context.SegEs = SELECTOROF( NtCurrentTeb()->WOW32Reserved ); - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SELECTOROF( hook ); context.Eip = OFFSETOF( hook ); context.Ebp = OFFSETOF( NtCurrentTeb()->WOW32Reserved ) + FIELD_OFFSET( STACK16FRAME, bp ); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 1979358..76ef355 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1234,8 +1234,6 @@ DWORD NE_StartTask(void) context.SegCs = GlobalHandleToSel16(pSegTable[SELECTOROF(pModule->ne_csip) - 1].hSeg); context.SegDs = GlobalHandleToSel16(pTask->hInstance); context.SegEs = pTask->hPDB; - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.Eip = OFFSETOF(pModule->ne_csip); context.Ebx = pModule->ne_stack; context.Ecx = pModule->ne_heap; diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index 1ceb714..000c576 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -689,8 +689,6 @@ static BOOL NE_InitDLL( NE_MODULE *pModule ) context.Edi = hInst; context.SegDs = ds; context.SegEs = ds; /* who knows ... */ - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SEL(pSegTable[SELECTOROF(pModule->ne_csip)-1].hSeg); context.Eip = OFFSETOF(pModule->ne_csip); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); @@ -794,8 +792,6 @@ static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason ) memset( &context, 0, sizeof(context) ); context.SegDs = ds; context.SegEs = ds; /* who knows ... */ - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = HIWORD(entryPoint); context.Eip = LOWORD(entryPoint); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index b4ba7d2..c8ad382 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -431,8 +431,6 @@ void WINAPI __regs_QT_Thunk( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(context->Edx); context16.Eip = LOWORD(context->Edx); /* point EBP to the STACK16FRAME on the stack @@ -561,8 +559,6 @@ void WINAPI __regs_FT_Thunk( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(callTarget); context16.Eip = LOWORD(callTarget); context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); @@ -720,8 +716,6 @@ void WINAPI __regs_Common32ThkLS( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.Edi = LOWORD(context->Ecx); context16.SegCs = HIWORD(context->Eax); context16.Eip = LOWORD(context->Eax); @@ -779,8 +773,6 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(context->Edx); context16.Eip = LOWORD(context->Edx); context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 8bb5cf9..b6fd51c 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -68,8 +68,6 @@ static void CALLBACK SYSTEM_TimerTick( LPVOID arg, DWORD low, DWORD high ) SYS_Timers[i].ticks += SYS_Timers[i].rate; memset( &context, 0, sizeof(context) ); - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SELECTOROF( proc ); context.Eip = OFFSETOF( proc ); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME, bp); diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 1adbda0..8718346 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -492,10 +492,6 @@ static void BuildCallTo16Core( int reg_func ) output( "\tpushw 0x98(%%edx)\n"); /* SegDs */ output( "\tpushl 0x94(%%edx)\n"); /* SegEs */ output( "\tpopl %%es\n" ); - output( "\tpushl 0x90(%%edx)\n"); /* SegFs */ - output( "\tpopl %%fs\n" ); - output( "\tpushl 0x8c(%%edx)\n"); /* SegGs */ - output( "\tpopl %%gs\n" ); output( "\tmovl 0xb4(%%edx),%%ebp\n"); /* Ebp */ output( "\tmovl 0xa0(%%edx),%%esi\n"); /* Esi */ output( "\tmovl 0x9c(%%edx),%%edi\n"); /* Edi */

1 0