wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Alexandre Julliard : ntdll: Map explicitly loaded apiset dlls to their target library.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 7b233f3032e4850b0f387faef4aae5ed6d5175de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b233f3032e4850b0f387fae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:31:40 2022 +0100 ntdll: Map explicitly loaded apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 6 ++---- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index dcf3b8b3765..bd151708220 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -708,7 +708,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -722,7 +721,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -733,7 +731,6 @@ static void test_LoadLibraryEx_search_flags(void) strcpy( buffer, apiset_dll ); buffer[strlen(buffer) - 5] = '9'; mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); - todo_wine ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); if (mod) { @@ -776,9 +773,10 @@ static void test_LoadLibraryEx_search_flags(void) ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine /* rasapi32 doesn't have interesting dependencies on wine */ ok( !mod, "rasapi32 loaded\n" ); - ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); + else ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 387f8b6b2d6..49911d6c707 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2830,6 +2830,30 @@ done: } + +/****************************************************************************** + * find_apiset_dll + */ +static NTSTATUS find_apiset_dll( const WCHAR *name, WCHAR **fullname ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + UNICODE_STRING str; + ULONG len; + + if (get_apiset_entry( map, name, wcslen(name), &entry )) return STATUS_APISET_NOT_PRESENT; + if (get_apiset_target( map, entry, NULL, &str )) return STATUS_DLL_NOT_FOUND; + + len = wcslen( system_dir ) + str.Length / sizeof(WCHAR); + if (!(*fullname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + wcscpy( *fullname, system_dir ); + memcpy( *fullname + wcslen( system_dir ), str.Buffer, str.Length ); + (*fullname)[len] = 0; + return STATUS_SUCCESS; +} + + /*********************************************************************** * get_env_var */ @@ -2991,17 +3015,6 @@ done: return status; } -/*********************************************************************** - * is_apiset_dll_name - * - */ -static BOOL is_apiset_dll_name( const WCHAR *name ) -{ - static const WCHAR name_prefix[] = L"api-ms-win-"; - - return !wcsnicmp( name, name_prefix, ARRAY_SIZE(name_prefix) - 1 ); -} - /*********************************************************************** * find_dll_file * @@ -3024,7 +3037,11 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (!contains_path( libname )) { - status = find_actctx_dll( libname, &fullname ); + status = find_apiset_dll( libname, &fullname ); + if (status == STATUS_DLL_NOT_FOUND) goto done; + + if (status) status = find_actctx_dll( libname, &fullname ); + if (status == STATUS_SUCCESS) { TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); @@ -3044,8 +3061,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { status = search_dll_file( load_path, libname, nt_name, pwm, mapping, image_info, id ); - if (status == STATUS_DLL_NOT_FOUND && load_path && is_apiset_dll_name( libname )) - status = search_dll_file( NULL, libname, nt_name, pwm, mapping, image_info, id ); if (status == STATUS_DLL_NOT_FOUND) status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); }

1 0

Alexandre Julliard : ntdll: Map imported apiset dlls to their target library.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 31e151362bc5e82a988a4f9ff4309697525eda3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e151362bc5e82a988a4f9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 11:43:04 2022 +0100 ntdll: Map imported apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 - 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2c3e62f6e25..387f8b6b2d6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -587,16 +587,102 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id ) } +/****************************************************************************** + * get_apiset_entry + */ +static NTSTATUS get_apiset_entry( const API_SET_NAMESPACE *map, const WCHAR *name, ULONG len, + const API_SET_NAMESPACE_ENTRY **entry ) +{ + const API_SET_HASH_ENTRY *hash_entry; + ULONG hash, i, hash_len; + int min, max; + + if (len <= 4) return STATUS_INVALID_PARAMETER; + if (wcsnicmp( name, L"api-", 4 ) && wcsnicmp( name, L"ext-", 4 )) return STATUS_INVALID_PARAMETER; + if (!map) return STATUS_APISET_NOT_PRESENT; + + for (i = hash_len = 0; i < len; i++) + { + if (name[i] == '.') break; + if (name[i] == '-') hash_len = i; + } + for (i = hash = 0; i < hash_len; i++) + hash = hash * map->HashFactor + ((name[i] >= 'A' && name[i] <= 'Z') ? name[i] + 32 : name[i]); + + hash_entry = (API_SET_HASH_ENTRY *)((char *)map + map->HashOffset); + min = 0; + max = map->Count - 1; + while (min <= max) + { + int pos = (min + max) / 2; + if (hash_entry[pos].Hash < hash) min = pos + 1; + else if (hash_entry[pos].Hash > hash) max = pos - 1; + else + { + *entry = (API_SET_NAMESPACE_ENTRY *)((char *)map + map->EntryOffset) + hash_entry[pos].Index; + if ((*entry)->HashedLength != hash_len * sizeof(WCHAR)) break; + if (wcsnicmp( (WCHAR *)((char *)map + (*entry)->NameOffset), name, hash_len )) break; + return STATUS_SUCCESS; + } + } + return STATUS_APISET_NOT_PRESENT; +} + + +/****************************************************************************** + * get_apiset_target + */ +static NTSTATUS get_apiset_target( const API_SET_NAMESPACE *map, const API_SET_NAMESPACE_ENTRY *entry, + const WCHAR *host, UNICODE_STRING *ret ) +{ + const API_SET_VALUE_ENTRY *value = (API_SET_VALUE_ENTRY *)((char *)map + entry->ValueOffset); + ULONG i, len; + + if (!entry->ValueCount) return STATUS_DLL_NOT_FOUND; + if (host) + { + /* look for specific host in entries 1..n, entry 0 is the default */ + for (i = 1; i < entry->ValueCount; i++) + { + len = value[i].NameLength / sizeof(WCHAR); + if (!wcsnicmp( host, (WCHAR *)((char *)map + value[i].NameOffset), len ) && !host[len]) + { + value += i; + break; + } + } + } + if (!value->ValueOffset) return STATUS_DLL_NOT_FOUND; + ret->Buffer = (WCHAR *)((char *)map + value->ValueOffset); + ret->Length = value->ValueLength; + return STATUS_SUCCESS; +} + + /********************************************************************** * build_import_name */ static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int len ) { + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + const WCHAR *host = current_modref ? current_modref->ldr.BaseDllName.Buffer : NULL; + UNICODE_STRING str; + while (len && import[len-1] == ' ') len--; /* remove trailing spaces */ if (len + sizeof(".dll") > 256) return STATUS_DLL_NOT_FOUND; ascii_to_unicode( buffer, import, len ); buffer[len] = 0; if (!wcschr( buffer, '.' )) wcscpy( buffer + len, L".dll" ); + + if (get_apiset_entry( map, buffer, wcslen(buffer), &entry )) return STATUS_SUCCESS; + + if (get_apiset_target( map, entry, host, &str )) return STATUS_DLL_NOT_FOUND; + if (str.Length >= 256 * sizeof(WCHAR)) return STATUS_DLL_NOT_FOUND; + + TRACE( "found %s for %s\n", debugstr_us(&str), debugstr_w(buffer)); + memcpy( buffer, str.Buffer, str.Length ); + buffer[str.Length / sizeof(WCHAR)] = 0; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 98a5c933215..ab12a4ea1c0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2055,7 +2055,6 @@ static void load_apiset_dll(void) { NtCurrentTeb()->Peb->ApiSetMap = map; if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); - NtUnmapViewOfSection( NtCurrentProcess(), ptr ); TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); return; }

