wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : spoolss: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 940297d622f60ccb7e68d684fe690d0f1fcb4b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=940297d622f60ccb7e68d684… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:39 2022 +0100 spoolss: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/Makefile.in | 1 - dlls/spoolss/router.c | 28 ++++++++++++++-------------- dlls/spoolss/spoolss_main.c | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index a9a9ef8b723..d09836cbae6 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 24314b1f23a..4930a7eb18d 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -238,7 +238,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) used_backends++; backend[id]->index = used_backends; LeaveCriticalSection(&backend_cs); - TRACE("--> backend #%d: %p (%s)\n", id, backend[id], debugstr_w(dllname)); + TRACE("--> backend #%ld: %p (%s)\n", id, backend[id], debugstr_w(dllname)); return backend[id]; } } @@ -250,7 +250,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) heap_free(backend[id]); backend[id] = NULL; LeaveCriticalSection(&backend_cs); - WARN("failed to init %s: %u\n", debugstr_w(dllname), GetLastError()); + WARN("failed to init %s: %lu\n", debugstr_w(dllname), GetLastError()); return NULL; } @@ -307,7 +307,7 @@ static backend_t * backend_first(LPWSTR name) } } - FIXME("server %s not supported in %d backends\n", debugstr_w(name), used_backends); + FIXME("server %s not supported in %ld backends\n", debugstr_w(name), used_backends); LeaveCriticalSection(&backend_cs); return NULL; } @@ -335,7 +335,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p)\n", debugstr_w(pName), Level, pMonitors); + TRACE("(%s, %ld, %p)\n", debugstr_w(pName), Level, pMonitors); if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); @@ -350,7 +350,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -375,7 +375,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); if (!pDriverInfo) { SetLastError(ERROR_INVALID_PARAMETER); @@ -390,7 +390,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -424,7 +424,7 @@ BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNam SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -452,7 +452,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -466,7 +466,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -496,7 +496,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -510,7 +510,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -550,7 +550,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), + TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); if (pcbNeeded) *pcbNeeded = 0; @@ -564,7 +564,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte)\n", + TRACE("got %lu with %lu (%lu byte)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0); return (res == ROUTER_SUCCESS); diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index bc02b43ff62..355bf72b822 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -43,7 +43,7 @@ static HMODULE hwinspool; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: { @@ -121,7 +121,7 @@ LPVOID WINAPI DllAllocSplMem(DWORD size) LPVOID res; res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - TRACE("(%d) => %p\n", size, res); + TRACE("(%ld) => %p\n", size, res); return res; }

1 0

Eric Pouech : sound.drv16: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 9c777d7e1369f6f06cb799309c862fe302188f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c777d7e1369f6f06cb79930… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:34 2022 +0100 sound.drv16: 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/sound.drv16/Makefile.in | 1 - dlls/sound.drv16/sound.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8aa1117c905..8e9b04bfa83 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sound.drv16 EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll diff --git a/dlls/sound.drv16/sound.c b/dlls/sound.drv16/sound.c index 0f1386cf160..f93b96c4fa1 100644 --- a/dlls/sound.drv16/sound.c +++ b/dlls/sound.drv16/sound.c @@ -97,7 +97,7 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) */ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) { - FIXME("(%d, %d, %d): stub\n",nVoice,lFrequency, nDuration); + FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); return 0; }

1 0

