May 2012 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Resolve the target path for the ODBC driver file if necessary.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 32c7a52f5ce2ea45e90d989cbbe34ad938c8bd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c7a52f5ce2ea45e90d989cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:02 2012 +0200 msi: Resolve the target path for the ODBC driver file if necessary. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aa2cfca..c1d3b49 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6082,6 +6082,11 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) ptr += lstrlenW(ptr) + 1; *ptr = '\0'; + if (!driver_file->TargetPath) + { + const WCHAR *dir = msi_get_target_folder( package, driver_file->Component->Directory ); + driver_file->TargetPath = msi_build_directory_name( 2, dir, driver_file->FileName ); + } driver_path = strdupW(driver_file->TargetPath); ptr = strrchrW(driver_path, '\\'); if (ptr) *ptr = '\0';

1 0

Hans Leidekker : advapi32: Return a fake handle from EventRegister.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: cb436f712235288487ba9a8e6137bd0b35b07666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb436f712235288487ba9a8e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:19 2012 +0200 advapi32: Return a fake handle from EventRegister. --- dlls/advapi32/eventlog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8ec5cd2..f631228 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -834,7 +834,9 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) { FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); - return ERROR_CALL_NOT_IMPLEMENTED; + + *handle = 0xdeadbeef; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Hans Leidekker : advapi32: Add stub implementations of EventUnregister and EventWrite.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 593bd1a5d912eec8bcd63c7100227c36ab29dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=593bd1a5d912eec8bcd63c710… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:40 2012 +0200 advapi32: Add stub implementations of EventUnregister and EventWrite. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 19 +++++++++++++++++++ include/evntprov.h | 8 ++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 87a92dc..638cba1 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,8 +273,8 @@ @ stdcall EventEnabled(int64 ptr) # @ stub EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) -# @ stub EventUnregister -# @ stub EventWrite +@ stdcall EventUnregister(int64) +@ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario # @ stub EventWriteEx # @ stub EventWriteStartScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f631228..8f40c29 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -840,6 +840,15 @@ ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID co } /****************************************************************************** + * EventUnregister [ADVAPI32.@] + */ +ULONG WINAPI EventUnregister( REGHANDLE handle ) +{ + FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ @@ -850,6 +859,16 @@ BOOLEAN WINAPI EventEnabled( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor ) } /****************************************************************************** + * EventWrite [ADVAPI32.@] + */ +ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, + PEVENT_DATA_DESCRIPTOR data ) +{ + FIXME("%s, %p, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor, count, data); + return ERROR_SUCCESS; +} + +/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/include/evntprov.h b/include/evntprov.h index 34262fe..f242394 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -28,6 +28,13 @@ extern "C" { typedef ULONGLONG REGHANDLE, *PREGHANDLE; +typedef struct _EVENT_DATA_DESCRIPTOR +{ + ULONGLONG Ptr; + ULONG Size; + ULONG Reserved; +} EVENT_DATA_DESCRIPTOR, *PEVENT_DATA_DESCRIPTOR; + typedef struct _EVENT_DESCRIPTOR { USHORT Id; @@ -55,6 +62,7 @@ typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PE BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventUnregister(REGHANDLE); +ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus }

1 0

