June 2023 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: cd56a1c16450d3d2addaf6a398859e4682e8b851 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd56a1c16450d3d2addaf6a398859e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:05:29 2023 +0200 gdi32: Don't use DECLSPEC_HIDDEN. --- dlls/gdi32/gdi_private.h | 389 ++++++++++++++++++++++------------------------- dlls/gdi32/text.c | 2 +- 2 files changed, 184 insertions(+), 207 deletions(-)

1 0

Eric Pouech : dbghelp: Add tests for SymSrvGetFileIndexInfo() for PDB files.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: f4c1860480c4d2a3eadd2be0ee9207df6942e386 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4c1860480c4d2a3eadd2be0ee9207… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 18:39:32 2023 +0200 dbghelp: Add tests for SymSrvGetFileIndexInfo() for PDB files. Add infrastructure to generate fake .PDB files. Only done in DS format. I'm not sure we care about JG anymore, DS format has been introduced by MS in early 2000 to supersede JG, and is still mainstream today). For the record, LLVM in its PDB handling doesn't support JG format. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 385 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 383 insertions(+), 2 deletions(-)

1 0

Eric Pouech : dbghelp: Implement SymSrvGetFileIndexInfo for PDB files.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: bbc2a9ab5bd2bc21dd5a324025a554534a3904ad URL: https://gitlab.winehq.org/wine/wine/-/commit/bbc2a9ab5bd2bc21dd5a324025a554… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 18:39:32 2023 +0200 dbghelp: Implement SymSrvGetFileIndexInfo for PDB files. Only done for DS format. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/msc.c | 70 ++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/path.c | 3 +- dlls/dbghelp/tests/path.c | 3 -- 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f91e2784b15..1ceefcdbde6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -772,6 +772,7 @@ struct pdb_cmd_pair { }; extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, union ctx *context, struct pdb_cmd_pair *cpair) DECLSPEC_HIDDEN; +extern DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info); /* path.c */ extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f6b681cb4ae..63c3f530bf5 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3615,6 +3615,76 @@ static BOOL pdb_process_internal(const struct process* pcs, struct pdb_module_info* pdb_module_info, unsigned module_index); +DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) +{ + /* check the file header, and if ok, load the TOC */ + TRACE("PDB: %.40s\n", debugstr_an(image, 40)); + + if (!memcmp(image, PDB_JG_IDENT, sizeof(PDB_JG_IDENT))) + { + FIXME("Unsupported for PDB files in JG format\n"); + return ERROR_FILE_CORRUPT; + } + if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) + { + const struct PDB_DS_HEADER* pdb = (const struct PDB_DS_HEADER*)image; + struct PDB_DS_TOC* ds_toc; + struct PDB_DS_ROOT* root; + DWORD ec = ERROR_SUCCESS; + + ds_toc = pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_block * pdb->block_size), + pdb->toc_size); + root = pdb_read_ds_stream(pdb, ds_toc, 1); + if (!root) + { + pdb_free(ds_toc); + return ERROR_FILE_CORRUPT; + } + switch (root->Version) + { + case 20000404: + break; + default: + ERR("-Unknown root block version %u\n", root->Version); + ec = ERROR_FILE_CORRUPT; + } + /* The age field is present twice (in PDB_ROOT and in PDB_SYMBOLS ), + * It's the one in PDB_SYMBOLS which is reported. + */ + if (ec == ERROR_SUCCESS) + { + PDB_SYMBOLS* symbols = pdb_read_ds_stream(pdb, ds_toc, 3); + + if (symbols && symbols->version == 19990903) + { + info->age = symbols->age; + } + else + { + if (symbols) + ERR("-Unknown symbol info version %u %08x\n", symbols->version, symbols->version); + ec = ERROR_FILE_CORRUPT; + } + pdb_free(symbols); + } + if (ec == ERROR_SUCCESS) + { + info->dbgfile[0] = '\0'; + info->guid = root->guid; + info->pdbfile[0] = '\0'; + info->sig = 0; + info->size = 0; + info->stripped = FALSE; + info->timestamp = 0; + } + + pdb_free(ds_toc); + pdb_free(root); + return ec; + } + return ERROR_BAD_FORMAT; +} + static void pdb_process_symbol_imports(const struct process* pcs, const struct msc_debug_info* msc_dbg, const PDB_SYMBOLS* symbols, diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 5c53e3f857d..dce700b34e7 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -906,7 +906,8 @@ BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info, fsize = GetFileSize(hFile, NULL); /* try PE module first */ ret = pe_get_file_indexinfo(image, fsize, info); - /* handle (ret == ERROR_BAD_FORMAT) with .dbg and .pdb format */ + if (ret == ERROR_BAD_FORMAT) + ret = pdb_get_file_indexinfo(image, fsize, info); } else ret = ERROR_FILE_NOT_FOUND; diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 78e357d812f..54189c7ed5c 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -828,10 +828,8 @@ static void test_srvgetindexes_pdb(void) memset(&ssii, 0x45, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); ret = SymSrvGetFileIndexInfo(filename, &ssii, 0); - todo_wine ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError()); - if (ret) { ok(ssii.age == 240 + i, "Mismatch in age: %lx\n", ssii.age); ok(!memcmp(&ssii.guid, indexes[i].guid, sizeof(GUID)), "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid)); @@ -844,7 +842,6 @@ static void test_srvgetindexes_pdb(void) ok(!strcmp(ssii.file, filename), "Mismatch in file: %s\n", ssii.file); ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %s\n", ssii.pdbfile); ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %s\n", ssii.dbgfile); - } DeleteFileA(filename); winetest_pop_context();