Eric Pouech : snmpapi: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 36052f010895727530babfe3b447b21e95994a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36052f010895727530babfe3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:28 2022 +0100 snmpapi: 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/snmpapi/Makefile.in | 1 - dlls/snmpapi/main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index ea92b1d6bf3..eaee9374cfe 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = snmpapi.dll IMPORTLIB = snmpapi diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 1fd98c3da8d..7020c606228 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -120,7 +120,7 @@ BOOL WINAPI DllMain( DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p,%d,%p)\n", hInstDLL, fdwReason, lpvReserved); + TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -572,14 +572,14 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) switch (any->asnType) { case ASN_NULL: TRACE("Null value\n"); return; - case ASN_INTEGER32: TRACE("Integer32 %d\n", any->asnValue.number); return; - case ASN_UNSIGNED32: TRACE("Unsigned32 %u\n", any->asnValue.unsigned32); return; - case ASN_COUNTER32: TRACE("Counter32 %u\n", any->asnValue.counter); return; - case ASN_GAUGE32: TRACE("Gauge32 %u\n", any->asnValue.gauge); return; - case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; + case ASN_INTEGER32: TRACE("Integer32 %ld\n", any->asnValue.number); return; + case ASN_UNSIGNED32: TRACE("Unsigned32 %lu\n", any->asnValue.unsigned32); return; + case ASN_COUNTER32: TRACE("Counter32 %lu\n", any->asnValue.counter); return; + case ASN_GAUGE32: TRACE("Gauge32 %lu\n", any->asnValue.gauge); return; + case ASN_TIMETICKS: TRACE("Timeticks %lu\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %x%08x\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

Eric Pouech : shlwapi: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 119f261b1804ce3bdf0caadb62d2925db4b9ad3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=119f261b1804ce3bdf0caadb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:21 2022 +0100 shlwapi: 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/shlwapi/Makefile.in | 2 +- dlls/shlwapi/assoc.c | 12 ++--- dlls/shlwapi/clist.c | 6 +-- dlls/shlwapi/msgbox.c | 6 +-- dlls/shlwapi/ordinal.c | 106 ++++++++++++++++++++++---------------------- dlls/shlwapi/path.c | 22 ++++----- dlls/shlwapi/reg.c | 4 +- dlls/shlwapi/regstream.c | 12 ++--- dlls/shlwapi/shlwapi_main.c | 8 ++-- dlls/shlwapi/stopwatch.c | 6 +-- dlls/shlwapi/string.c | 8 ++-- dlls/shlwapi/thread.c | 6 +-- dlls/shlwapi/url.c | 2 +- 13 files changed, 100 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=119f261b1804ce3bdf0c…

1 0

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

18 Feb '22