Nikolay Sivov : msxml3: Protect content callbacks from being called on reset content handler pointer .
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 2dc6711f6d25fc33c088802cbec94e58419a1c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc6711f6d25fc33c088802cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 15:50:19 2012 +0400 msxml3: Protect content callbacks from being called on reset content handler pointer. --- dlls/msxml3/saxreader.c | 98 ++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 090f70c..0d46c4f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -313,7 +313,7 @@ static BOOL is_namespaces_enabled(const saxreader *reader) return (reader->version < MSXML4) || (reader->features & Namespaces); } -static inline BOOL has_content_handler(const saxlocator *locator) +static inline int has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || (!locator->vbInterface && locator->saxreader->contentHandler); @@ -1288,6 +1288,7 @@ static void libxmlStartElementNS( saxlocator *This = ctx; element_entry *element; HRESULT hr = S_OK; + BSTR uri; update_position(This, TRUE); if(*(This->pParserCtxt->input->cur) == '/') @@ -1298,63 +1299,57 @@ static void libxmlStartElementNS( element = alloc_element_entry(localname, prefix, nb_namespaces, namespaces); push_element_ns(This, element); - if (has_content_handler(This)) + if (is_namespaces_enabled(This->saxreader)) { - BSTR uri; + int i; - if (is_namespaces_enabled(This->saxreader)) + for (i = 0; i < nb_namespaces && has_content_handler(This); i++) { - int i; + if (This->vbInterface) + hr = IVBSAXContentHandler_startPrefixMapping( + This->saxreader->vbcontentHandler, + &element->ns[i].prefix, + &element->ns[i].uri); + else + hr = ISAXContentHandler_startPrefixMapping( + This->saxreader->contentHandler, + element->ns[i].prefix, + SysStringLen(element->ns[i].prefix), + element->ns[i].uri, + SysStringLen(element->ns[i].uri)); - for (i = 0; i < nb_namespaces; i++) + if (sax_callback_failed(This, hr)) { - if (This->vbInterface) - hr = IVBSAXContentHandler_startPrefixMapping( - This->saxreader->vbcontentHandler, - &element->ns[i].prefix, - &element->ns[i].uri); - else - hr = ISAXContentHandler_startPrefixMapping( - This->saxreader->contentHandler, - element->ns[i].prefix, - SysStringLen(element->ns[i].prefix), - element->ns[i].uri, - SysStringLen(element->ns[i].uri)); - - if (sax_callback_failed(This, hr)) - { - format_error_message_from_id(This, hr); - return; - } + format_error_message_from_id(This, hr); + return; } } + } - uri = find_element_uri(This, URI); + uri = find_element_uri(This, URI); + hr = SAXAttributes_populate(This, nb_namespaces, namespaces, nb_attributes, attributes); + if (hr == S_OK && has_content_handler(This)) + { + BSTR local; - hr = SAXAttributes_populate(This, nb_namespaces, namespaces, nb_attributes, attributes); - if (hr == S_OK) - { - BSTR local; + if (is_namespaces_enabled(This->saxreader)) + local = element->local; + else + uri = local = NULL; - if (is_namespaces_enabled(This->saxreader)) - local = element->local; - else - uri = local = NULL; + if (This->vbInterface) + hr = IVBSAXContentHandler_startElement(This->saxreader->vbcontentHandler, + &uri, &local, &element->qname, &This->IVBSAXAttributes_iface); + else + hr = ISAXContentHandler_startElement(This->saxreader->contentHandler, + uri, SysStringLen(uri), + local, SysStringLen(local), + element->qname, SysStringLen(element->qname), + &This->ISAXAttributes_iface); - if (This->vbInterface) - hr = IVBSAXContentHandler_startElement(This->saxreader->vbcontentHandler, - &uri, &local, &element->qname, &This->IVBSAXAttributes_iface); - else - hr = ISAXContentHandler_startElement(This->saxreader->contentHandler, - uri, SysStringLen(uri), - local, SysStringLen(local), - element->qname, SysStringLen(element->qname), - &This->ISAXAttributes_iface); - } + if (sax_callback_failed(This, hr)) + format_error_message_from_id(This, hr); } - - if (sax_callback_failed(This, hr)) - format_error_message_from_id(This, hr); } static void libxmlEndElementNS( @@ -1435,7 +1430,7 @@ static void libxmlEndElementNS( if (is_namespaces_enabled(This->saxreader)) { int i = -1; - while (iterate_endprefix_index(This, element, &i)) + while (iterate_endprefix_index(This, element, &i) && has_content_handler(This)) { if (This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( @@ -1447,10 +1442,10 @@ static void libxmlEndElementNS( if (sax_callback_failed(This, hr)) break; } - } - if (sax_callback_failed(This, hr)) - format_error_message_from_id(This, hr); + if (sax_callback_failed(This, hr)) + format_error_message_from_id(This, hr); + } free_element_entry(element); } @@ -1587,6 +1582,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) This->line--; p--; } + This->column = 0; for(; p>=This->pParserCtxt->input->base && *p!='\n' && *p!='\r'; p--) This->column++;

1 0

Nikolay Sivov : msxml3: Add a helper to check that lexical handler is set.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: fc4dab4c3ba8007f1ab6e1e2e986a8d95c633e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4dab4c3ba8007f1ab6e1e2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 15:56:20 2012 +0400 msxml3: Add a helper to check that lexical handler is set. --- dlls/msxml3/saxreader.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0d46c4f..b3b6fc4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -319,7 +319,13 @@ static inline int has_content_handler(const saxlocator *locator) (!locator->vbInterface && locator->saxreader->contentHandler); } -static inline BOOL has_error_handler(const saxlocator *locator) +static inline int has_lexical_handler(const saxlocator *locator) +{ + return (locator->vbInterface && locator->saxreader->vblexicalHandler) || + (!locator->vbInterface && locator->saxreader->lexicalHandler); +} + +static inline int has_error_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vberrorHandler) || (!locator->vbInterface && locator->saxreader->errorHandler); @@ -1587,8 +1593,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) for(; p>=This->pParserCtxt->input->base && *p!='\n' && *p!='\r'; p--) This->column++; - if(!This->vbInterface && !This->saxreader->lexicalHandler) return; - if(This->vbInterface && !This->saxreader->vblexicalHandler) return; + if (!has_lexical_handler(This)) return; bValue = pooled_bstr_from_xmlChar(&This->saxreader->pool, value); @@ -1678,10 +1683,13 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) for(; beg>=This->pParserCtxt->input->base && *beg!='\n' && *beg!='\r'; beg--) This->column++; - if(This->vbInterface && This->saxreader->vblexicalHandler) - hr = IVBSAXLexicalHandler_startCDATA(This->saxreader->vblexicalHandler); - if(!This->vbInterface && This->saxreader->lexicalHandler) - hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); + if (has_lexical_handler(This)) + { + if (This->vbInterface) + hr = IVBSAXLexicalHandler_startCDATA(This->saxreader->vblexicalHandler); + else + hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); + } if(FAILED(hr)) { @@ -1731,10 +1739,13 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) cur = end; } - if(This->vbInterface && This->saxreader->vblexicalHandler) - hr = IVBSAXLexicalHandler_endCDATA(This->saxreader->vblexicalHandler); - if(!This->vbInterface && This->saxreader->lexicalHandler) - hr = ISAXLexicalHandler_endCDATA(This->saxreader->lexicalHandler); + if (has_lexical_handler(This)) + { + if (This->vbInterface) + hr = IVBSAXLexicalHandler_endCDATA(This->saxreader->vblexicalHandler); + else + hr = ISAXLexicalHandler_endCDATA(This->saxreader->lexicalHandler); + } if(FAILED(hr)) format_error_message_from_id(This, hr);