1 0

Rémi Bernon : explorer: Use wide string literals.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 5b11157ecf787e545062000ab6afd1c55ee8dacc URL: https://gitlab.winehq.org/wine/wine/-/commit/5b11157ecf787e545062000ab6afd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:50:40 2023 +0200 explorer: Use wide string literals. --- programs/explorer/appbar.c | 5 ++-- programs/explorer/desktop.c | 66 ++++++++++++-------------------------------- programs/explorer/explorer.c | 23 +++++++-------- programs/explorer/systray.c | 5 ++-- 4 files changed, 31 insertions(+), 68 deletions(-)

1 0

Tim Clem : winemac.drv: Don't expect an internal driver message to set last error.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 98748075647820da9a10079061c1748b6a16047f URL: https://gitlab.winehq.org/wine/wine/-/commit/98748075647820da9a10079061c174… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Jun 23 13:00:49 2023 -0700 winemac.drv: Don't expect an internal driver message to set last error. NtUserMessageCall(..., NtUserSendDriverMessage) does not ensure the validity of the hwnd, so this check will incorrectly fail if the last error was ERROR_INVALID_WINDOW_HANDLE by coincidence. The notify_owner call immediately following this code will catch a destroyed owner hwnd. --- dlls/winemac.drv/systray.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 8b3452e7540..42ffe49f563 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -342,13 +342,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) else if (event->status_item_mouse_button.count % 2 == 0) msg += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; - if (!send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && - RtlGetLastWin32Error() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); - return; - } + send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0); if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y)) return;

1 0

Maarten De Braekeleer : cmd: Fix 'if exist' with a directory/ as a parameter.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 5e2f9996baedbe389df93255a4dd1188cbdb6c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e2f9996baedbe389df93255a4dd11… Author: Maarten De Braekeleer <maarten.debraekeleer(a)gmail.com> Date: Sat Jun 24 20:02:53 2023 +0200 cmd: Fix 'if exist' with a directory/ as a parameter. 'if exists' takes a parameter which can be directory, directory/, directory/. directory\ or directory\. for example, and should equate to true if the directory exists. The syntax directory\ is explicitly rejected by FindFirstFile and hence was not working - look for this specific case, and if found append a '.'. Follow-up commit of bc9d68bcbee5c9d4f4582f766a4f552870385361 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55130#add_comment --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 19 +++++++++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 5 ++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3b2a192c828..badf41c17f6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2844,8 +2844,8 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) int len = lstrlenW(param); if (!len) goto syntax_err; - /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (param[len-1] == '\\') lstrcatW(param, L"."); + /* FindFirstFile does not like a directory path ending in '\' or '/', append a '.' */ + if (param[len-1] == '\\' || param[len-1] == '/') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE ); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index fe7bedb1362..eaee2900bc9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1138,9 +1138,9 @@ if exist subdir ( echo ERROR exist subdir not working ) if exist subdir\. ( - echo exist subdir with . ok + echo exist subdir with \. ok ) else ( - echo ERROR exist subdir with . not working + echo ERROR exist subdir with \. not working ) if exist subdir\ ( echo exist subdir with \ ok @@ -1152,6 +1152,21 @@ if exist "subdir\" ( ) else ( echo ERROR exist subdir with \ and quotes not working ) +if exist subdir/. ( + echo exist subdir with /. ok +) else ( + echo ERROR exist subdir with /. not working +) +if exist subdir/ ( + echo exist subdir with / ok +) else ( + echo ERROR exist subdir with / not working +) +if exist "subdir/" ( + echo exist subdir with / and quotes ok +) else ( + echo ERROR exist subdir with / and quotes not working +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 91570a7990f..411eae303ac 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -821,9 +821,12 @@ exist wildcard works negate exist wildcard works exist wildcard bad subdir broken works exist subdir ok -exist subdir with . ok +exist subdir with \. ok exist subdir with \ ok exist subdir with \ and quotes ok +exist subdir with /. ok +exist subdir with / ok +exist subdir with / and quotes ok ------ for numbers negative numbers handled negative numbers handled

