- Wine-Commits - list.winehq.org

Rémi Bernon : dmime: Free all pending messages after CloseDown.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: ac832b97aeb639d178fdea4986a83c7f935fd9b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac832b97aeb639d178fdea4986a83c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 15:28:05 2023 +0200 dmime: Free all pending messages after CloseDown. --- dlls/dmime/performance.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a5655f4b2df..5c3e1f17a97 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -948,6 +948,8 @@ static HRESULT WINAPI performance_AdjustTime(IDirectMusicPerformance8 *iface, RE static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct message *message, *next; + HRESULT hr; FIXME("(%p): semi-stub\n", This); @@ -956,6 +958,16 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) This->procThreadTicStarted = FALSE; CloseHandle(This->procThread); } + + LIST_FOR_EACH_ENTRY_SAFE(message, next, &This->messages, struct message, entry) + { + list_remove(&message->entry); + list_init(&message->entry); + + if (FAILED(hr = IDirectMusicPerformance8_FreePMsg(iface, &message->msg))) + WARN("Failed to free message %p, hr %#lx\n", message, hr); + } + if (This->master_clock) { IReferenceClock_Release(This->master_clock);

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_GetNotificationPMsg.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 7a678903fbe9b384e97b23bc8cb73c9239616054 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a678903fbe9b384e97b23bc8cb73c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 15:55:13 2023 +0200 dmime: Implement IDirectMusicPerformance_GetNotificationPMsg. --- dlls/dmime/performance.c | 108 +++++++++++++++++++++++++++++++++++++---------- dlls/dmime/tests/dmime.c | 31 ++++---------- 2 files changed, 93 insertions(+), 46 deletions(-)

1 0

Daniel Lehman : advapi32/tests: Add ReadEventLogA tests for EventlogStarted.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: d2a606bc92fa919e078665c7546e07a7fe6ee544 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2a606bc92fa919e078665c7546e07… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 2 23:39:16 2023 -0700 advapi32/tests: Add ReadEventLogA tests for EventlogStarted. --- dlls/advapi32/tests/eventlog.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 57ead1078f5..e2334c692e5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1324,7 +1324,9 @@ static void test_eventlog_start(void) EVENTLOGRECORD *record; DWORD size, read, needed; WCHAR *sourcename, *computername, *localcomputer; + char *sourcenameA, *computernameA, *localcomputerA; + /* ReadEventLogW */ size = MAX_COMPUTERNAME_LENGTH + 1; localcomputer = malloc(size * sizeof(WCHAR)); GetComputerNameW(localcomputer, &size); @@ -1392,6 +1394,70 @@ static void test_eventlog_start(void) todo_wine ok(found, "EventlogStarted event not found\n"); CloseEventLog(handle); free(localcomputer); + + /* ReadEventLogA */ + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputerA = malloc(size); + GetComputerNameA(localcomputerA, &size); + + handle = OpenEventLogA(0, "System"); + handle2 = OpenEventLogA(0, "SYSTEM"); + todo_wine ok(handle != handle2, "Expected different handle\n"); + CloseEventLog(handle2); + + ret = TRUE; + found = FALSE; + while (!found && ret) + { + read = needed = 0; + record = malloc(sizeof(EVENTLOGRECORD)); + if (!(ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, sizeof(EVENTLOGRECORD), &read, &needed)) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + record = realloc(record, needed); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, needed, &read, &needed); + ok(needed == 0, "Expected 0, got %ld\n", needed); + } + if (ret && record->EventID == EVENT_EventlogStarted) + { + ok(record->Length == read, "Expected %ld, got %ld\n", read, record->Length); + ok(record->Reserved == 0x654c664c, "Expected 0x654c664c, got %ld\n", record->Reserved); + ok(record->RecordNumber > 0, "Expected 1 or higher, got %ld\n", record->RecordNumber); + ok(record->TimeGenerated == record->TimeWritten, "Expected time values to be the same\n"); + ok(record->EventType == EVENTLOG_INFORMATION_TYPE, + "Expected %d, got %d\n", EVENTLOG_INFORMATION_TYPE, record->EventType); + ok(record->NumStrings == 0, "Expected 0, got %d\n", record->NumStrings); + ok(record->EventCategory == 0, "Expected 0, got %d\n", record->EventCategory); + ok(record->ReservedFlags == 0, "Expected 0, got %d\n", record->ReservedFlags); + ok(record->ClosingRecordNumber == 0, "Expected 0, got %ld\n", record->ClosingRecordNumber); + ok(record->StringOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + ok(record->UserSidLength == 0, "Expected 0, got %ld\n", record->UserSidLength); + ok(record->DataLength == 24, "Expected 24, got %ld\n", record->DataLength); + ok(record->DataOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + + sourcenameA = (char *)(record + 1); + ok(!strcmp(sourcenameA, "EventLog"), + "Expected 'EventLog', got '%s'\n", sourcenameA); + + computernameA = sourcenameA + sizeof("EventLog"); + ok(!_stricmp(computernameA, localcomputerA), "Expected '%s', got '%s'\n", + localcomputerA, computernameA); + + size = sizeof(EVENTLOGRECORD) + sizeof("EventLog") + strlen(computernameA) + 1; + size = (size + 7) & ~7; + ok(record->DataOffset == size || + broken(record->DataOffset == size - 1), /* win8 */ + "Expected %ld, got %ld\n", size, record->DataOffset); + + found = TRUE; + } + free(record); + } + todo_wine ok(found, "EventlogStarted event not found\n"); + CloseEventLog(handle); + free(localcomputerA); } START_TEST(eventlog)