1 0

Vincent Povirk : msvcm90: Add new dll based on msvcm80.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 94f0da9c9b38ef95f6e7475d98bc065d633966c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f0da9c9b38ef95f6e7475d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 7 10:31:31 2012 -0500 msvcm90: Add new dll based on msvcm80. --- configure | 1 + configure.ac | 1 + dlls/msvcm90/Makefile.in | 6 ++ dlls/msvcm90/msvcm90.spec | 181 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcm90/msvcm90_main.c | 45 +++++++++++ 5 files changed, 234 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94f0da9c9b38ef95f6e74…

1 0

Dmitry Timoshkov : gdi32: Add a test for ntmCellHeight calculation.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: ab7fe6086e33142eaa04b3c185e9c29b55ca3f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7fe6086e33142eaa04b3c18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 19:29:02 2012 +0900 gdi32: Add a test for ntmCellHeight calculation. --- dlls/gdi32/tests/font.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1708c49..f50d1bc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2842,7 +2842,7 @@ out: return r; } -static void test_text_metrics(const LOGFONTA *lf) +static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) { HDC hdc; HFONT hfont, hfont_old; @@ -2851,6 +2851,7 @@ static void test_text_metrics(const LOGFONTA *lf) LONG size, ret; const char *font_name = lf->lfFaceName; DWORD cmap_first = 0, cmap_last = 0; + UINT ascent, descent, cell_height; cmap_type cmap_type; BOOL sys_lang_non_english; @@ -2879,6 +2880,12 @@ static void test_text_metrics(const LOGFONTA *lf) ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); ok(ret == size, "GetFontData should return %u not %u\n", size, ret); + ascent = GET_BE_WORD(tt_os2.usWinAscent); + descent = GET_BE_WORD(tt_os2.usWinDescent); + cell_height = ascent + descent; + ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", + font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); @@ -3067,7 +3074,7 @@ static INT CALLBACK enum_truetype_font_proc(const LOGFONT *lf, const TEXTMETRIC if (type == TRUETYPE_FONTTYPE) { (*enumed)++; - test_text_metrics(lf); + test_text_metrics(lf, (const NEWTEXTMETRIC *)ntm); } return 1; }