1 0

Rémi Bernon : explorer: Use CRT allocation functions.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 240bdd5772aaf1acac7d420114788509ffd67ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/240bdd5772aaf1acac7d4201147885… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:26:28 2023 +0200 explorer: Use CRT allocation functions. --- programs/explorer/appbar.c | 4 ++-- programs/explorer/desktop.c | 41 ++++++++++++++++++++--------------------- programs/explorer/explorer.c | 15 ++++++--------- programs/explorer/startmenu.c | 12 ++++++------ programs/explorer/systray.c | 12 +++++------- 5 files changed, 39 insertions(+), 45 deletions(-)

1 0

Rémi Bernon : explorer: Use unprefixed debug macros.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 43fd81b3a59fdf72a11a9c89afd89af561f3a56a URL: https://gitlab.winehq.org/wine/wine/-/commit/43fd81b3a59fdf72a11a9c89afd89a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:30:04 2023 +0200 explorer: Use unprefixed debug macros. --- programs/explorer/appbar.c | 35 ++++++++++++++++------------------- programs/explorer/desktop.c | 26 ++++++++++++-------------- programs/explorer/explorer.c | 30 ++++++++++++++---------------- programs/explorer/startmenu.c | 4 ++-- programs/explorer/systray.c | 22 +++++++++++----------- 5 files changed, 55 insertions(+), 62 deletions(-)

1 0