1 0

Nikolay Sivov : d3d10/tests: Add a test for log2/log10/exp2 functions in expressions.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: fe63d304be27a6eb057cef6373763d4e76f4054c URL: https://gitlab.winehq.org/wine/wine/-/commit/fe63d304be27a6eb057cef6373763d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 6 13:54:54 2023 +0200 d3d10/tests: Add a test for log2/log10/exp2 functions in expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 193 ++++++++++++++++++++++++++++------------------ 1 file changed, 116 insertions(+), 77 deletions(-)

1 0

Paul Gofman : imagehlp: Import functions instead of forwarding.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 67bc349541c8c76b99583f7d7b9fdfb95fd94f28 URL: https://gitlab.winehq.org/wine/wine/-/commit/67bc349541c8c76b99583f7d7b9fdf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 6 17:54:50 2023 -0600 imagehlp: Import functions instead of forwarding. --- dlls/imagehlp/imagehlp.spec | 148 ++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a separate helper to build the main module on Wow64.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: a1830c03a50ad38ec3f857a2a8b88498d1bf5e54 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1830c03a50ad38ec3f857a2a8b884… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 8 13:55:45 2023 +0200 ntdll: Add a separate helper to build the main module on Wow64. We can't use the normal routine because the module is 32-bit. --- dlls/ntdll/loader.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2bf1437623f..e0cfead6893 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2191,11 +2191,16 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, * * Build the module data for the initially-loaded ntdll. */ -static void build_ntdll_module( HMODULE module ) +static void build_ntdll_module(void) { UNICODE_STRING nt_name = RTL_CONSTANT_STRING( L"\\??\\C:\\windows\\system32\\ntdll.dll" ); + MEMORY_BASIC_INFORMATION meminfo; WINE_MODREF *wm; + void *module; + NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + module = meminfo.AllocationBase; wm = alloc_module( module, &nt_name, TRUE ); assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; @@ -2724,8 +2729,10 @@ static WINE_MODREF *build_main_module(void) status = RtlDosPathNameToNtPathName_U_WithStatus( params->ImagePathName.Buffer, &nt_name, NULL, NULL ); if (status) goto failed; status = build_module( NULL, &nt_name, &module, &info, NULL, DONT_RESOLVE_DLL_REFERENCES, FALSE, &wm ); + if (status) goto failed; RtlFreeUnicodeString( &nt_name ); - if (!status) return wm; + wm->ldr.LoadCount = -1; + return wm; failed: MESSAGE( "wine: failed to create main module for %s, status %lx\n", debugstr_us(&params->ImagePathName), status ); @@ -4055,12 +4062,29 @@ static void load_global_options(void) #ifdef _WIN64 +static void build_wow64_main_module(void) +{ + UNICODE_STRING nt_name; + WINE_MODREF *wm; + RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; + void *module = NtCurrentTeb()->Peb->ImageBaseAddress; + + RtlDosPathNameToNtPathName_U_WithStatus( params->ImagePathName.Buffer, &nt_name, NULL, NULL ); + wm = alloc_module( module, &nt_name, FALSE ); + assert( wm ); + wm->ldr.LoadCount = -1; + RtlFreeUnicodeString( &nt_name ); +} + static void (WINAPI *pWow64LdrpInitialize)( CONTEXT *ctx ); void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ) = NULL; static void init_wow64( CONTEXT *context ) { + build_wow64_main_module(); + build_ntdll_module(); + if (!imports_fixup_done) { HMODULE wow64; @@ -4219,12 +4243,11 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR init_user_process_params(); load_global_options(); version_init(); - build_ntdll_module( meminfo.AllocationBase ); if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); wm = build_main_module(); - wm->ldr.LoadCount = -1; + build_ntdll_module(); if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS) {

