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

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

May 17, 2019

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

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

May 17, 2019

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

Zebediah Figura : quartz: Use CONTAINING_RECORD instead of casting.
by Alexandre Julliard May 17, 2019

May 17, 2019

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 : setupapi: Return the section name in SetupDiGetActualSectionToInstall() even if it doesn't exist.
by Alexandre Julliard May 17, 2019

May 17, 2019

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 : setupapi/tests: Add tests for SetupDiGetActualSectionToInstall().
by Alexandre Julliard May 17, 2019

May 17, 2019

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

Alexandre Julliard : cabinet/tests: Remove duplicate defines.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: d38ec9e226422dc2fb2b5461400ae09858a98012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38ec9e226422dc2fb2b5461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:12 2019 +0200 cabinet/tests: Remove duplicate defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/tests/fdi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 80f6a3c..1f1c6e2 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -20,6 +20,8 @@ */ #include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> #include <windows.h> #include "fci.h" #include "fdi.h" @@ -31,16 +33,6 @@ static CHAR CURR_DIR[MAX_PATH]; -/* avoid including CRT headers */ -#ifndef _O_BINARY -# define _O_BINARY 0x8000 -#endif - -#ifndef _S_IREAD -# define _S_IREAD 0x0100 -# define _S_IWRITE 0x0080 -#endif - #include <pshpack1.h> struct CFHEADER

1 0

Alexandre Julliard : makefiles: Use -fshort-wchar when building with msvcrt.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 945efdb6f304fde4399ccfee525816af6cfa5eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=945efdb6f304fde4399ccfee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:39 2019 +0200 makefiles: Use -fshort-wchar when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 35 +++++++++++++++++++++++++++++++---- configure.ac | 4 +++- tools/winebuild/utils.c | 4 ++++ tools/winegcc/winegcc.c | 2 ++ 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 63e58d5..193ecc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,7 @@ CPPFLAGS = @CPPFLAGS@ CROSSCFLAGS = @CROSSCFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ -MSVCRTFLAGS = @BUILTINFLAG@ +MSVCRTFLAGS = @MSVCRTFLAGS@ TARGETFLAGS = @TARGETFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ diff --git a/configure b/configure index d3253a2..69d085c 100755 --- a/configure +++ b/configure @@ -631,7 +631,8 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -BUILTINFLAG +UNWINDFLAGS +MSVCRTFLAGS EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS @@ -17121,7 +17122,9 @@ fi ;; esac done - case $host_os in + MSVCRTFLAGS="" + + case $host_os in cygwin*|mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } @@ -17146,8 +17149,32 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 $as_echo "$ac_cv_cflags__fno_builtin" >&6; } if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - + MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fshort-wchar" >&5 +$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; } +if ${ac_cv_cflags__fshort_wchar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fshort-wchar" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fshort_wchar=yes +else + ac_cv_cflags__fshort_wchar=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fshort_wchar" >&5 +$as_echo "$ac_cv_cflags__fshort_wchar" >&6; } +if test "x$ac_cv_cflags__fshort_wchar" = xyes; then : + MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" fi ;; esac diff --git a/configure.ac b/configure.ac index c7f5236..0490b53 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,9 +2011,11 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= done dnl Disable gcc builtins except for Mingw + AC_SUBST(MSVCRTFLAGS,"") case $host_os in cygwin*|mingw32*) ;; - *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b8a5125..315643c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -462,6 +462,10 @@ struct strarray get_ld_command(void) break; } } + + if (target_cpu == CPU_ARM && target_platform != PLATFORM_WINDOWS) + strarray_add( &args, "--no-wchar-size-warning", NULL ); + return args; } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 33f838f..28dce1b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -477,6 +477,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,-Bsymbolic" ); + if (!opts->noshortwchar && opts->target_cpu == CPU_ARM) + strarray_add( flags, "-Wl,--no-wchar-size-warning" ); /* Try all options first - this is likely to succeed on modern compilers */ if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic "

1 0

Alexandre Julliard : makefiles: Don' t depend on cross import library if not necessary.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 40a76a212bf92547af8f16c0c3d5bcf83cbe7ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a76a212bf92547af8f16c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:54:45 2019 +0200 makefiles: Don't depend on cross import library if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 24def39..7ed9efd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3553,9 +3553,13 @@ static void output_subdirs( struct makefile *make ) } else { - strarray_add( &build_deps, strmake( "%s.a", importlib_path )); - if (needs_delay_lib( submake )) output( "%s.delay.a ", importlib_path ); + if (needs_delay_lib( submake )) + { + output( "%s.delay.a ", importlib_path ); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( "%s.a: %s", importlib_path, spec_file ); + strarray_add( &build_deps, strmake( "%s.a", importlib_path )); } output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3568,8 +3572,16 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake ))) { - if (needs_cross_lib( submake )) output_filename( strmake( "%s.cross.a", importlib_path )); - if (needs_delay_lib( submake )) output_filename( strmake( "%s.delay.a", importlib_path )); + if (needs_cross_lib( submake )) + { + output_filename( strmake( "%s.cross.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); + } + if (needs_delay_lib( submake )) + { + output_filename( strmake( "%s.delay.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( ": %s", spec_file ); output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3578,10 +3590,7 @@ static void output_subdirs( struct makefile *make ) output_filename( "--export" ); output_filename( spec_file ); output( "\n" ); - strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); } - if (needs_delay_lib( submake )) - strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); } strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); }

1 0

Philip Rebohle : d3dcompiler: Accept a stat chunk size of 28 for reflection.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: b1f9cd57be74c52ab0d56cbaf47065d8f560827c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f9cd57be74c52ab0d56cba… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu May 16 17:05:59 2019 +0200 d3dcompiler: Accept a stat chunk size of 28 for reflection. Fixes "unhandled size" error for Crysis shaders. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 24190f6..7c67c92 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1127,7 +1127,12 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &r->gs_max_output_vertex_count); TRACE("GSMaxOutputVertexCount: %u\n", r->gs_max_output_vertex_count); - skip_dword_unknown(&ptr, 3); + skip_dword_unknown(&ptr, 2); + + /* old dx10 stat size */ + if (size == 28) return S_OK; + + skip_dword_unknown(&ptr, 1); /* dx10 stat size */ if (size == 29) return S_OK;

1 0

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

May 17, 2019

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