Jacek Caban : ntdll: Inherit ConsoleHandle only by CUI processes.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: dcf0bf1f383f8429136cb761f5170a04503a297b URL: https://gitlab.winehq.org/wine/wine/-/commit/dcf0bf1f383f8429136cb761f5170a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 21 13:43:20 2023 +0200 ntdll: Inherit ConsoleHandle only by CUI processes. --- dlls/kernel32/tests/console.c | 2 +- dlls/ntdll/unix/env.c | 5 +++-- dlls/ntdll/unix/process.c | 3 ++- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 24c1e5c69fd..4e164c11b3d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4951,7 +4951,7 @@ static void test_CreateProcessCUI(void) }, with_console_tests[] = { -/* 0*/ {FALSE, 0, NULL_STD, 0, TRUE}, +/* 0*/ {FALSE, 0, NULL_STD, 0}, {FALSE, DETACHED_PROCESS, NULL_STD, 0}, {FALSE, CREATE_NEW_CONSOLE, NULL_STD, 0}, {FALSE, CREATE_NO_WINDOW, NULL_STD, 0}, diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fd505a7d2c2..8aa41aba183 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2128,7 +2128,7 @@ void init_startup_info(void) * create_startup_info */ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, - DWORD *info_size ) + const pe_image_info_t *pe_info, DWORD *info_size ) { startup_info_t *info; UNICODE_STRING dos_image = *nt_image; @@ -2154,7 +2154,8 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES info->debug_flags = params->DebugFlags; info->console_flags = params->ConsoleFlags; - info->console = wine_server_obj_handle( params->ConsoleHandle ); + if (pe_info->subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + info->console = wine_server_obj_handle( params->ConsoleHandle ); info->hstdin = wine_server_obj_handle( params->hStdInput ); info->hstdout = wine_server_obj_handle( params->hStdOutput ); info->hstderr = wine_server_obj_handle( params->hStdError ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index fa8022d9968..91771705b67 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -802,7 +802,8 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ goto done; } if (!machine) machine = pe_info.machine; - if (!(startup_info = create_startup_info( attr.ObjectName, params, &startup_info_size ))) goto done; + if (!(startup_info = create_startup_info( attr.ObjectName, params, &pe_info, &startup_info_size ))) + goto done; env_size = get_env_size( params, &winedebug ); if ((status = alloc_object_attributes( process_attr, &objattr, &attr_len ))) goto done; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1f49d957e0d..6862d74b863 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,7 +172,7 @@ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern void init_startup_info(void) DECLSPEC_HIDDEN; extern void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCESS_PARAMETERS *params, - DWORD *info_size ) DECLSPEC_HIDDEN; + const pe_image_info_t *pe_info, DWORD *info_size ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern char *get_alternate_wineloader( WORD machine ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN;

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's Initialize.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 5716a20d725c8ce99ccace3b543e60f3b83dc87a URL: https://gitlab.winehq.org/wine/wine/-/commit/5716a20d725c8ce99ccace3b543e60… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 06:03:09 2023 +0200 wineoss: Use mmdevapi's AudioClient's Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 136 +------------------------------------------- 1 file changed, 3 insertions(+), 133 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 728c4c7779e..15e4308e67a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -82,17 +82,11 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; -extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; - extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); -extern WCHAR *get_application_name(void); - -extern void set_stream_volumes(struct audio_client *This); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -406,40 +400,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) return ref; } -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ - case WAVE_FORMAT_PCM: - TRACE("WAVE_FORMAT_PCM"); - break; - case WAVE_FORMAT_IEEE_FLOAT: - TRACE("WAVE_FORMAT_IEEE_FLOAT"); - break; - case WAVE_FORMAT_EXTENSIBLE: - TRACE("WAVE_FORMAT_EXTENSIBLE"); - break; - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - } -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -519,100 +479,10 @@ HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, +extern HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, - const GUID *sessionguid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct create_stream_params params; - stream_handle stream; - unsigned int i, channel_count; - WCHAR *name; - - TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, - wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); - - if(!fmt) - return E_POINTER; - - dump_fmt(fmt); - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; - - if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | - AUDCLNT_STREAMFLAGS_LOOPBACK | - AUDCLNT_STREAMFLAGS_EVENTCALLBACK | - AUDCLNT_STREAMFLAGS_NOPERSIST | - AUDCLNT_STREAMFLAGS_RATEADJUST | - AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | - AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | - AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ - FIXME("Unknown flags: %08lx\n", flags); - return E_INVALIDARG; - } - - sessions_lock(); - - if(This->stream){ - sessions_unlock(); - return AUDCLNT_E_ALREADY_INITIALIZED; - } - - if(FAILED(params.result = main_loop_start())){ - sessions_unlock(); - return params.result; - } - - params.name = name = get_application_name(); - params.device = This->device_name; - params.flow = This->dataflow; - params.share = mode; - params.flags = flags; - params.duration = duration; - params.period = period; - params.fmt = fmt; - params.channel_count = &channel_count; - params.stream = &stream; - - OSS_CALL(create_stream, &params); - - free(name); - - if(FAILED(params.result)){ - sessions_unlock(); - return params.result; - } - - This->vols = malloc(channel_count * sizeof(float)); - if(!This->vols){ - params.result = E_OUTOFMEMORY; - goto exit; - } - for(i = 0; i < channel_count; ++i) - This->vols[i] = 1.f; - - params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); - -exit: - if(FAILED(params.result)){ - stream_release(stream, NULL); - free(This->vols); - This->vols = NULL; - } else { - list_add_tail(&This->session->clients, &This->entry); - This->stream = stream; - This->channel_count = channel_count; - set_stream_volumes(This); - } - - sessions_unlock(); - - return params.result; -} + const GUID *sessionguid); extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *frames); @@ -671,7 +541,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_QueryInterface, AudioClient_AddRef, AudioClient_Release, - AudioClient_Initialize, + client_Initialize, client_GetBufferSize, client_GetStreamLatency, client_GetCurrentPadding,

1 0