1 0

Alexandre Julliard : urlmon/tests: Allow some more optional progress notifications.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 0789ec11449db52b6424e3959b7431f7f6524a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0789ec11449db52b6424e3959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 09:01:36 2012 +0200 urlmon/tests: Allow some more optional progress notifications. --- dlls/urlmon/tests/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a39b8ed..ce383ee 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -594,6 +594,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) SET_EXPECT(OnResponse); if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); + SET_EXPECT(ReportProgress_ENCODING); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -627,6 +628,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_ACCEPTRANGES); else if(test_redirect || test_abort) CLEAR_CALLED(ReportProgress_ACCEPTRANGES); + CLEAR_CALLED(ReportProgress_ENCODING); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -751,7 +753,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: - CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + CHECK_EXPECT2(ReportProgress_MIMETYPEAVAILABLE); if(tested_protocol != FILE_TEST && tested_protocol != ITS_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) { if(!short_read || !direct_read) CHECK_CALLED(Read); /* set in Continue */ @@ -831,7 +833,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_COOKIE_SENT: - CHECK_EXPECT(ReportProgress_COOKIE_SENT); + CHECK_EXPECT2(ReportProgress_COOKIE_SENT); ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_REDIRECTING:

1 0

Alexander E. Patrakov : dsound: Added a windowed-sinc resampler.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 275dfb83f2371a476b615b260465afb3cdf67f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275dfb83f2371a476b615b260… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Mon May 7 00:06:13 2012 +0600 dsound: Added a windowed-sinc resampler. --- dlls/dsound/dsound_private.h | 3 +- dlls/dsound/fir.h | 1587 ++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/mixer.c | 122 +++- tools/make_fir | 158 +++++ 4 files changed, 1852 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=275dfb83f2371a476b615…

1 0

Andrew Eikum : winmm: Close open wave devices upon process detach.
by Alexandre Julliard 08 May '12

08 May '12

Module: wine Branch: master Commit: 31291cdc6ccc4c172ccf86f383c6a90f31a50ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31291cdc6ccc4c172ccf86f38… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 7 09:58:04 2012 -0500 winmm: Close open wave devices upon process detach. --- dlls/winmm/waveform.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d4dc9aa..a985ee8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -183,6 +183,26 @@ static LRESULT WID_Close(HWAVEIN hwave); void WINMM_DeleteWaveform(void) { + UINT i, j; + + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_out_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->open) + SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)device->handle, 0); + } + } + + for(i = 0; i < g_inmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_in_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->open) + SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)device->handle, 0); + } + } + /* FIXME: Free g_(in,out)_mmdevices? */ DeleteCriticalSection(&g_devthread_lock); }

1 0