1 0

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

22 Feb '22

Module: wine Branch: master Commit: aa180417b88072643b4edf21f246325dc410b145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa180417b88072643b4edf21… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:16 2022 +0100 windowscodecs: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/bitmap.c | 12 +++--- dlls/windowscodecs/bmpdecode.c | 10 ++--- dlls/windowscodecs/bmpencode.c | 8 ++-- dlls/windowscodecs/clipper.c | 4 +- dlls/windowscodecs/clsfactory.c | 6 +-- dlls/windowscodecs/colorcontext.c | 4 +- dlls/windowscodecs/colortransform.c | 4 +- dlls/windowscodecs/converter.c | 4 +- dlls/windowscodecs/ddsformat.c | 16 ++++---- dlls/windowscodecs/decoder.c | 10 ++--- dlls/windowscodecs/encoder.c | 12 +++--- dlls/windowscodecs/fliprotate.c | 4 +- dlls/windowscodecs/gifformat.c | 16 ++++---- dlls/windowscodecs/icoformat.c | 14 +++---- dlls/windowscodecs/imgfactory.c | 22 +++++----- dlls/windowscodecs/info.c | 30 +++++++------- dlls/windowscodecs/libjpeg.c | 4 +- dlls/windowscodecs/libtiff.c | 2 +- dlls/windowscodecs/metadatahandler.c | 16 ++++---- dlls/windowscodecs/metadataquery.c | 24 +++++------ dlls/windowscodecs/palette.c | 4 +- dlls/windowscodecs/propertybag.c | 12 +++--- dlls/windowscodecs/scaler.c | 4 +- dlls/windowscodecs/stream.c | 76 +++++++++++++++++------------------ dlls/windowscodecs/tgaformat.c | 12 +++--- dlls/windowscodecs/wincodecs_common.c | 2 +- dlls/wmphoto/Makefile.in | 1 - dlls/wmphoto/main.c | 2 +- 29 files changed, 167 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa180417b88072643b4e…