1 0

Alex Henrie : mciavi32: Use the debugstr_fourcc function instead of reimplementing it.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 6da1c970a455843073f58b57f30dc0267e4f9f58 URL: https://gitlab.winehq.org/wine/wine/-/commit/6da1c970a455843073f58b57f30dc0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 2 21:38:30 2023 -0600 mciavi32: Use the debugstr_fourcc function instead of reimplementing it. --- dlls/mciavi32/mmoutput.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 948b33ae3e1..dd8f96e1314 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -28,15 +28,9 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK { MMCKINFO mmckInfo; - TRACE("ash.fccType='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_audio.fccType)), - HIBYTE(LOWORD(wma->ash_audio.fccType)), - LOBYTE(HIWORD(wma->ash_audio.fccType)), - HIBYTE(HIWORD(wma->ash_audio.fccType))); + TRACE("ash.fccType=%s\n", debugstr_fourcc(wma->ash_audio.fccType)); if (wma->ash_audio.fccHandler) /* not all streams specify a handler */ - TRACE("ash.fccHandler='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_audio.fccHandler)), - HIBYTE(LOWORD(wma->ash_audio.fccHandler)), - LOBYTE(HIWORD(wma->ash_audio.fccHandler)), - HIBYTE(HIWORD(wma->ash_audio.fccHandler))); + TRACE("ash.fccHandler=%s\n", debugstr_fourcc(wma->ash_audio.fccHandler)); else TRACE("ash.fccHandler=0, no handler specified\n"); TRACE("ash.dwFlags=%ld\n", wma->ash_audio.dwFlags); @@ -89,14 +83,8 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK { MMCKINFO mmckInfo; - TRACE("ash.fccType='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_video.fccType)), - HIBYTE(LOWORD(wma->ash_video.fccType)), - LOBYTE(HIWORD(wma->ash_video.fccType)), - HIBYTE(HIWORD(wma->ash_video.fccType))); - TRACE("ash.fccHandler='%c%c%c%c'\n", LOBYTE(LOWORD(wma->ash_video.fccHandler)), - HIBYTE(LOWORD(wma->ash_video.fccHandler)), - LOBYTE(HIWORD(wma->ash_video.fccHandler)), - HIBYTE(HIWORD(wma->ash_video.fccHandler))); + TRACE("ash.fccType=%s\n", debugstr_fourcc(wma->ash_video.fccType)); + TRACE("ash.fccHandler=%s\n", debugstr_fourcc(wma->ash_video.fccHandler)); TRACE("ash.dwFlags=%ld\n", wma->ash_video.dwFlags); TRACE("ash.wPriority=%d\n", wma->ash_video.wPriority); TRACE("ash.wLanguage=%d\n", wma->ash_video.wLanguage);

1 0

Alex Henrie : ddraw: Use the debugstr_fourcc function instead of reimplementing it.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 8f02157bc8f1e2b100af5e77f2340ee9af2eba9e URL: https://gitlab.winehq.org/wine/wine/-/commit/8f02157bc8f1e2b100af5e77f2340e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 2 21:38:30 2023 -0600 ddraw: Use the debugstr_fourcc function instead of reimplementing it. --- dlls/ddraw/utils.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 1915f9dd7f0..4204587dd91 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -826,12 +826,8 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) TRACE("( "); DDRAW_dump_pixelformat_flag(pf->dwFlags); if (pf->dwFlags & DDPF_FOURCC) - TRACE(", dwFourCC code '%c%c%c%c' (0x%08lx) - %lu bits per pixel", - (unsigned char)( pf->dwFourCC &0xff), - (unsigned char)((pf->dwFourCC>> 8)&0xff), - (unsigned char)((pf->dwFourCC>>16)&0xff), - (unsigned char)((pf->dwFourCC>>24)&0xff), - pf->dwFourCC, + TRACE(", dwFourCC code %s - %lu bits per pixel", + debugstr_fourcc(pf->dwFourCC), pf->dwYUVBitCount); if (pf->dwFlags & DDPF_RGB) {

