wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Detlef Riekenberg : shell32: Add a stub for IApplicationAssociationRegistration.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 2d4d571ffc02112dfc671b6711ce77086758a27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4d571ffc02112dfc671b671… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:15 2012 +0100 shell32: Add a stub for IApplicationAssociationRegistration. --- dlls/shell32/assoc.c | 143 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + 4 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 942e796..d7161ca 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "shlguid.h" #include "shlwapi.h" +#include "shobjidl.h" #include "shell32_main.h" #include "ver.h" #include "wine/unicode.h" @@ -65,6 +66,13 @@ typedef struct HKEY hkeyProgID; } IQueryAssociationsImpl; +typedef struct +{ + IApplicationAssociationRegistration IApplicationAssociationRegistration_iface; + LONG ref; +} IApplicationAssociationRegistrationImpl; + + static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssociations *iface) { return CONTAINING_RECORD(iface, IQueryAssociationsImpl, IQueryAssociations_iface); @@ -711,6 +719,114 @@ static const IQueryAssociationsVtbl IQueryAssociations_vtbl = }; /************************************************************************** + * IApplicationAssociationRegistration implementation + */ +static inline IApplicationAssociationRegistrationImpl *impl_from_IApplicationAssociationRegistration(IApplicationAssociationRegistration *iface) +{ + return CONTAINING_RECORD(iface, IApplicationAssociationRegistrationImpl, IApplicationAssociationRegistration_iface); +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryInterface( + IApplicationAssociationRegistration* iface, REFIID riid, LPVOID *ppv) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + + TRACE("(%p, %s, %p)\n",This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IApplicationAssociationRegistration, riid)) { + *ppv = &This->IApplicationAssociationRegistration_iface; + IUnknown_AddRef((IUnknown*)*ppv); + TRACE("returning IApplicationAssociationRegistration: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationAssociationRegistration_AddRef(IApplicationAssociationRegistration *iface) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI ApplicationAssociationRegistration_Release(IApplicationAssociationRegistration *iface) +{ + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + SHFree(This); + } + return ref; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration* This, LPCWSTR query, + ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPWSTR *association) +{ + FIXME("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefault(IApplicationAssociationRegistration* This, LPCWSTR query, + ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPCWSTR appname, BOOL *is_default) +{ + FIXME("(%p)->(%s, %d, %d, %s, %p)\n", This, debugstr_w(query), type, level, debugstr_w(appname), is_default); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefaultAll(IApplicationAssociationRegistration* This, ASSOCIATIONLEVEL level, + LPCWSTR appname, BOOL *is_default) +{ + FIXME("(%p)->(%d, %s, %p)\n", This, level, debugstr_w(appname), is_default); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_SetAppAsDefault(IApplicationAssociationRegistration* This, LPCWSTR appname, + LPCWSTR set, ASSOCIATIONTYPE set_type) +{ + FIXME("(%p)->(%s, %s, %d)\n", This, debugstr_w(appname), debugstr_w(set), set_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationAssociationRegistration_SetAppAsDefaultAll(IApplicationAssociationRegistration* This, LPCWSTR appname) +{ + FIXME("(%p)->(%s)\n", This, debugstr_w(appname)); + return E_NOTIMPL; +} + + +static HRESULT WINAPI ApplicationAssociationRegistration_ClearUserAssociations(IApplicationAssociationRegistration* This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + + +static const IApplicationAssociationRegistrationVtbl IApplicationAssociationRegistration_vtbl = +{ + ApplicationAssociationRegistration_QueryInterface, + ApplicationAssociationRegistration_AddRef, + ApplicationAssociationRegistration_Release, + ApplicationAssociationRegistration_QueryCurrentDefault, + ApplicationAssociationRegistration_QueryAppIsDefault, + ApplicationAssociationRegistration_QueryAppIsDefaultAll, + ApplicationAssociationRegistration_SetAppAsDefault, + ApplicationAssociationRegistration_SetAppAsDefaultAll, + ApplicationAssociationRegistration_ClearUserAssociations +}; + +/************************************************************************** * IQueryAssociations_Constructor [internal] * * Construct a new IQueryAssociations object. @@ -731,3 +847,30 @@ HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, L TRACE("returning %p\n", *ppOutput); return ret; } + +/************************************************************************** + * ApplicationAssociationRegistration_Constructor [internal] + * + * Construct a IApplicationAssociationRegistration object. + */ +HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationAssociationRegistrationImpl *This; + HRESULT hr; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationAssociationRegistration_iface.lpVtbl = &IApplicationAssociationRegistration_vtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationAssociationRegistration_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + TRACE("returning 0x%x with %p\n", hr, *ppv); + return hr; +} diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index ae3e619..3c96e79 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -61,6 +61,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass QueryAssociations { interface IQueryAssociations; } [ + helpstring("Manage Application associations"), + threading(apartment), + uuid(591209c7-767b-42b2-9fba-44ee4615f2c7) +] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 88a89a7..ece1863 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -107,6 +107,8 @@ HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIcon HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index fbf917d..b3f847c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -63,6 +63,7 @@ static const struct { LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { + {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor},