1 0

Eric Pouech : wineps.drv: Enable compilation with long types.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: ceb06647db50f73c0e622453fd76190160056926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb06647db50f73c0e622453… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:46 2022 +0100 wineps.drv: 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/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/color.c | 2 +- dlls/wineps.drv/download.c | 4 ++-- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/escape.c | 10 +++++----- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 2 +- dlls/wineps.drv/init.c | 18 +++++++++--------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/ppd.c | 4 ++-- dlls/wineps.drv/ps.c | 8 ++++---- dlls/wineps.drv/type1.c | 10 +++++----- dlls/wineps.drv/type42.c | 22 +++++++++++----------- 15 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceb06647db50f73c0e62…

1 0

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

22 Feb '22

Module: wine Branch: master Commit: 71189f62604c2cb8208c85372a0e027dd2b79055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71189f62604c2cb8208c8537… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 08:15:19 2022 -0600 winmm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/driver.c | 18 ++--- dlls/winmm/joystick.c | 24 +++---- dlls/winmm/lolvldrv.c | 16 ++--- dlls/winmm/mci.c | 70 +++++++++---------- dlls/winmm/mmio.c | 48 ++++++------- dlls/winmm/playsound.c | 14 ++-- dlls/winmm/time.c | 2 +- dlls/winmm/waveform.c | 178 ++++++++++++++++++++++++------------------------- dlls/winmm/winmm.c | 50 +++++++------- 10 files changed, 211 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71189f62604c2cb8208c…

1 0

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

22 Feb '22

Module: wine Branch: master Commit: 5ea3d5111825d8b990bb7ea352c9864e435f57d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea3d5111825d8b990bb7ea3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:58 2022 +0100 wnaspi32: 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/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 6122ee8d8f6..5c3fa66e9d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 903c618f9ba..ae2d24489f6 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -74,7 +74,7 @@ int ASPI_GetNumControllers(void) } RegCloseKey(hkeyScsi); - TRACE("Returning %d host adapters\n", num_ha ); + TRACE("Returning %ld host adapters\n", num_ha ); return num_ha; }

1 0

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

22 Feb '22

Module: wine Branch: master Commit: dcc72808f039f46efda85c52c2f61ffd32070910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcc72808f039f46efda85c52… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:52 2022 +0100 wmvcore: 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/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 10 +++++----- dlls/wmvcore/writer.c | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 56dd85bb191..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ff837921286..4be55cbb707 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -30,7 +30,7 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_async_reader(reader); } @@ -44,7 +44,7 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_sync_reader(reader); } @@ -144,7 +144,7 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -200,7 +200,7 @@ static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { WMProfileManager *This = impl_from_IWMProfileManager2(iface); - FIXME("(%p)->(%d %p)\n", This, index, ret); + FIXME("(%p)->(%ld %p)\n", This, index, ret); return E_NOTIMPL; } diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 717984db1af..5c62cd35143 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -69,7 +69,7 @@ static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI WMWriter_Release(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -118,21 +118,21 @@ static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + FIXME("(%p)->(%ld %p)\n", This, dwInputNumber, pcFormat); return E_NOTIMPL; } @@ -140,7 +140,7 @@ static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNum IWMInputMediaProps **props) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + FIXME("(%p)->(%ld %ld %p)\n", This, dwInputNumber, dwFormatNumber, props); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, size, sample); + FIXME("(%p)->(%ld %p)\n", This, size, sample); return E_NOTIMPL; } @@ -169,7 +169,7 @@ static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, Q DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + FIXME("(%p)->(%ld %s %lx %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, D static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + FIXME("(%p)->(%lu %p)\n", This, sink_num, sink); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *ifa QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + FIXME("(%p)->(%u %s %lu %s %lx %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); return E_NOTIMPL; } @@ -290,7 +290,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u)\n", This, window); + FIXME("(%p)->(%lu)\n", This, window); return E_NOTIMPL; } @@ -305,7 +305,7 @@ static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + FIXME("(%p)->(%lu %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); return E_NOTIMPL; } @@ -313,7 +313,7 @@ static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); return E_NOTIMPL; }