1 0

Alex Henrie : comctl32: Use the debugstr_fourcc function instead of reimplementing it.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 6159a50127d928b1831fb0233271ce583ef3f1b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6159a50127d928b1831fb0233271ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 2 21:38:30 2023 -0600 comctl32: Use the debugstr_fourcc function instead of reimplementing it. --- dlls/comctl32/animate.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index f4d848fef91..721379f329c 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -534,14 +534,8 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->ash, sizeof(infoPtr->ash)); - TRACE("ash.fccType='%c%c%c%c'\n", LOBYTE(LOWORD(infoPtr->ash.fccType)), - HIBYTE(LOWORD(infoPtr->ash.fccType)), - LOBYTE(HIWORD(infoPtr->ash.fccType)), - HIBYTE(HIWORD(infoPtr->ash.fccType))); - TRACE("ash.fccHandler='%c%c%c%c'\n", LOBYTE(LOWORD(infoPtr->ash.fccHandler)), - HIBYTE(LOWORD(infoPtr->ash.fccHandler)), - LOBYTE(HIWORD(infoPtr->ash.fccHandler)), - HIBYTE(HIWORD(infoPtr->ash.fccHandler))); + TRACE("ash.fccType=%s\n", debugstr_fourcc(infoPtr->ash.fccType)); + TRACE("ash.fccHandler=%s\n", debugstr_fourcc(infoPtr->ash.fccHandler)); TRACE("ash.dwFlags=%ld\n", infoPtr->ash.dwFlags); TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority); TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage);

1 0

Alex Henrie : msvfw32: Use the debugstr_fourcc function instead of reimplementing it.
by Alexandre Julliard Oct. 7, 2023

Oct. 7, 2023