Module: wine Branch: master Commit: 4605af6b629e1e2938f5a68b10c1717303ea918b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4605af6b629e1e2938f5a68b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:16 2022 +0100 shell.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/shell.dll16/Makefile.in | 1 - dlls/shell.dll16/shell.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index f781f87b521..dad637e6081 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = shell.dll16 IMPORTS = shell32 user32 gdi32 advapi32 diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 3e7c32a632d..1b55478be7f 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -470,7 +470,7 @@ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length) */ static LRESULT WINAPI SHELL_HookProc(INT code, WPARAM wParam, LPARAM lParam) { - TRACE("%i, %lx, %08lx\n", code, wParam, lParam ); + TRACE("%i, %x, %08lx\n", code, wParam, lParam ); if (SHELL_hWnd) { @@ -675,7 +675,7 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cm WORD args[5]; SEGPTR cmdline_seg; - TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", + TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); cmdline_seg = MapLS( cmdline );

1 0

Eric Pouech : shell32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 570e24a014f16dd8b5ea8d0ca45937d68276e7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=570e24a014f16dd8b5ea8d0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:09 2022 +0100 shell32: 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/shell32/Makefile.in | 2 +- dlls/shell32/appbar.c | 6 +-- dlls/shell32/assoc.c | 34 ++++++++--------- dlls/shell32/autocomplete.c | 6 +-- dlls/shell32/brsfolder.c | 16 ++++---- dlls/shell32/changenotify.c | 16 ++++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 6 +-- dlls/shell32/cpanelfolder.c | 36 +++++++++--------- dlls/shell32/dataobject.c | 14 +++---- dlls/shell32/debughlp.c | 6 +-- dlls/shell32/dragdrophelper.c | 12 +++--- dlls/shell32/ebrowser.c | 38 +++++++++---------- dlls/shell32/enumidlist.c | 10 ++--- dlls/shell32/folders.c | 4 +- dlls/shell32/iconcache.c | 6 +-- dlls/shell32/pidl.c | 32 ++++++++-------- dlls/shell32/recyclebin.c | 14 +++---- dlls/shell32/shell32_main.c | 34 ++++++++--------- dlls/shell32/shelldispatch.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellitem.c | 34 ++++++++--------- dlls/shell32/shelllink.c | 48 +++++++++++------------ dlls/shell32/shellole.c | 32 ++++++++-------- dlls/shell32/shellord.c | 64 +++++++++++++++---------------- dlls/shell32/shellpath.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 24 ++++++------ dlls/shell32/shfldr_fs.c | 30 +++++++-------- dlls/shell32/shfldr_mycomp.c | 30 +++++++-------- dlls/shell32/shfldr_netplaces.c | 26 ++++++------- dlls/shell32/shfldr_printers.c | 16 ++++---- dlls/shell32/shlexec.c | 26 ++++++------- dlls/shell32/shlfileop.c | 16 ++++---- dlls/shell32/shlfolder.c | 24 ++++++------ dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 20 +++++----- dlls/shell32/shlview.c | 50 ++++++++++++------------ dlls/shell32/shlview_cmenu.c | 14 +++---- dlls/shell32/systray.c | 6 +-- 39 files changed, 467 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=570e24a014f16dd8b5ea…

1 0

Eric Pouech : shdocvw: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 048084a67022f2750d1ddf002f034fef8a325493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048084a67022f2750d1ddf00… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:03 2022 +0100 shdocvw: 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/shdocvw/Makefile.in | 2 +- dlls/shdocvw/shdocvw_main.c | 24 ++++++++++++------------ dlls/shdocvw/shlinstobj.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 88b5340abda..30b0a1a299c 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_ +EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a641bd92a73..b5b60054f2c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -120,7 +120,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) */ 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: @@ -246,7 +246,7 @@ DWORD WINAPI RunInstallUninstallStubs2(int arg) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) { - FIXME("(%u), stub!\n", arg); + FIXME("(%lu), stub!\n", arg); return 0; } @@ -318,7 +318,7 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, DWORD len; LONG res; - TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name), + TRACE("(%s, %s, %ld, %p, %ld, %ld)\n", debugstr_a(regpath), debugstr_a(name), type, out, outlen, unknown); if (!out) return S_OK; @@ -347,14 +347,14 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L DWORD res = 0; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); - TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); + TRACE("got 0x%lx with %s\n", hr, debugstr_w(buffer_in)); if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in; @@ -369,7 +369,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; - TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed); if (*plen >= needed) { if (out != NULL) { @@ -381,7 +381,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -398,7 +398,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD DWORD res; DWORD len; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_a(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (url) { @@ -424,7 +424,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -434,7 +434,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) { /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ - FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + FIXME("stub: 0x%lx %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); return E_FAIL; } @@ -443,7 +443,7 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName */ DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) { - FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); + FIXME("(%ld %s %ld) stub\n", res, debugstr_w(url), reserved); return 0; } @@ -457,7 +457,7 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) LPWSTR urlW = NULL; DWORD res; - TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved); + TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved); if (url) { DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); urlW = heap_alloc(len * sizeof(WCHAR)); diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index f148a27619e..d1405a6bb53 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -274,14 +274,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); if (FAILED(hr)) { - TRACE("Failed to create instance of %s. hr = %08x\n", + TRACE("Failed to create instance of %s. hr = %08lx\n", debugstr_guid(&This->m_clsidInstance), hr); return hr; } hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL); if (FAILED(hr)) { - TRACE("Failed to initialize object from PropertyBag: hr = %08x\n", hr); + TRACE("Failed to initialize object from PropertyBag: hr = %08lx\n", hr); IPersistPropertyBag_Release(pPersistPropertyBag); return hr; }

1 0

Eric Pouech : sfc_os: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: b05bef9157958bc3da659c583c1d78243a475f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b05bef9157958bc3da659c58… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:15:57 2022 +0100 sfc_os: 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/sfc_os/Makefile.in | 1 - dlls/sfc_os/sfc_os.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 5488245195f..e3e727fc262 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sfc_os.dll IMPORTLIB = sfc_os diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f6163f5b4eb..61614264c77 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -119,7 +119,7 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) DWORD WINAPI SfcConnectToServer(DWORD unknown) { - FIXME("%x\n", unknown); + FIXME("%lx\n", unknown); return 0; }

1 0

Nikolay Sivov : mfmediaengine: Implement GetStreamAttribute().
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 7608e775ab3358e0fdbff81367668990ac75945c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7608e775ab3358e0fdbff813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:43 2022 +0300 mfmediaengine: Implement GetStreamAttribute(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index bb338a4423f..a191448b69f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2504,9 +2504,28 @@ static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, D static HRESULT WINAPI media_engine_GetStreamAttribute(IMFMediaEngineEx *iface, DWORD stream_index, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %ld, %s, %p stub.\n", iface, stream_index, debugstr_guid(attribute), value); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + IMFStreamDescriptor *sd; + HRESULT hr = E_FAIL; + BOOL selected; - return E_NOTIMPL; + TRACE("%p, %ld, %s, %p.\n", iface, stream_index, debugstr_guid(attribute), value); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.pd) + { + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(engine->presentation.pd, + stream_index, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetItem(sd, attribute, value); + IMFStreamDescriptor_Release(sd); + } + } + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL *enabled) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 0eaf614fc66..ea2f570d721 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -497,6 +497,9 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine_ex, &MF_PD_DURATION, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetStreamAttribute(media_engine_ex, 0, &MF_SD_PROTECTED, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -935,6 +938,9 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine, &MF_PD_DURATION, &propvar); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetStreamAttribute(media_engine, 0, &MF_SD_PROTECTED, &propvar); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

1 0

Nikolay Sivov : mfmediaengine: Implement GetPresentationAttribute().
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 2086698e7dde632e51624226a12377f42683ed1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2086698e7dde632e51624226… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:42 2022 +0300 mfmediaengine: Implement GetPresentationAttribute(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 8 ++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 01ce8cd6437..bb338a4423f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -143,6 +143,7 @@ struct media_engine struct { IMFMediaSource *source; + IMFPresentationDescriptor *pd; } presentation; struct { @@ -1079,9 +1080,11 @@ static void media_engine_clear_presentation(struct media_engine *engine) { if (engine->presentation.source) { - IMFMediaSource_Shutdown(engine->presentation.source); - IMFMediaSource_Release(engine->presentation.source); + IMFMediaSource_Shutdown(engine->presentation.source); + IMFMediaSource_Release(engine->presentation.source); } + if (engine->presentation.pd) + IMFPresentationDescriptor_Release(engine->presentation.pd); memset(&engine->presentation, 0, sizeof(engine->presentation)); } @@ -1151,6 +1154,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi engine->presentation.source = source; IMFMediaSource_AddRef(engine->presentation.source); + engine->presentation.pd = pd; + IMFPresentationDescriptor_AddRef(engine->presentation.pd); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); @@ -2474,9 +2479,19 @@ static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx * static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %s, %p stub.\n", iface, debugstr_guid(attribute), value); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_FAIL; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(attribute), value); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.pd) + hr = IMFPresentationDescriptor_GetItem(engine->presentation.pd, attribute, value); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, DWORD *stream_count) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index e4d9d752f20..0eaf614fc66 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -321,6 +321,7 @@ static void test_Shutdown(void) IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; + PROPVARIANT propvar; DWORD flags, cx, cy; unsigned int state; UINT32 value; @@ -493,6 +494,9 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine_ex, &MF_PD_DURATION, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -905,6 +909,7 @@ static void test_SetSourceFromByteStream(void) { struct media_engine_notify *notify; IMFMediaEngineEx *media_engine; + PROPVARIANT propvar; DWORD flags; HRESULT hr; @@ -927,6 +932,9 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, &flags); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine, &MF_PD_DURATION, &propvar); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

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