February 2022 - Wine-commits

Eric Pouech : mstask: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: f58d93bdc94ed9adf638a821815773cc64a92d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f58d93bdc94ed9adf638a821… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:35 2022 +0100 mstask: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 1 - dlls/mstask/task.c | 34 +++++++++++++++++----------------- dlls/mstask/task_scheduler.c | 8 ++++---- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 0db016ead8a..086d3c0c5ab 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 398cefc58e4..23e9af7f0f3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -659,7 +659,7 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( HWND hParent, DWORD dwReserved) { - FIXME("(%p, %p, %d): stub\n", iface, hParent, dwReserved); + FIXME("(%p, %p, %ld): stub\n", iface, hParent, dwReserved); return E_NOTIMPL; } @@ -901,7 +901,7 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags(ITask *iface, DWORD flags) { TaskImpl *This = impl_from_ITask(iface); - TRACE("(%p, 0x%08x)\n", iface, flags); + TRACE("(%p, 0x%08lx)\n", iface, flags); This->flags &= 0xffff8000; This->flags |= flags & 0x7fff; This->is_dirty = TRUE; @@ -1127,7 +1127,7 @@ static HRESULT WINAPI MSTASK_ITask_SetPriority( ITask* iface, DWORD dwPriority) { - FIXME("(%p, 0x%08x): stub\n", iface, dwPriority); + FIXME("(%p, 0x%08lx): stub\n", iface, dwPriority); return E_NOTIMPL; } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( ITask* iface, DWORD dwFlags) { - FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); + FIXME("(%p, 0x%08lx): stub\n", iface, dwFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( { TaskImpl *This = impl_from_ITask(iface); - TRACE("(%p, %d)\n", iface, dwMaxRunTime); + TRACE("(%p, %ld)\n", iface, dwMaxRunTime); This->maxRunTime = dwMaxRunTime; This->is_dirty = TRUE; @@ -1229,7 +1229,7 @@ static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) { if (limit < sizeof(USHORT)) { - TRACE("invalid string %u offset\n", i); + TRACE("invalid string %lu offset\n", i); break; } @@ -1239,11 +1239,11 @@ static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) limit -= sizeof(USHORT); if (limit < len * sizeof(WCHAR)) { - TRACE("invalid string %u size\n", i); + TRACE("invalid string %lu size\n", i); break; } - TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + TRACE("string %lu: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); switch (i) { @@ -1315,7 +1315,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); This->exit_code = fixed->exit_code; - TRACE("status %08x\n", fixed->status); + TRACE("status %08lx\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); This->flags = fixed->flags; @@ -1342,7 +1342,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("invalid name_size_offset\n"); return SCHED_E_INVALID_TASK; } - TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + TRACE("unicode strings end at %#lx\n", fixed->name_size_offset + unicode_strings_size); if (size < fixed->trigger_offset + sizeof(USHORT)) { @@ -1352,7 +1352,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) trigger_count = *(const USHORT *)(data + fixed->trigger_offset); TRACE("trigger_count %u\n", trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); - TRACE("triggers_size %u\n", triggers_size); + TRACE("triggers_size %lu\n", triggers_size); task_trigger = (TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); data += fixed->name_size_offset + unicode_strings_size; @@ -1371,7 +1371,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("no space for user data\n"); return SCHED_E_INVALID_TASK; } - TRACE("User Data size %#x\n", data_size); + TRACE("User Data size %#lx\n", data_size); ITask_SetWorkItemData(task, data_size, data + sizeof(USHORT)); size -= sizeof(USHORT) + data_size; @@ -1390,13 +1390,13 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("no space for reserved data\n"); return SCHED_E_INVALID_TASK; } - TRACE("Reserved Data size %#x\n", data_size); + TRACE("Reserved Data size %#lx\n", data_size); size -= sizeof(USHORT) + data_size; data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT)); @@ -1449,7 +1449,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi DWORD access, sharing, size, try; void *data; - TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); + TRACE("(%p, %s, 0x%08lx)\n", iface, debugstr_w(file_name), mode); switch (mode & 0x000f) { @@ -1488,7 +1488,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { - TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + TRACE("Failed to open %s, error %lu\n", debugstr_w(file_name), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } Sleep(100); @@ -1499,7 +1499,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); if (!mapping) { - TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(file_name), GetLastError()); + TRACE("Failed to create file mapping %s, error %lu\n", debugstr_w(file_name), GetLastError()); CloseHandle(file); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 12eeae3565c..d8ccee37f59 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -85,7 +85,7 @@ static ULONG WINAPI EnumWorkItems_AddRef(IEnumWorkItems *iface) { EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -94,7 +94,7 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) { @@ -131,7 +131,7 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW LPWSTR *list; HRESULT hr = S_FALSE; - TRACE("(%p)->(%u %p %p)\n", This, count, names, fetched); + TRACE("(%p)->(%lu %p %p)\n", This, count, names, fetched); if (!count || !names || (!fetched && count > 1)) return E_INVALIDARG; @@ -212,7 +212,7 @@ static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) ULONG fetched; HRESULT hr; - TRACE("(%p)->(%u)\n", iface, count); + TRACE("(%p)->(%lu)\n", iface, count); hr = EnumWorkItems_Next(iface, count, &names, &fetched); if (SUCCEEDED(hr))

1 0

Eric Pouech : msvfw32: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 4d9519f5e242325a097b72e2dca6968f8cfa9197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9519f5e242325a097b72e2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:41 2022 +0100 msvfw32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/Makefile.in | 1 - dlls/msvfw32/drawdib.c | 18 +++++++++--------- dlls/msvfw32/mciwnd.c | 24 ++++++++++++------------ dlls/msvfw32/msvideo_main.c | 40 ++++++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9519f5e242325a097b…

1 0

Eric Pouech : msvidc32: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 16873ae059abeaae4193259a2a461df4b84a10cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=16873ae059abeaae4193259a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:47 2022 +0100 msvidc32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvidc32/Makefile.in | 1 - dlls/msvidc32/msvideo1.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 6b57d14b734..2fc8f907541 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msvidc32.dll IMPORTS = user32 diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 7b866d04caf..327882f68f2 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -306,15 +306,15 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) TRACE("in->planes = %d\n", in->bmiHeader.biPlanes ); TRACE("in->bpp = %d\n", in->bmiHeader.biBitCount ); - TRACE("in->height = %d\n", in->bmiHeader.biHeight ); - TRACE("in->width = %d\n", in->bmiHeader.biWidth ); - TRACE("in->compr = 0x%x\n", in->bmiHeader.biCompression ); + TRACE("in->height = %ld\n", in->bmiHeader.biHeight ); + TRACE("in->width = %ld\n", in->bmiHeader.biWidth ); + TRACE("in->compr = 0x%lx\n", in->bmiHeader.biCompression ); if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && ( in->bmiHeader.biCompression != WHAM_MAGIC ) ) { - TRACE("can't do 0x%x compression\n", in->bmiHeader.biCompression); + TRACE("can't do 0x%lx compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; } @@ -330,8 +330,8 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) { TRACE("out->planes = %d\n", out->bmiHeader.biPlanes ); TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); - TRACE("out->height = %d\n", out->bmiHeader.biHeight ); - TRACE("out->width = %d\n", out->bmiHeader.biWidth ); + TRACE("out->height = %ld\n", out->bmiHeader.biHeight ); + TRACE("out->width = %ld\n", out->bmiHeader.biWidth ); if ((in->bmiHeader.biBitCount != out->bmiHeader.biBitCount) && (in->bmiHeader.biBitCount != 16 || out->bmiHeader.biBitCount != 24)) @@ -444,7 +444,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD LONG width, height, stride, sz; void *output; - TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; @@ -490,7 +490,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW LONG width, height, stride, sz; void *output; - TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; @@ -559,7 +559,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, Msvideo1Context *info = (Msvideo1Context *) dwDriverId; LRESULT r = ICERR_UNSUPPORTED; - TRACE("%ld %p %04x %08lx %08lx\n", dwDriverId, hdrvr, msg, lParam1, lParam2); + TRACE("%Id %p %04x %08Ix %08Ix\n", dwDriverId, hdrvr, msg, lParam1, lParam2); switch( msg ) { @@ -653,7 +653,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, break; default: - FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); + FIXME("Unknown message: %04x %Id %Id\n", msg, lParam1, lParam2); } return r; @@ -664,7 +664,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); + TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); switch (dwReason) {

1 0

Eric Pouech : msvideo.dll16: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 1c8c7aac914c08fdac4f5b1052c67c1d86a48873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c8c7aac914c08fdac4f5b10… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:53 2022 +0100 msvideo.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/Makefile.in | 1 - dlls/msvideo.dll16/msvideo16.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in index dfc900f8cb5..5f7a9a4c33d 100644 --- a/dlls/msvideo.dll16/Makefile.in +++ b/dlls/msvideo.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msvideo.dll16 IMPORTS = msvfw32 version advapi32 user32 diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 840de2efa8c..3a7a761382e 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -166,7 +166,7 @@ LRESULT VFWAPIV ICMessage16( HIC16 hic, UINT16 msg, UINT16 cb, VA_LIST16 valist lpData = HeapAlloc(GetProcessHeap(), 0, cb); - TRACE("0x%08x, %u, %u, ...)\n", (DWORD) hic, msg, cb); + TRACE("0x%08lx, %u, %u, ...)\n", (DWORD) hic, msg, cb); for (i = 0; i < cb / sizeof(WORD); i++) { @@ -187,7 +187,7 @@ LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 * picinfo, DWORD cb) { LRESULT ret; - TRACE("(0x%08x,%p,%d)\n", (DWORD) hic, picinfo, cb); + TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb); ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb); TRACE(" -> 0x%08lx\n", ret); return ret; @@ -218,7 +218,7 @@ DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags, ICCOMPRESS iccmp; SEGPTR seg_iccmp; - TRACE("(0x%08x,%d,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags, + TRACE("(0x%08lx,%ld,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags, lpbiOutput, lpData, lpbiInput, lpBits); iccmp.dwFlags = dwFlags; @@ -252,7 +252,7 @@ DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, SEGPTR segptr; DWORD ret; - TRACE("(0x%08x,%d,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat, + TRACE("(0x%08lx,%ld,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat, lpData, lpbi, lpBits); icd.dwFlags = dwFlags; @@ -291,7 +291,7 @@ DWORD VFWAPIV ICDrawBegin16(HIC16 hic, /* [in] */ ICDRAWBEGIN16 icdb; SEGPTR seg_icdb; - TRACE ("(0x%08x,%d,0x%08x,0x%08x,0x%08x,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n", + TRACE ("(0x%08lx,%ld,0x%08lx,0x%08lx,0x%08lx,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n", (DWORD) hic, dwFlags, (DWORD) hpal, (DWORD) hwnd, (DWORD) hdc, xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale); @@ -330,7 +330,7 @@ DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags, ICDRAW icd; SEGPTR seg_icd; - TRACE("(0x%08x,0x%08x,%p,%p,%d,%d)\n", (DWORD) hic, dwFlags, + TRACE("(0x%08lx,0x%08lx,%p,%p,%ld,%ld)\n", (DWORD) hic, dwFlags, lpFormat, lpData, cbData, lTime); icd.dwFlags = dwFlags; icd.lpFormat = lpFormat;

1 0

Eric Pouech : httpapi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 8ea90bec6f50a3a2ac5abf93529fd78fe679bb7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea90bec6f50a3a2ac5abf93… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 00:23:33 2022 -0600 httpapi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/Makefile.in | 1 - dlls/httpapi/httpapi_main.c | 54 ++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index ea9c4223059..94020e9c17e 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = httpapi.dll IMPORTLIB = httpapi IMPORTS = advapi32 diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 52fa6cc1d80..4d2d307ffcb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -53,12 +53,12 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved { SC_HANDLE manager, service; - TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, flags %#lx, reserved %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, flags, reserved); if (flags & ~HTTP_INITIALIZE_SERVER) { - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return ERROR_SUCCESS; } @@ -67,14 +67,14 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { - ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + ERR("Failed to open HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(manager); return GetLastError(); } if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + ERR("Failed to start HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); return GetLastError(); @@ -100,7 +100,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved */ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) { - FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + FIXME( "(0x%lx, %p): stub!\n", flags, reserved ); return NO_ERROR; } @@ -123,7 +123,7 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -150,7 +150,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, PULONG data_len, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + FIXME( "(%p, %d, %p, %ld, %p, %ld, %p, %p): stub!\n", handle, type, query, query_len, buffer, buffer_len, data_len, overlapped ); return ERROR_FILE_NOT_FOUND; } @@ -174,7 +174,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -197,7 +197,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("handle %p, reserved %#x.\n", handle, reserved); + TRACE("handle %p, reserved %#lx.\n", handle, reserved); if (!handle) return ERROR_INVALID_PARAMETER; @@ -289,11 +289,11 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!ovl) { @@ -334,11 +334,11 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) - FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + FIXME("Ignoring flags %#lx.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); if (size < sizeof(HTTP_REQUEST_V1)) return ERROR_INSUFFICIENT_BUFFER; @@ -426,15 +426,15 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, char *p, dummy[12]; USHORT i; - TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + TRACE("queue %p, id %s, flags %#lx, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#lx, ovl %p, log_data %p.\n", queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (response->s.Flags) - FIXME("Unhandled response flags %#x.\n", response->s.Flags); + FIXME("Unhandled response flags %#lx.\n", response->s.Flags); if (cache_policy) WARN("Ignoring cache_policy.\n"); if (log_data) @@ -563,7 +563,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO { struct server_session *session; - TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, id %p, reserved %lu.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved); if (!id) @@ -613,7 +613,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU struct server_session *session; struct url_group *group; - TRACE("session_id %s, group_id %p, reserved %#x.\n", + TRACE("session_id %s, group_id %p, reserved %#lx.\n", wine_dbgstr_longlong(session_id), group_id, reserved); if (!(session = get_server_session(session_id))) @@ -655,7 +655,7 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY { struct url_group *group = get_url_group(id); - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) @@ -687,7 +687,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), wine_dbgstr_longlong(context), reserved); if (group->url) @@ -713,13 +713,13 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + TRACE("id %s, url %s, flags %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); if (!group->url) return ERROR_FILE_NOT_FOUND; if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); heap_free(group->url); group->url = NULL; @@ -740,14 +740,14 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, debugstr_w(name), sa, flags, handle); if (name) FIXME("Unhandled name %s.\n", debugstr_w(name)); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; @@ -775,7 +775,7 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2) { - FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + FIXME("queue %p, property %u, value %p, length %lu, reserved1 %#lx, reserved2 %p, stub!\n", queue, property, value, length, reserved1, reserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -786,7 +786,7 @@ ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY prop ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) { - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property)

1 0

Zebediah Figura : ntdll: Use YieldProcessor() in RtlEnterCriticalSection().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 615a2ab53c9d9ecacd2c50e3c7fb9ab138bf1a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=615a2ab53c9d9ecacd2c50e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 19:59:02 2022 -0600 ntdll: Use YieldProcessor() in RtlEnterCriticalSection(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 06b594c633f..43864325b35 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -373,15 +373,6 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) } -static inline void small_pause(void) -{ -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - /****************************************************************************** * RtlEnterCriticalSection (NTDLL.@) */ @@ -399,7 +390,7 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) { if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; } - small_pause(); + YieldProcessor(); } }

1 0

Matteo Bruni : include: Add missing CreateProcessWithTokenW() declaration.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 824fcbae7d804ed3c7f5bcaadb155aa2b0761f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824fcbae7d804ed3c7f5bcaa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 14 20:35:20 2022 -0600 include: Add missing CreateProcessWithTokenW() declaration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..a8744eb417a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1901,6 +1901,7 @@ WINBASEAPI BOOL WINAPI CreateProcessInternalA(HANDLE,LPCSTR,LPSTR,LPSECUR WINBASEAPI BOOL WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*); #define CreateProcessInternal WINELIB_NAME_AW(CreateProcessInternal) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +WINADVAPI BOOL WINAPI CreateProcessWithTokenW(HANDLE,DWORD,LPCWSTR,LPWSTR,DWORD,void *,LPCWSTR,STARTUPINFOW *,PROCESS_INFORMATION *); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE);

1 0

Zebediah Figura : kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: ef64aea701376bf19a4969756cf5a42b6b68ecbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef64aea701376bf19a496975… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:06 2022 -0600 kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 34 ++++++++++++++++++---------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b753ce3dd2e..28717c25f79 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p hr = parse_url(url, &pl); + switch (scheme) + { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: + break; + + default: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY) + return E_FAIL; + } + switch (part) { case URL_PART_SCHEME: @@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - switch (scheme) - { - case URL_SCHEME_FILE: - case URL_SCHEME_FTP: - case URL_SCHEME_GOPHER: - case URL_SCHEME_HTTP: - case URL_SCHEME_HTTPS: - case URL_SCHEME_TELNET: - case URL_SCHEME_NEWS: - case URL_SCHEME_NNTP: - case URL_SCHEME_SNEWS: - break; - default: - return E_FAIL; - } - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 729b069a772..904d3e7bb5b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -601,10 +601,10 @@ static void test_UrlGetPart(void) tests[] = { {"hi", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_USERNAME, 0, E_FAIL}, + {"hi", URL_PART_PASSWORD, 0, E_FAIL}, {"hi", URL_PART_HOSTNAME, 0, E_FAIL}, - {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_PORT, 0, E_FAIL}, {"hi", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"},

1 0

Zebediah Figura : kernelbase: Allow hostnames to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 4ff109c3d6a40241edb1d5d642ed7aec2f69277a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff109c3d6a40241edb1d5d6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:07 2022 -0600 kernelbase: Allow hostnames to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 26 +++++++++++++------------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 28717c25f79..954faf47a99 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - HOST, PORT, USERPASS, }; @@ -4221,14 +4220,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ } break; - case HOST: - while (isalnum(*start) || *start == '-' || *start == '.' || *start == ' ' || *start == '*') - { - start++; - (*size)++; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4237,6 +4228,15 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ return start; } +static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators ) +{ + const WCHAR *p; + + if ((p = wcspbrk( url, separators ))) + return p; + return url + wcslen( url ); +} + static LONG parse_url(const WCHAR *url, struct parsed_url *pl) { const WCHAR *work; @@ -4280,10 +4280,10 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) } else goto ErrorExit; - /* now start parsing hostname or hostnumber */ - work++; - pl->hostname = work; - work = scan_url(pl->hostname, &pl->hostname_len, HOST); + pl->hostname = work + 1; + work = parse_url_element( pl->hostname, L":/\\?#" ); + pl->hostname_len = work - pl->hostname; + if (*work == ':') { /* parse port */ diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 904d3e7bb5b..07d3ebfa331 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -655,7 +655,7 @@ static void test_UrlGetPart(void) {"http://user:pass:q(a)host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, {"http://user:pass:q(a)host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, {"http://user(a)host@q", URL_PART_USERNAME, 0, S_OK, "user"}, - {"http://user(a)host@q", URL_PART_HOSTNAME, 0, S_OK, "host(a)q", .todo_result = TRUE}, + {"http://user(a)host@q", URL_PART_HOSTNAME, 0, S_OK, "host(a)q"}, {"http:localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE},

1 0

Zebediah Figura : kernelbase: Allow ports to contain any characters in UrlGetPart().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 0b9b73d6ef4df37cb82f95d3706f6a02f1cca28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9b73d6ef4df37cb82f95d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 20:37:08 2022 -0600 kernelbase: Allow ports to contain any characters in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 16 +++------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 954faf47a99..dfb37006da8 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -77,7 +77,6 @@ struct parsed_url enum url_scan_type { SCHEME, - PORT, USERPASS, }; @@ -4212,14 +4211,6 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ } break; - case PORT: - while (*start >= '0' && *start <= '9') - { - start++; - (*size)++; - } - break; - default: FIXME("unknown type %d\n", type); return L""; @@ -4286,10 +4277,9 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) if (*work == ':') { - /* parse port */ - work++; - pl->port = work; - work = scan_url(pl->port, &pl->port_len, PORT); + pl->port = work + 1; + work = parse_url_element( pl->port, L"/\\?#" ); + pl->port_len = work - pl->port; } if (*work == '/') { diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 07d3ebfa331..c4afb1375e9 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -630,7 +630,7 @@ static void test_UrlGetPart(void) {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port", .todo_hr = TRUE}, + {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port"}, {"http://:", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://:", URL_PART_PORT, 0, S_FALSE, ""}, @@ -651,7 +651,7 @@ static void test_UrlGetPart(void) {"http://:@", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http://host:port:q", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q", .todo_hr = TRUE}, + {"http://host:port:q", URL_PART_PORT, 0, S_OK, "port:q"}, {"http://user:pass:q(a)host", URL_PART_USERNAME, 0, S_OK, "user", .todo_hr = TRUE}, {"http://user:pass:q(a)host", URL_PART_PASSWORD, 0, S_OK, "pass:q", .todo_hr = TRUE}, {"http://user(a)host@q", URL_PART_USERNAME, 0, S_OK, "user"}, @@ -678,7 +678,7 @@ static void test_UrlGetPart(void) {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass(a)host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff(a)host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, - {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", .todo_hr = TRUE}, + {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE},

1 0