Module: wine Branch: master Commit: 4c07f221073d798cec79fb48d3bd6161860fbdc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c07f221073d798cec79fb48d3bd61… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 2 21:38:30 2023 -0600 msvfw32: Use the debugstr_fourcc function instead of reimplementing it. --- dlls/msvfw32/msvideo_main.c | 48 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index b9e49d30923..d332300c711 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -56,18 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvideo); (str)[3] = HIBYTE(HIWORD(fcc)); \ } while(0) -static inline const char *wine_dbgstr_fcc( DWORD fcc ) -{ - char fcc_str[5]; - fourcc_to_string(fcc_str, fcc); - fcc_str[4] = '\0'; - /* Last byte may be ' ' in some cases like "DIB " */ - if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) && isalnum(fcc_str[2]) - && (isalnum(fcc_str[3]) || isspace(fcc_str[3]))) - return wine_dbg_sprintf("%s", fcc_str); - return wine_dbg_sprintf("0x%08lx", fcc); -} - static const char *wine_dbgstr_icerr( int ret ) { const char *str; @@ -276,7 +264,7 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) HKEY key; TRACE("type %s, handler %s, info %p.\n", - wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler), info); + debugstr_fourcc(type), debugstr_fourcc(handler), info); memset(info, 0, sizeof(*info)); info->dwSize = sizeof(*info); @@ -336,7 +324,7 @@ BOOL VFWAPI ICInfo(DWORD type, DWORD handler, ICINFO *info) info->fccType = type; info->fccHandler = handler; - WARN("No driver found for codec %s.%s.\n", wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler)); + WARN("No driver found for codec %s.%s.\n", debugstr_fourcc(type), debugstr_fourcc(handler)); return FALSE; } @@ -350,7 +338,7 @@ BOOL VFWAPI ICInstall(DWORD type, DWORD handler, LPARAM lparam, char *desc, UINT struct reg_driver *driver; TRACE("type %s, handler %s, lparam %#Ix, desc %s, flags %#x.\n", - wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler), lparam, debugstr_a(desc), flags); + debugstr_fourcc(type), debugstr_fourcc(handler), lparam, debugstr_a(desc), flags); LIST_FOR_EACH_ENTRY(driver, &reg_driver_list, struct reg_driver, entry) { @@ -405,7 +393,7 @@ BOOL VFWAPI ICRemove(DWORD type, DWORD handler, UINT flags) LONG res; TRACE("type %s, handler %s, flags %#x.\n", - wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler), flags); + debugstr_fourcc(type), debugstr_fourcc(handler), flags); LIST_FOR_EACH_ENTRY(driver, &reg_driver_list, struct reg_driver, entry) { @@ -446,7 +434,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) struct reg_driver *driver; HDRVR hdrv = NULL; - TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode); + TRACE("(%s,%s,0x%08x)\n", debugstr_fourcc(fccType), debugstr_fourcc(fccHandler), wMode); if (!fccHandler) /* No specific handler, return the first valid for wMode */ { @@ -463,7 +451,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) if (local != 0) { TRACE("Returning %s as default handler for %s\n", - wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); + debugstr_fourcc(info.fccHandler), debugstr_fourcc(fccType)); return local; } } @@ -537,7 +525,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO WINE_HIC* whic; TRACE("(%s,%s,%d,%p)\n", - wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler); + debugstr_fourcc(fccType), debugstr_fourcc(fccHandler), wMode, lpfnHandler); icopen.dwSize = sizeof(ICOPEN); icopen.fccType = fccType; @@ -638,7 +626,7 @@ HIC VFWAPI ICLocate(DWORD type, DWORD handler, BITMAPINFOHEADER *in, DWORD i; TRACE("type %s, handler %s, in %p, out %p, mode %u.\n", - wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler), in, out, mode); + debugstr_fourcc(type), debugstr_fourcc(handler), in, out, mode); switch (mode) { @@ -662,8 +650,8 @@ HIC VFWAPI ICLocate(DWORD type, DWORD handler, BITMAPINFOHEADER *in, { if (!ICSendMessage(hic, msg, (DWORD_PTR)in, (DWORD_PTR)out)) { - TRACE("Found codec %s.%s.\n", wine_dbgstr_fcc(type), - wine_dbgstr_fcc(handler)); + TRACE("Found codec %s.%s.\n", debugstr_fourcc(type), + debugstr_fourcc(handler)); return hic; } ICClose(hic); @@ -675,8 +663,8 @@ HIC VFWAPI ICLocate(DWORD type, DWORD handler, BITMAPINFOHEADER *in, { if (!ICSendMessage(hic, msg, (DWORD_PTR)in, (DWORD_PTR)out)) { - TRACE("Found codec %s.%s.\n", wine_dbgstr_fcc(info.fccType), - wine_dbgstr_fcc(info.fccHandler)); + TRACE("Found codec %s.%s.\n", debugstr_fourcc(info.fccType), + debugstr_fourcc(info.fccHandler)); return hic; } ICClose(hic); @@ -687,7 +675,7 @@ HIC VFWAPI ICLocate(DWORD type, DWORD handler, BITMAPINFOHEADER *in, return ICLocate(ICTYPE_VIDEO, handler, in, out, mode); WARN("Could not find a driver for codec %s.%s.\n", - wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler)); + debugstr_fourcc(type), debugstr_fourcc(handler)); return 0; } @@ -886,7 +874,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK) { TRACE("fccHandler %s doesn't support input DIB format %ld\n", - wine_dbgstr_fcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression); + debugstr_fourcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression); ICClose(hic); continue; } @@ -1580,12 +1568,12 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) TRACE("Input: %lux%lu, fcc %s, bpp %u, size %lu\n", pc->lpbiIn->bmiHeader.biWidth, pc->lpbiIn->bmiHeader.biHeight, - wine_dbgstr_fcc(pc->lpbiIn->bmiHeader.biCompression), + debugstr_fourcc(pc->lpbiIn->bmiHeader.biCompression), pc->lpbiIn->bmiHeader.biBitCount, pc->lpbiIn->bmiHeader.biSizeImage); TRACE("Output: %lux%lu, fcc %s, bpp %u, size %lu\n", pc->lpbiOut->bmiHeader.biWidth, pc->lpbiOut->bmiHeader.biHeight, - wine_dbgstr_fcc(pc->lpbiOut->bmiHeader.biCompression), + debugstr_fourcc(pc->lpbiOut->bmiHeader.biCompression), pc->lpbiOut->bmiHeader.biBitCount, pc->lpbiOut->bmiHeader.biSizeImage); @@ -1605,8 +1593,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) "\thandler: %s\n" "\tin/out: %p/%p\n" "\tkey/data/quality: %li/%li/%li\n", - pc->cbSize, pc->dwFlags, pc->hic, wine_dbgstr_fcc(pc->fccType), - wine_dbgstr_fcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey, + pc->cbSize, pc->dwFlags, pc->hic, debugstr_fourcc(pc->fccType), + debugstr_fourcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut);

1 0