February 2022 - Wine-Commits

Zebediah Figura : kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME when used with URL_PART_SCHEME or URL_PART_QUERY.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 2db68d819183a5c90f1d00b2051e7339d7523291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db68d819183a5c90f1d00b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:00 2022 -0600 kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME when used with URL_PART_SCHEME or URL_PART_QUERY. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 15280a7ea4b..e716351b0bc 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4334,6 +4334,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p switch (part) { case URL_PART_SCHEME: + flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.scheme_len) { *out_len = 0; @@ -4404,6 +4405,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_QUERY: + flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.query_len) { *out_len = 0; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b4b66aec2f1..b2b20b94b1b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -614,7 +614,7 @@ static void test_UrlGetPart(void) {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PORT, 0, S_OK, "21"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, 0, S_OK, "query=x&return=y", .todo_result = TRUE}, {"http://foo:bar(a)localhost:21/internal.php#anchor", URL_PART_QUERY, 0, S_FALSE, ""}, - {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http", .todo_result = TRUE}, + {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_USERNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:foo"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_PASSWORD, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:bar"}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:localhost"},

1 0

Eric Pouech : mp3dmod: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 2303b77a498a560e5f9b59115b8d4dc7aae0ccf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2303b77a498a560e5f9b5911… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:20 2022 +0100 mp3dmod: 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/mp3dmod/Makefile.in | 1 - dlls/mp3dmod/mp3dmod.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 4220efc3171..dabbb1dfeae 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index adcee393806..12c34421ce9 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -87,7 +87,7 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->ref); - TRACE("(%p) AddRef from %d\n", This, refcount - 1); + TRACE("(%p) AddRef from %ld\n", This, refcount - 1); return refcount; } @@ -97,7 +97,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->ref); - TRACE("(%p) Release from %d\n", This, refcount + 1); + TRACE("(%p) Release from %ld\n", This, refcount + 1); if (!refcount) { @@ -152,7 +152,7 @@ static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *inp static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -161,7 +161,7 @@ static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -170,7 +170,7 @@ static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (type_index) return DMO_E_NO_MORE_ITEMS; @@ -191,7 +191,7 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index const WAVEFORMATEX *input_format; WAVEFORMATEX *format; - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (!dmo->intype_set) return DMO_E_TYPE_NOT_SET; @@ -224,7 +224,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -257,7 +257,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index long enc; int err; - TRACE("(%p)->(%d, %p, %#x)\n", iface, index, type, flags); + TRACE("(%p)->(%ld, %p, %#lx)\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -286,7 +286,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index err = mpg123_format(This->mh, format->nSamplesPerSec, format->nChannels, enc); if (err != MPG123_OK) { - ERR("Failed to set format: %u channels, %u samples/sec, %u bits/sample.\n", + ERR("Failed to set format: %u channels, %lu samples/sec, %u bits/sample.\n", format->nChannels, format->nSamplesPerSec, format->wBitsPerSample); return DMO_E_TYPE_NOT_ACCEPTED; } @@ -299,14 +299,14 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index static HRESULT WINAPI MediaObject_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } @@ -316,7 +316,7 @@ static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); + TRACE("iface %p, index %lu, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -330,7 +330,7 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, alignment %p.\n", iface, index, size, alignment); + TRACE("iface %p, index %lu, size %p, alignment %p.\n", iface, index, size, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -342,14 +342,14 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i static HRESULT WINAPI MediaObject_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, latency); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("(%p)->(%d, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("(%p)->(%ld, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -395,7 +395,7 @@ static HRESULT WINAPI MediaObject_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, flags); return E_NOTIMPL; } @@ -409,7 +409,7 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, DWORD len; int err; - TRACE("(%p)->(%d, %p, %#x, %s, %s)\n", iface, index, buffer, flags, + TRACE("(%p)->(%ld, %p, %#lx, %s, %s)\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); if (This->buffer) @@ -458,7 +458,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags BYTE *data; int err; - TRACE("(%p)->(%#x, %d, %p, %p)\n", iface, flags, count, buffers, status); + TRACE("(%p)->(%#lx, %ld, %p, %p)\n", iface, flags, count, buffers, status); if (count > 1) FIXME("Multiple buffers not handled.\n"); @@ -513,7 +513,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags else if (err != MPG123_OK) ERR("mpg123_read() returned %d\n", err); if (written < framesize) - ERR("short write: %Id/%u\n", written, framesize); + ERR("short write: %Id/%lu\n", written, framesize); got_data = 1; @@ -537,7 +537,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) { - FIXME("(%p)->(%d) stub!\n", iface, lock); + FIXME("(%p)->(%ld) stub!\n", iface, lock); return E_NOTIMPL; }

1 0

Eric Pouech : mapi32: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 5ec2a8b90cf680e939bfc1e1c717b330e48a90a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec2a8b90cf680e939bfc1e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:26:49 2022 +0100 mapi32: 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/mapi32/Makefile.in | 1 - dlls/mapi32/mapi32_main.c | 16 ++++++++-------- dlls/mapi32/prop.c | 48 +++++++++++++++++++++++------------------------ dlls/mapi32/sendmail.c | 6 +++--- dlls/mapi32/util.c | 18 +++++++++--------- 5 files changed, 44 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec2a8b90cf680e939bf…

1 0

Eric Pouech : mmsystem.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 2c8802f26e35540a748e34bbb48830ff1c0849d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8802f26e35540a748e34bb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:02 2022 +0100 mmsystem.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/mmsystem.dll16/Makefile.in | 1 - dlls/mmsystem.dll16/driver.c | 4 +-- dlls/mmsystem.dll16/mci16.c | 4 +-- dlls/mmsystem.dll16/message16.c | 36 +++++++++++++-------------- dlls/mmsystem.dll16/mmio16.c | 6 ++--- dlls/mmsystem.dll16/mmsystem.c | 54 ++++++++++++++++++++--------------------- 6 files changed, 52 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8802f26e35540a748e…

1 0

Eric Pouech : mountmgr.sys: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 9035f66c68a52e15851a352016fe6ff47a9d9a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9035f66c68a52e15851a3520… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:14 2022 +0100 mountmgr.sys: 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/mountmgr.sys/Makefile.in | 1 - dlls/mountmgr.sys/dbus.c | 6 +++--- dlls/mountmgr.sys/device.c | 18 +++++++++--------- dlls/mountmgr.sys/mountmgr.c | 8 ++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 66918d3a750..612ac71f869 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mountmgr.sys UNIXLIB = mountmgr.so IMPORTS = uuid advapi32 ntoskrnl diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 70b2f0c1592..81c9f89d246 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -753,7 +753,7 @@ static DBusMessage *dhcp4_config_option_request( const char *unix_name, const ch return reply; } -static const char *map_option( ULONG option ) +static const char *map_option( unsigned option ) { switch (option) { @@ -792,7 +792,7 @@ NTSTATUS dhcp_request( void *args ) ptr->S_un.S_addr = inet_addr( value ); params->req->offset = params->offset; params->req->size = sizeof(*ptr); - TRACE( "returning %08x\n", *(DWORD *)ptr ); + TRACE( "returning %08x\n", *(unsigned int*)ptr ); } ret = sizeof(*ptr); break; @@ -814,7 +814,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index b8a0040195d..50b2f38bbd8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -717,7 +717,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** } else { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(name.Buffer), status ); RtlFreeUnicodeString( &name ); } return status; @@ -890,7 +890,7 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!(name = wine_get_dos_file_name( unix_device ))) { - ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); + ERR("Failed to convert %s to NT, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -898,7 +898,7 @@ static BOOL get_volume_device_info( struct volume *volume ) RtlFreeHeap( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { - WARN("Failed to open %s, err %u\n", debugstr_a(unix_device), GetLastError()); + WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } @@ -1008,7 +1008,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, get_filesystem_serial( volume ); } - TRACE("fs_type %#x, label %s, serial %08x\n", volume->fs_type, debugstr_w(volume->label), volume->serial); + TRACE("fs_type %#x, label %s, serial %08lx\n", volume->fs_type, debugstr_w(volume->label), volume->serial); if (guid && memcmp( &volume->guid, guid, sizeof(volume->guid) )) { @@ -1526,7 +1526,7 @@ NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_ ptr += strlen(ptr) + 1; } - TRACE( "returning %c: dev %s mount %s type %u\n", + TRACE( "returning %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), type ); iosb->Information = ptr - (char *)output; @@ -1622,7 +1622,7 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) struct volume *volume; NTSTATUS status; - TRACE( "volume query %x length %u\n", info_class, length ); + TRACE( "volume query %x length %lu\n", info_class, length ); EnterCriticalSection( &device_section ); volume = dev->volume; @@ -1722,7 +1722,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) struct disk_device *dev = device->DeviceExtension; NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -1794,7 +1794,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + FIXME("Unsupported ioctl %lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); status = STATUS_NOT_SUPPORTED; break; @@ -1864,7 +1864,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p status = IoCreateDevice( driver, 0, &nt_name, 0, 0, FALSE, &dev_obj ); if (status != STATUS_SUCCESS) { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(nt_name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(nt_name.Buffer), status ); return FALSE; } swprintf( symlink_buffer, ARRAY_SIZE(symlink_buffer), symlink_format, n ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1be55bee419..1f9bd56a384 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -251,7 +251,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) { enum device_type type = DEVICE_UNKNOWN; - TRACE( "defining %c: dev %s mount %s type %u\n", + TRACE( "defining %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), input->type ); switch (input->type) { @@ -467,7 +467,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) NTSTATUS status; ULONG info = 0; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -592,7 +592,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) else status = STATUS_INVALID_PARAMETER; break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; break; } @@ -641,7 +641,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) status = IoCreateSymbolicLink( &linkW, &nameW ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return status; }

1 0

Eric Pouech : mciwave: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 68271331434966fbb896723c44722d9480d0e9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68271331434966fbb896723c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:20 2022 +0100 mciwave: 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/mciwave/Makefile.in | 1 - dlls/mciwave/mciwave.c | 128 +++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68271331434966fbb896…

1 0

Eric Pouech : mciseq: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: e5b16af60cab1a5dc7cf4e50ec0f7052691fac71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b16af60cab1a5dc7cf4e50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:14 2022 +0100 mciseq: 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/mciseq/Makefile.in | 1 - dlls/mciseq/mcimidi.c | 78 ++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b16af60cab1a5dc7cf…

1 0

Eric Pouech : monodebg.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: a4a74345419dddf1f310e576ac016d61e999544a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a74345419dddf1f310e576… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:08 2022 +0100 monodebg.vxd: 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/monodebg.vxd/Makefile.in | 1 - dlls/monodebg.vxd/monodebg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index f076568c1c8..ccbfdba36e4 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = monodebg.vxd C_SRCS = \ diff --git a/dlls/monodebg.vxd/monodebg.c b/dlls/monodebg.vxd/monodebg.c index 715c29601c4..e625a050e1a 100644 --- a/dlls/monodebg.vxd/monodebg.c +++ b/dlls/monodebg.vxd/monodebg.c @@ -46,7 +46,7 @@ BOOL WINAPI MONODEBG_DeviceIoControl(DWORD dwIoControlCode, ERR("%s\n",debugstr_a(lpvInBuffer)); break; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,

1 0

Eric Pouech : mpr: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 8c30c5277a18a8b6f9117f569c733d9c346692de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c30c5277a18a8b6f9117f56… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:32 2022 +0100 mpr: 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/mpr/Makefile.in | 1 - dlls/mpr/multinet.c | 4 +-- dlls/mpr/nps.c | 18 ++++++------- dlls/mpr/pwcache.c | 2 +- dlls/mpr/wnet.c | 72 ++++++++++++++++++++++++++-------------------------- 5 files changed, 48 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c30c5277a18a8b6f911…

1 0

Eric Pouech : midimap: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: af32b64c4a79af2fb42db0b012872b9f72183140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af32b64c4a79af2fb42db0b0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:38 2022 +0100 midimap: 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/midimap/Makefile.in | 1 - dlls/midimap/midimap.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index d02c7eca7b3..c0e66f4341e 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = midimap.dll IMPORTS = winmm user32 advapi32 diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 53eeadee915..12555f5309a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -286,7 +286,7 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); - TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); if (!mom) return MMSYSERR_NOMEM; if (!lpDesc) { @@ -432,7 +432,7 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) } break; default: - FIXME("ooch %lx\n", dwParam); + FIXME("ooch %Ix\n", dwParam); } return ret; @@ -523,7 +523,7 @@ static LRESULT MIDIMAP_drvClose(void); DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg)

1 0