1 0

Detlef Riekenberg : shell32: Avoid crash on NULL pointer.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 48155b5df04d2c2fc6ced9734ce82ca046b0092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48155b5df04d2c2fc6ced9734… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:14 2012 +0100 shell32: Avoid crash on NULL pointer. --- dlls/shell32/assoc.c | 3 +++ dlls/shell32/tests/assoc.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 0e6b6ba..942e796 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -84,6 +84,9 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj); + if (ppvObj == NULL) + return E_POINTER; + *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 00d04ff..8d09ec2 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -54,6 +54,9 @@ static void test_IQueryAssociations_QueryInterface(void) IUnknown_Release(unk); } + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + IQueryAssociations_Release(qa); }

1 0

Detlef Riekenberg : shell32/tests: Start tests for IQueryAssociations.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 9ee18919a588c822ef00bacccd2591f620dd20e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee18919a588c822ef00baccc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:13 2012 +0100 shell32/tests: Start tests for IQueryAssociations. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/assoc.c | 68 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 61ffc51..4a361e4 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = shell32 ole32 oleaut32 user32 advapi32 C_SRCS = \ appbar.c \ + assoc.c \ autocomplete.c \ brsfolder.c \ ebrowser.c \ diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c new file mode 100644 index 0000000..00d04ff --- /dev/null +++ b/dlls/shell32/tests/assoc.c @@ -0,0 +1,68 @@ +/* Unit test suite for various shell Association objects + * + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "shlwapi.h" +#include "shlguid.h" + +#include "wine/test.h" + + +static void test_IQueryAssociations_QueryInterface(void) +{ + IQueryAssociations *qa; + IQueryAssociations *qa2; + IUnknown *unk; + HRESULT hr; + + /* this works since XP */ + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); + + if (FAILED(hr)) { + win_skip("CoCreateInstance for IQueryAssociations returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(qa2); + } + + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + IQueryAssociations_Release(qa); +} + + +START_TEST(assoc) +{ + CoInitialize(NULL); + + test_IQueryAssociations_QueryInterface(); + + CoUninitialize(); +}

1 0

Detlef Riekenberg : shell32: Use SHFree for memory allocated with SHAlloc.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: fdeaf7c0b4fc5b28d1b76e650faee63848a40d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf7c0b4fc5b28d1b76e650… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 16 00:06:12 2012 +0100 shell32: Use SHFree for memory allocated with SHAlloc. --- dlls/shell32/assoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index ce3434c..0e6b6ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -131,7 +131,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) TRACE("Destroying IQueryAssociations (%p)\n", This); RegCloseKey(This->hkeySource); RegCloseKey(This->hkeyProgID); - HeapFree(GetProcessHeap(), 0, This); + SHFree(This); } return refCount;

1 0

Alexandre Julliard : configure: Disable printf format checking for 64-bit Mingw builds.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: b71f83ba6485fd81f91cfe878c69b446bc3af7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71f83ba6485fd81f91cfe878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 16:31:11 2012 +0100 configure: Disable printf format checking for 64-bit Mingw builds. --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d6293d2..ae531d0 100755 --- a/configure +++ b/configure @@ -12192,6 +12192,34 @@ if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then : fi ;; esac + case $host in + x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +$as_echo_n "checking whether the compiler supports -Wno-format... " >&6; } +if ${ac_cv_cflags__Wno_format+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_format=yes +else + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +$as_echo "$ac_cv_cflags__Wno_format" >&6; } +if test $ac_cv_cflags__Wno_format = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-format" +fi ;; + esac + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 diff --git a/configure.ac b/configure.ac index 8e6d96a..c9f6a63 100644 --- a/configure.ac +++ b/configure.ac @@ -1716,6 +1716,11 @@ then *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; esac + dnl mingw uses Windows 64-bit types, not Unix ones + case $host in + x86_64-*mingw32*|x86_64-*cygwin*) WINE_TRY_CFLAGS([-Wno-format]) ;; + esac + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0