1 0

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

22 Feb '22

Module: wine Branch: master Commit: b3f3e684a6288041b21451f7d87a2798ddf68b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f3e684a6288041b21451f7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:46 2022 +0100 wmp: 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/wmp/Makefile.in | 1 - dlls/wmp/events.c | 10 +++---- dlls/wmp/oleobj.c | 40 ++++++++++++------------- dlls/wmp/player.c | 84 ++++++++++++++++++++++++++-------------------------- dlls/wmp/wmp_main.c | 6 ++-- 5 files changed, 70 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3f3e684a6288041b214…

1 0

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

22 Feb '22

Module: wine Branch: master Commit: b507da66ba4ebcb050f6c5118c5137ece91e455b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b507da66ba4ebcb050f6c511… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:40 2022 +0100 wlanapi: 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/wlanapi/Makefile.in | 1 - dlls/wlanapi/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index 8f219cc6148..312e5407800 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wlanapi.dll IMPORTLIB = wlanapi diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 07264c9e136..c3712662232 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -117,7 +117,7 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia struct wine_wlan *wlan; HANDLE ret_handle; - TRACE("(%u, %p, %p, %p)\n", client_version, reserved, negotiated_version, handle); + TRACE("(%lu, %p, %p, %p)\n", client_version, reserved, negotiated_version, handle); if (reserved || !negotiated_version || !handle) return ERROR_INVALID_PARAMETER; @@ -149,7 +149,7 @@ DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL i WLAN_NOTIFICATION_CALLBACK callback, void *context, void *reserved, DWORD *notify_prev) { - FIXME("(%p, %d, %d, %p, %p, %p, %p) stub\n", + FIXME("(%p, %ld, %d, %p, %p, %p, %p) stub\n", handle, notify_source, ignore_dup, callback, context, reserved, notify_prev); return ERROR_CALL_NOT_IMPLEMENTED; @@ -158,7 +158,7 @@ DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL i DWORD WINAPI WlanGetAvailableNetworkList(HANDLE handle, const GUID *guid, DWORD flags, void *reserved, WLAN_AVAILABLE_NETWORK_LIST **network_list) { - FIXME("(%p, %s, 0x%x, %p, %p) stub\n", + FIXME("(%p, %s, 0x%lx, %p, %p) stub\n", handle, wine_dbgstr_guid(guid), flags, reserved, network_list); return ERROR_CALL_NOT_IMPLEMENTED; @@ -211,7 +211,7 @@ void *WINAPI WlanAllocateMemory(DWORD size) { void *ret; - TRACE("(%d)\n", size); + TRACE("(%ld)\n", size); if (!size) {

1 0

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

22 Feb '22

Module: wine Branch: master Commit: 9531fede56d1baa0416338e03651c500308594d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9531fede56d1baa0416338e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:34 2022 +0100 wintrust: 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/wintrust/Makefile.in | 1 - dlls/wintrust/asn.c | 90 +++++++++++++++++++++---------------------- dlls/wintrust/crypt.c | 50 ++++++++++++------------ dlls/wintrust/register.c | 4 +- dlls/wintrust/softpub.c | 36 ++++++++--------- dlls/wintrust/wintrust_main.c | 74 +++++++++++++++++------------------ 6 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9531fede56d1baa04163…

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