wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : browseui: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: e59b55699e5ac43395f635f4a670de8dcbac408a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e59b55699e5ac43395f635f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:01 2022 +0100 browseui: 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/browseui/Makefile.in | 1 - dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 8 ++++---- dlls/browseui/browseui_main.c | 2 +- dlls/browseui/progressdlg.c | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 1f2521aa853..6c14ace37cf 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = browseui.dll IMPORTS = uuid ole32 comctl32 user32 advapi32 diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 820b246a403..a41cb810369 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -140,7 +140,7 @@ static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rg { ACLMulti *This = impl_from_IEnumString(iface); - TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched); + TRACE("(%p, %ld, %p, %p)\n", iface, celt, rgelt, pceltFetched); while (This->currObj < This->nObjs) { if (This->objs[This->currObj].pEnum) diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 5ac7cb10761..4412ca38003 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -94,7 +94,7 @@ static ULONG WINAPI ACLShellSource_AddRef(IEnumString *iface) { ACLShellSource *This = impl_from_IEnumString(iface); ULONG ref = InterlockedIncrement(&This->refCount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -103,7 +103,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface) ACLShellSource *This = impl_from_IEnumString(iface); ULONG ref = InterlockedDecrement(&This->refCount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) ACLShellSource_Destructor(This); @@ -114,14 +114,14 @@ static HRESULT WINAPI ACLShellSource_Next(IEnumString *iface, ULONG celt, LPOLES ULONG *fetched) { ACLShellSource *This = impl_from_IEnumString(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, celt, rgelt, fetched); + FIXME("(%p)->(%lu %p %p): stub\n", This, celt, rgelt, fetched); return E_NOTIMPL; } static HRESULT WINAPI ACLShellSource_Skip(IEnumString *iface, ULONG celt) { ACLShellSource *This = impl_from_IEnumString(iface); - FIXME("(%p)->(%u): stub\n", This, celt); + FIXME("(%p)->(%lu): stub\n", This, celt); return E_NOTIMPL; } diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index d2c5ecf3622..b6962b30f26 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -162,7 +162,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 89e70e90201..dc0fe813f68 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -343,7 +343,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, struct create_params params; HANDLE hThread; - TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved); + TRACE("(%p, %p, %lx, %p)\n", iface, punkEnableModeless, dwFlags, reserved); if (punkEnableModeless || reserved) FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); if (dwFlags & PROGDLG_NOTIME) @@ -509,7 +509,7 @@ static HRESULT WINAPI ProgressDialog_SetLine(IProgressDialog *iface, DWORD dwLin ProgressDialog *This = impl_from_IProgressDialog(iface); HWND hwnd; - TRACE("(%p, %d, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath); + TRACE("(%p, %ld, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath); if (reserved) FIXME("reserved pointer not null (%p)\n", reserved); @@ -556,7 +556,7 @@ static HRESULT WINAPI ProgressDialog_Timer(IProgressDialog *iface, DWORD dwTimer { ProgressDialog *This = impl_from_IProgressDialog(iface); - FIXME("(%p, %d, %p) - stub\n", This, dwTimerAction, reserved); + FIXME("(%p, %ld, %p) - stub\n", This, dwTimerAction, reserved); if (reserved) FIXME("Reserved field not NULL but %p\n", reserved);

1 0

Eric Pouech : schtasks: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 241c5fe8b68bae99490c4abc90fc6d400e2bb46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=241c5fe8b68bae99490c4abc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:24:55 2022 +0100 schtasks: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/Makefile.in | 1 - programs/schtasks/schtasks.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index 63afc93a876..6eb8d530425 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schtasks.exe IMPORTS = oleaut32 ole32 diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 340aeaa56fb..c9434801db8 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -40,14 +40,14 @@ static ITaskFolder *get_tasks_root_folder(void) V_VT(&empty) = VT_EMPTY; hres = ITaskService_Connect(service, empty, empty, empty, empty); if (FAILED(hres)) { - FIXME("Connect failed: %08x\n", hres); + FIXME("Connect failed: %08lx\n", hres); return NULL; } hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { - FIXME("GetFolder failed: %08x\n", hres); + FIXME("GetFolder failed: %08lx\n", hres); return NULL; } @@ -70,7 +70,7 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) SysFreeString(str); ITaskFolder_Release(root); if (FAILED(hres)) { - FIXME("GetTask failed: %08x\n", hres); + FIXME("GetTask failed: %08lx\n", hres); return NULL; } @@ -183,7 +183,7 @@ static int change_command(int argc, WCHAR *argv[]) hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); if (FAILED(hres)) { IRegisteredTask_Release(task); - FIXME("put_Enabled failed: %08x\n", hres); + FIXME("put_Enabled failed: %08lx\n", hres); return 1; } }

1 0

Alistair Leslie-Hughes : xolehlp: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 826288aea38cf657816ef030a7d90b55182234ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=826288aea38cf657816ef030… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 9 17:29:08 2022 +1100 xolehlp: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/Makefile.in | 1 - dlls/xolehlp/xolehlp.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index c2bebe884fe..f39cd90f0b9 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xolehlp.dll IMPORTS = uuid diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index d3355c1c34e..e61f4b35fc8 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -68,7 +68,7 @@ static ULONG WINAPI ResourceManager_AddRef(IResourceManager *iface) ResourceManager *This = impl_from_IResourceManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI ResourceManager_Release(IResourceManager *iface) ResourceManager *This = impl_from_IResourceManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -98,7 +98,7 @@ static HRESULT WINAPI ResourceManager_Enlist(IResourceManager *iface, static HRESULT WINAPI ResourceManager_Reenlist(IResourceManager *iface, byte *pPrepInfo,ULONG cbPrepInfo,DWORD lTimeout,XACTSTAT *pXactStat) { - FIXME("(%p, %p, %u, %u, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); + FIXME("(%p, %p, %lu, %lu, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); return E_NOTIMPL; } static HRESULT WINAPI ResourceManager_ReenlistmentComplete(IResourceManager *iface) @@ -186,7 +186,7 @@ static ULONG WINAPI TransactionOptions_AddRef(ITransactionOptions *iface) TransactionOptions *This = impl_from_ITransactionOptions(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -196,7 +196,7 @@ static ULONG WINAPI TransactionOptions_Release(ITransactionOptions *iface) TransactionOptions *This = impl_from_ITransactionOptions(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -211,7 +211,7 @@ static HRESULT WINAPI TransactionOptions_SetOptions(ITransactionOptions *iface, TransactionOptions *This = impl_from_ITransactionOptions(iface); if (!pOptions) return E_INVALIDARG; - TRACE("(%p, %u, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); + TRACE("(%p, %lu, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); This->opts = *pOptions; return S_OK; } @@ -295,7 +295,7 @@ static ULONG WINAPI Transaction_AddRef(ITransaction *iface) Transaction *This = impl_from_ITransaction(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -305,7 +305,7 @@ static ULONG WINAPI Transaction_Release(ITransaction *iface) Transaction *This = impl_from_ITransaction(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -317,7 +317,7 @@ static ULONG WINAPI Transaction_Release(ITransaction *iface) static HRESULT WINAPI Transaction_Commit(ITransaction *iface, BOOL fRetaining, DWORD grfTC, DWORD grfRM) { - FIXME("(%p, %d, %08x, %08x): stub\n", iface, fRetaining, grfTC, grfRM); + FIXME("(%p, %d, %08lx, %08lx): stub\n", iface, fRetaining, grfTC, grfRM); return E_NOTIMPL; } static HRESULT WINAPI Transaction_Abort(ITransaction *iface, @@ -425,7 +425,7 @@ static ULONG WINAPI TransactionDispenser_AddRef(ITransactionDispenser *iface) TransactionManager *This = impl_from_ITransactionDispenser(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -435,7 +435,7 @@ static ULONG WINAPI TransactionDispenser_Release(ITransactionDispenser *iface) TransactionManager *This = impl_from_ITransactionDispenser(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -460,7 +460,7 @@ static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispense ITransactionOptions *pOptions, ITransaction **ppTransaction) { - FIXME("(%p, %p, %08x, %08x, %p, %p): semi-stub\n", iface, punkOuter, + FIXME("(%p, %p, %08lx, %08lx, %p, %p): semi-stub\n", iface, punkOuter, isoLevel, isoFlags, pOptions, ppTransaction); if (!ppTransaction) return E_INVALIDARG; @@ -556,7 +556,7 @@ static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransacti static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) { - FIXME("(%p, %u, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + FIXME("(%p, %lu, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); if (!rgbWhereabouts || !pcbUsed) return E_INVALIDARG; *rgbWhereabouts = 0; @@ -597,7 +597,7 @@ static ULONG WINAPI TransactionImport_Release(ITransactionImport *iface) static HRESULT WINAPI TransactionImport_Import(ITransactionImport *iface, ULONG cbTransactionCookie, byte *rgbTransactionCookie, IID *piid, void **ppvTransaction) { - FIXME("(%p, %u, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); + FIXME("(%p, %lu, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); if (!rgbTransactionCookie || !piid || !ppvTransaction) return E_INVALIDARG; return E_NOTIMPL; @@ -653,7 +653,7 @@ static BOOL is_local_machineW( const WCHAR *server ) HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { - TRACE("(%s, %s, %s, %d, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %ld, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), dwReserved1, wcbReserved2, pvReserved2, ppv); if (!is_local_machineA(host)) @@ -667,7 +667,7 @@ HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %ld, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), options, config, ppv); if (!is_local_machineA(host)) @@ -681,7 +681,7 @@ HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_w(host), debugstr_w(tm_name), + TRACE("(%s, %s, %s, %ld, %p, %p)\n", debugstr_w(host), debugstr_w(tm_name), debugstr_guid(riid), options, config, ppv); if (!is_local_machineW(host))

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" field of TEST_ESCAPEW.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 2be4d455e35ab94abc620bf401eb3190a0086d8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be4d455e35ab94abc620bf4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:35 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" field of TEST_ESCAPEW. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8a645287b02..703bdcd0a55 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -293,39 +293,38 @@ static const TEST_URL_ESCAPE TEST_ESCAPE[] = { typedef struct _TEST_URL_ESCAPEW { const WCHAR url[INTERNET_MAX_URL_LENGTH]; DWORD flags; - HRESULT expectret; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { - {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, - {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, - {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, - {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','6','/','?','#',0}}, - {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','s','s',0}}, + {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, + {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, + {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, + {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, {'%','2','6','/','?','#',0}}, + {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, {'M','a','s','s',0}}, /* broken < Win8/10 */ - {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','%','C','3','%','9','F',0}, + {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, {'M','a','%','C','3','%','9','F',0}, {'M','a','%','D','F',0}}, /* 0x2070E */ - {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, + {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, {0xd841,0xdf0e,0}}, /* 0x27A3E */ - {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, + {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, {0xd85e,0xde3e,0}}, - {{0xd85e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, - {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D','A',0}, + {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D','A',0}, {0xd85e,'A',0}}, - {{0xdc00,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {{0xdc00,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xdc00,0}}, - {{0xffff,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','F',0}, + {{0xffff,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','F',0}, {0xffff,0}}, }; @@ -962,8 +961,7 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); - ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", - ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)),

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" and "expectescaped" fields of TEST_ESCAPE.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: b6ca40f8908c47cd029542da595d507b1d446c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca40f8908c47cd029542da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:34 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" and "expectescaped" fields of TEST_ESCAPE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 168 +++++++++++++++++++++++------------------------ 1 file changed, 82 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ca40f8908c47cd0295…

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_COMBINE.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: b750aa3c14c0baf2876be67afc44f2c685bd3108 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b750aa3c14c0baf2876be67a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:33 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_COMBINE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 139 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b750aa3c14c0baf2876b…

1 0

Zebediah Figura : shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_CANONICALIZE.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 76b3a0512e2fb4da2f81722d8a65c14944caf12b URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b3a0512e2fb4da2f81722d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:32 2022 -0600 shlwapi/tests: Get rid of the redundant "expectret" field of TEST_URL_CANONICALIZE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 235 +++++++++++++++++++++++------------------------ 1 file changed, 115 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b3a0512e2fb4da2f81…

1 0

Zebediah Figura : shlwapi/tests: Link directly to Url*() functions.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: a51a5d43397152d0d520b8036a90bfd62031b5e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51a5d43397152d0d520b803… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:05:31 2022 -0600 shlwapi/tests: Link directly to Url*() functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 491 +++++++++++++++++------------------------------ 1 file changed, 179 insertions(+), 312 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a51a5d43397152d0d520…

1 0

Zebediah Figura : qdvd: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 49acfc9ce42a5dc8f0ed17ccc1123e0e923f8a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49acfc9ce42a5dc8f0ed17cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:04:43 2022 -0600 qdvd: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 1 - dlls/qdvd/graph.c | 6 ++-- dlls/qdvd/navigator.c | 92 +++++++++++++++++++++++++-------------------------- 3 files changed, 49 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49acfc9ce42a5dc8f0ed…

1 0

Zebediah Figura : qcap: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 2f9526720c5e4c76ddc5e0ea8d862a9b55dbef69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9526720c5e4c76ddc5e0ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:04:42 2022 -0600 qcap: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 18 +++++++++--------- dlls/qcap/avimux.c | 27 ++++++++++++++------------- dlls/qcap/capturegraph.c | 15 ++++++++------- dlls/qcap/filewriter.c | 10 +++++----- dlls/qcap/v4l.c | 4 ++-- dlls/qcap/vfwcapture.c | 24 ++++++++++++------------ 8 files changed, 51 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f9526720c5e4c76ddc5…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022