Alexandre Julliard : winedbg: Kill the whole target process on exit in auto mode.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: fbd08d5914336647679783465b0bf2b5ae6e85e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd08d5914336647679783465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:05:20 2012 +0100 winedbg: Kill the whole target process on exit in auto mode. --- programs/winedbg/tgt_active.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 376ee22..8302e8e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -774,7 +774,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) hFile = parser_generate_command_file("echo Modules:", "info share", "echo Threads:", "info threads", - "backtrace", "detach", NULL); + "kill", NULL); } else if (!strcmp(argv[0], "--minidump")) { @@ -839,7 +839,16 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) { - if (pcs == dbg_curr_process) + if (kill) + { + DWORD exit_code = 0; + + if (pcs == dbg_curr_process && dbg_curr_thread->in_exception) + exit_code = dbg_curr_thread->excpt_record.ExceptionCode; + + TerminateProcess(pcs->handle, exit_code); + } + else if (pcs == dbg_curr_process) { /* remove all set breakpoints in debuggee code */ break_set_xpoints(FALSE); @@ -853,10 +862,6 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } } - if (kill) - { - TerminateProcess(pcs->handle, 0); - } else { if (!DebugActiveProcessStop(pcs->pid)) return FALSE;

1 0

Alexandre Julliard : ntdll: Set the thread exit code when a thread is killed inside a wait.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 6d2063f41b5774f15ee399069962e5844357e755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2063f41b5774f15ee399069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:04:39 2012 +0100 ntdll: Set the thread exit code when a thread is killed inside a wait. --- dlls/ntdll/sync.c | 4 +--- server/thread.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3e27d09..f759ce6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -807,7 +807,7 @@ static int wait_reply( void *cookie ) ret = read( ntdll_get_thread_data()->wait_fd[0], &reply, sizeof(reply) ); if (ret == sizeof(reply)) { - if (!reply.cookie) break; /* thread got killed */ + if (!reply.cookie) abort_thread( reply.signaled ); /* thread got killed */ if (wine_server_get_ptr(reply.cookie) == cookie) return reply.signaled; /* we stole another reply, wait for the real one */ signaled = wait_reply( cookie ); @@ -826,8 +826,6 @@ static int wait_reply( void *cookie ) if (errno == EINTR) continue; server_protocol_perror("wakeup read"); } - /* the server closed the connection; time to die... */ - abort_thread(0); } diff --git a/server/thread.c b/server/thread.c index f704473..f9a575e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -986,7 +986,7 @@ void kill_thread( struct thread *thread, int violent_death ) if (thread->wait) { while (thread->wait) end_wait( thread ); - send_thread_wakeup( thread, 0, STATUS_PENDING ); + send_thread_wakeup( thread, 0, thread->exit_code ); /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0; }

1 0

Jörg Höhle : winecoreaudio: GetNextPacketSize returns 0 when no data is available yet.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 89eaa56a2f3e42ed3979722540930ee0c6058abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89eaa56a2f3e42ed397972254… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 22:54:54 2012 +0100 winecoreaudio: GetNextPacketSize returns 0 when no data is available yet. --- dlls/winecoreaudio.drv/mmdevdrv.c | 74 ++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6161e51..07359c0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1930,11 +1930,44 @@ static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) return IAudioClient_Release(&This->IAudioClient_iface); } +static HRESULT AudioCaptureClient_GetNextPacket(ACImpl *This, UINT32 *frames) +{ + OSStatus sc; + for(;;){ + if(!This->public_buffer){ + struct list *head = list_head(&This->avail_buffers); + AQBuffer *buf; + + if(!head){ + *frames = 0; + return S_OK; + } + buf = LIST_ENTRY(head, AQBuffer, entry); + This->public_buffer = buf->buf; + list_remove(&buf->entry); + } + *frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; + if(*frames) + return S_OK; + WARN("empty packet\n"); + /* fixme: for reasons not yet understood, the initially submitted + * packets are returned with 0 bytes. Resubmit them. */ + sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); + if(sc != noErr){ + ERR("Unable to enqueue buffer: %lx\n", sc); + /* Release will free This->public_buffer */ + return AUDCLNT_E_DEVICE_INVALIDATED; + }else + This->public_buffer = NULL; + } +} + static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1949,27 +1982,10 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, return AUDCLNT_E_OUT_OF_ORDER; } - if(This->public_buffer){ - *frames = - This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; - }else{ - struct list *head = list_head(&This->avail_buffers); - if(!head){ - *frames = 0; - }else{ - AQBuffer *buf = LIST_ENTRY(head, AQBuffer, entry); - This->public_buffer = buf->buf; - *frames = - This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; - list_remove(&buf->entry); - if(!*frames){ - OSStatus sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); - if(sc != noErr) - ERR("Unable to enqueue buffer: %lx\n", sc); - This->public_buffer = NULL; - WARN("empty packet\n"); - } - } + hr = AudioCaptureClient_GetNextPacket(This, frames); + if(FAILED(hr)){ + OSSpinLockUnlock(&This->lock); + return hr; } if((This->getbuf_last = *frames)){ @@ -2036,8 +2052,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct list *head; - AQBuffer *buf; + HRESULT hr; TRACE("(%p)->(%p)\n", This, frames); @@ -2046,20 +2061,11 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( OSSpinLockLock(&This->lock); - head = list_head(&This->avail_buffers); - - if(!head){ - *frames = This->bufsize_frames / CAPTURE_BUFFERS; - OSSpinLockUnlock(&This->lock); - return S_OK; - } - - buf = LIST_ENTRY(head, AQBuffer, entry); - *frames = buf->buf->mAudioDataByteSize / This->fmt->nBlockAlign; + hr = AudioCaptureClient_GetNextPacket(This, frames); OSSpinLockUnlock(&This->lock); - return S_OK; + return hr; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Jörg Höhle : winealsa: Fix AudioCaptureClient Get /ReleaseBuffer protocol.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 18024afd9702b28d3195c5ff39056a2c98ac8c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18024afd9702b28d3195c5ff3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 8 16:35:43 2012 +0100 winealsa: Fix AudioCaptureClient Get/ReleaseBuffer protocol. --- dlls/winealsa.drv/mmdevdrv.c | 63 +++++++++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0cb7b9b..bcbe06c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -115,7 +115,6 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; - int buf_state; long getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -126,12 +125,6 @@ struct ACImpl { struct list entry; }; -enum BufferStates { - NOT_LOCKED = 0, - LOCKED_NORMAL, /* public buffer piece is from local_buffer */ - LOCKED_WRAPPED /* public buffer piece is wrapped around, in tmp_buffer */ -}; - typedef struct _SessionMgr { IAudioSessionManager2 IAudioSessionManager2_iface; @@ -1757,7 +1750,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED || This->getbuf_last){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -2127,7 +2120,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -2137,18 +2129,18 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioCaptureClient_GetNextPacketSize(iface, frames); - if(FAILED(hr)){ + /* hr = GetNextPacketSize(iface, frames); */ + if(This->held_frames < This->mmdev_period_frames){ + *frames = 0; LeaveCriticalSection(&This->lock); - return hr; + return AUDCLNT_S_BUFFER_EMPTY; } - - *flags = 0; + *frames = This->mmdev_period_frames; if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; @@ -2175,10 +2167,17 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = *frames; + *flags = 0; - if(devpos || qpcpos) - IAudioClock_GetPosition(&This->IAudioClock_iface, devpos, qpcpos); + if(devpos) + *devpos = This->written_frames; + if(qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } LeaveCriticalSection(&This->lock); @@ -2194,16 +2193,27 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED){ + if(!done){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(This->getbuf_last != done){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + This->written_frames += done; This->held_frames -= done; This->lcl_offs_frames += done; This->lcl_offs_frames %= This->bufsize_frames; - - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -2217,7 +2227,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( TRACE("(%p)->(%p)\n", This, frames); - return AudioClient_GetCurrentPadding(&This->IAudioClient_iface, frames); + if(!frames) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + *frames = This->held_frames < This->mmdev_period_frames ? 0 : This->mmdev_period_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Frédéric Delanoy : wineconsole: Don' t include spaces before colons in English strings.
by Alexandre Julliard 16 Jan '12

16 Jan '12

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
98
Older →

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 January 2012