August 2020 - Wine-commits - list.winehq.org

Gijs Vermeulen : wbemprox: Accept 0 and WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN as flags in IWbemClassObject::GetNames().
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 06e455c247c4e7ba56cbdcd636e165418490b299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e455c247c4e7ba56cbdcd6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Aug 10 12:09:10 2020 +0200 wbemprox: Accept 0 and WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN as flags in IWbemClassObject::GetNames(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34770 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 12 ++++++++++-- dlls/wbemprox/tests/query.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index db6017e0c9..1a00cfc40a 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -484,13 +484,21 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (lFlags != WBEM_FLAG_ALWAYS && + if (!pNames) + return WBEM_E_INVALID_PARAMETER; + + /* Combination used in a handful of broken apps */ + if (lFlags == (WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN)) + lFlags = WBEM_FLAG_ALWAYS; + + if (lFlags && (lFlags != WBEM_FLAG_ALWAYS && lFlags != WBEM_FLAG_NONSYSTEM_ONLY && - lFlags != WBEM_FLAG_SYSTEM_ONLY) + lFlags != WBEM_FLAG_SYSTEM_ONLY)) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } + if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a50002e1ba..d6c918c08d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1015,6 +1015,21 @@ static void test_GetNames( IWbemServices *services ) IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (!count) break; + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Alex Henrie : urlmon: Fix null pointer dereference in process_hook_section (Coverity).
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 0385811219a6dc7ab9726255f760ebea37e8286d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0385811219a6dc7ab9726255… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Aug 8 09:36:41 2020 -0600 urlmon: Fix null pointer dereference in process_hook_section (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9d6f9a0f15..3f10902ddd 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -202,7 +202,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) cmd = heap_alloc(size*sizeof(WCHAR)); if(!cmd) - heap_free(cmd); + return E_OUTOFMEMORY; expand_command(ctx, val, cmd, &size); hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL);

1 0

Jacek Caban : include: Introduce wincontypes.h.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 49449a9e9a01e9748d308cdf0abc6685cc261604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49449a9e9a01e9748d308cdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:23 2020 +0200 include: Introduce wincontypes.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wincon.h | 112 +----------------------------------------- include/wincontypes.h | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 110 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 4b18aa2100..58e407cd7d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -726,6 +726,7 @@ SOURCES = \ wincodec.idl \ wincodecsdk.idl \ wincon.h \ + wincontypes.h \ wincred.h \ wincrypt.h \ windef.h \ diff --git a/include/wincon.h b/include/wincon.h index b044ec7e19..89afdcd516 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -27,6 +27,8 @@ extern "C" { #include <wingdi.h> #endif +#include <wincontypes.h> + /* AttachConsole special pid value */ #define ATTACH_PARENT_PROCESS ((DWORD) -1) @@ -95,26 +97,6 @@ typedef struct _CONSOLE_CURSOR_INFO { BOOL bVisible; /* Visibility of cursor */ } CONSOLE_CURSOR_INFO, *LPCONSOLE_CURSOR_INFO; -typedef struct tagCOORD -{ - SHORT X; - SHORT Y; -} COORD, *LPCOORD; - -typedef struct tagSMALL_RECT -{ - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; -} SMALL_RECT,*LPSMALL_RECT; - -typedef struct _CONSOLE_FONT_INFO -{ - DWORD nFont; - COORD dwFontSize; -} CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; - #ifndef NOGDI typedef struct _CONSOLE_FONT_INFOEX { @@ -175,96 +157,6 @@ typedef struct _CONSOLE_SELECTION_INFO SMALL_RECT srSelection; } CONSOLE_SELECTION_INFO,*LPCONSOLE_SELECTION_INFO; -typedef struct tagCHAR_INFO -{ - union - { - WCHAR UnicodeChar; - CHAR AsciiChar; - } Char; - WORD Attributes; -} CHAR_INFO,*LPCHAR_INFO; - -typedef struct tagKEY_EVENT_RECORD -{ - BOOL bKeyDown; /* 04 */ - WORD wRepeatCount; /* 08 */ - WORD wVirtualKeyCode; /* 0A */ - WORD wVirtualScanCode; /* 0C */ - union /* 0E */ - { - WCHAR UnicodeChar; /* 0E */ - CHAR AsciiChar; /* 0E */ - } uChar; - DWORD dwControlKeyState; /* 10 */ -} KEY_EVENT_RECORD,*LPKEY_EVENT_RECORD; - -/* dwControlKeyState bitmask */ -#define RIGHT_ALT_PRESSED 0x0001 -#define LEFT_ALT_PRESSED 0x0002 -#define RIGHT_CTRL_PRESSED 0x0004 -#define LEFT_CTRL_PRESSED 0x0008 -#define SHIFT_PRESSED 0x0010 -#define NUMLOCK_ON 0x0020 -#define SCROLLLOCK_ON 0x0040 -#define CAPSLOCK_ON 0x0080 -#define ENHANCED_KEY 0x0100 - -typedef struct tagMOUSE_EVENT_RECORD -{ - COORD dwMousePosition; - DWORD dwButtonState; - DWORD dwControlKeyState; - DWORD dwEventFlags; -} MOUSE_EVENT_RECORD,*LPMOUSE_EVENT_RECORD; - -/* MOUSE_EVENT_RECORD.dwButtonState */ -#define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 -#define RIGHTMOST_BUTTON_PRESSED 0x0002 -#define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 -#define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 -#define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 - -/* MOUSE_EVENT_RECORD.dwEventFlags */ -#define MOUSE_MOVED 0x0001 -#define DOUBLE_CLICK 0x0002 -#define MOUSE_WHEELED 0x0004 -#define MOUSE_HWHEELED 0x0008 - -typedef struct tagWINDOW_BUFFER_SIZE_RECORD -{ - COORD dwSize; -} WINDOW_BUFFER_SIZE_RECORD,*LPWINDOW_BUFFER_SIZE_RECORD; - -typedef struct tagMENU_EVENT_RECORD -{ - UINT dwCommandId; /* perhaps UINT16 ??? */ -} MENU_EVENT_RECORD,*LPMENU_EVENT_RECORD; - -typedef struct tagFOCUS_EVENT_RECORD -{ - BOOL bSetFocus; /* perhaps BOOL16 ??? */ -} FOCUS_EVENT_RECORD,*LPFOCUS_EVENT_RECORD; - -typedef struct tagINPUT_RECORD -{ - WORD EventType; /* 00 */ - union - { - KEY_EVENT_RECORD KeyEvent; - MOUSE_EVENT_RECORD MouseEvent; - WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent; - MENU_EVENT_RECORD MenuEvent; - FOCUS_EVENT_RECORD FocusEvent; - } Event; -} INPUT_RECORD,*PINPUT_RECORD; - -/* INPUT_RECORD.wEventType */ -#define KEY_EVENT 0x01 -#define MOUSE_EVENT 0x02 -#define WINDOW_BUFFER_SIZE_EVENT 0x04 -#define MENU_EVENT 0x08 -#define FOCUS_EVENT 0x10 #define CONSOLE_TEXTMODE_BUFFER 1 diff --git a/include/wincontypes.h b/include/wincontypes.h new file mode 100644 index 0000000000..e416c448a3 --- /dev/null +++ b/include/wincontypes.h @@ -0,0 +1,133 @@ +/* + * Copyright (C) the Wine project + * + * 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 + */ + +#ifndef _WINCONTYPES_ +#define _WINCONTYPES_ + +typedef struct tagCOORD +{ + SHORT X; + SHORT Y; +} COORD, *LPCOORD; + +typedef struct tagSMALL_RECT +{ + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; +} SMALL_RECT,*LPSMALL_RECT; + +typedef struct tagKEY_EVENT_RECORD +{ + BOOL bKeyDown; /* 04 */ + WORD wRepeatCount; /* 08 */ + WORD wVirtualKeyCode; /* 0A */ + WORD wVirtualScanCode; /* 0C */ + union /* 0E */ + { + WCHAR UnicodeChar; /* 0E */ + CHAR AsciiChar; /* 0E */ + } uChar; + DWORD dwControlKeyState; /* 10 */ +} KEY_EVENT_RECORD,*LPKEY_EVENT_RECORD; + +/* dwControlKeyState bitmask */ +#define RIGHT_ALT_PRESSED 0x0001 +#define LEFT_ALT_PRESSED 0x0002 +#define RIGHT_CTRL_PRESSED 0x0004 +#define LEFT_CTRL_PRESSED 0x0008 +#define SHIFT_PRESSED 0x0010 +#define NUMLOCK_ON 0x0020 +#define SCROLLLOCK_ON 0x0040 +#define CAPSLOCK_ON 0x0080 +#define ENHANCED_KEY 0x0100 + +typedef struct tagMOUSE_EVENT_RECORD +{ + COORD dwMousePosition; + DWORD dwButtonState; + DWORD dwControlKeyState; + DWORD dwEventFlags; +} MOUSE_EVENT_RECORD,*LPMOUSE_EVENT_RECORD; + +/* MOUSE_EVENT_RECORD.dwButtonState */ +#define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 +#define RIGHTMOST_BUTTON_PRESSED 0x0002 +#define FROM_LEFT_2ND_BUTTON_PRESSED 0x0004 +#define FROM_LEFT_3RD_BUTTON_PRESSED 0x0008 +#define FROM_LEFT_4TH_BUTTON_PRESSED 0x0010 + +/* MOUSE_EVENT_RECORD.dwEventFlags */ +#define MOUSE_MOVED 0x0001 +#define DOUBLE_CLICK 0x0002 +#define MOUSE_WHEELED 0x0004 +#define MOUSE_HWHEELED 0x0008 + +typedef struct tagWINDOW_BUFFER_SIZE_RECORD +{ + COORD dwSize; +} WINDOW_BUFFER_SIZE_RECORD,*LPWINDOW_BUFFER_SIZE_RECORD; + +typedef struct tagMENU_EVENT_RECORD +{ + UINT dwCommandId; +} MENU_EVENT_RECORD,*LPMENU_EVENT_RECORD; + +typedef struct tagFOCUS_EVENT_RECORD +{ + BOOL bSetFocus; +} FOCUS_EVENT_RECORD,*LPFOCUS_EVENT_RECORD; + +typedef struct tagINPUT_RECORD +{ + WORD EventType; + union + { + KEY_EVENT_RECORD KeyEvent; + MOUSE_EVENT_RECORD MouseEvent; + WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent; + MENU_EVENT_RECORD MenuEvent; + FOCUS_EVENT_RECORD FocusEvent; + } Event; +} INPUT_RECORD,*PINPUT_RECORD; + +/* INPUT_RECORD.wEventType */ +#define KEY_EVENT 0x01 +#define MOUSE_EVENT 0x02 +#define WINDOW_BUFFER_SIZE_EVENT 0x04 +#define MENU_EVENT 0x08 +#define FOCUS_EVENT 0x10 + +typedef struct tagCHAR_INFO +{ + union + { + WCHAR UnicodeChar; + CHAR AsciiChar; + } Char; + WORD Attributes; +} CHAR_INFO,*LPCHAR_INFO; + +typedef struct _CONSOLE_FONT_INFO +{ + DWORD nFont; + COORD dwFontSize; +} CONSOLE_FONT_INFO,*LPCONSOLE_FONT_INFO; + +#endif /* _WINCONTYPES_ */

1 0

Jacek Caban : include: Introduce consoleapi.h.
by Alexandre Julliard 10 Aug '20

10 Aug '20

Module: wine Branch: master Commit: 3b35b468b765e19407a9434ad635d3067de7d0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b35b468b765e19407a9434a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 16:05:36 2020 +0200 include: Introduce consoleapi.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/consoleapi.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/wincon.h | 54 +-------------------------------- 3 files changed, 87 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b35b468b765e19407a9…

1 0

Alistair Leslie-Hughes : xactengine3_7: Trace FAudio version being used.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 07f4a7aca878e5afc0b6f0bd53b4d365f0596b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f4a7aca878e5afc0b6f0bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:49 2020 +1000 xactengine3_7: Trace FAudio version being used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index cb8aed5f3a..9f1d905b5e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1277,6 +1277,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); + +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif + break; } return TRUE;

1 0

Alistair Leslie-Hughes : xactengine3_7: Don't cast interface pointers.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 36366de5645eb06b05c7d870a4469fb67a5b778e URL: https://source.winehq.org/git/wine.git/?a=commit;h=36366de5645eb06b05c7d870… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:50 2020 +1000 xactengine3_7: Don't cast interface pointers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 9f1d905b5e..bd14fc1de7 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; TRACE("Created Wave: %p\n", wave); @@ -589,7 +589,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; } return hr; @@ -844,7 +844,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, sb->IXACT3SoundBank_iface.lpVtbl = &XACT3SoundBank_Vtbl; sb->fact_soundbank = fsb; - *ppSoundBank = (IXACT3SoundBank*)sb; + *ppSoundBank = &sb->IXACT3SoundBank_iface; TRACE("Created SoundBank: %p\n", sb); @@ -881,7 +881,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created in-memory WaveBank: %p\n", wb); @@ -929,7 +929,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created streaming WaveBank: %p\n", wb);

1 0

Alistair Leslie-Hughes : xactengine3_7: Correct callback to windows function.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 9c181981d27ba9eea8afac039f5517fa05f05601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c181981d27ba9eea8afac03… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:51 2020 +1000 xactengine3_7: Correct callback to windows function. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index bd14fc1de7..0ac0d914b3 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -634,6 +634,7 @@ typedef struct _XACT3EngineImpl { XACT_READFILE_CALLBACK pReadFile; XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; } XACT3EngineImpl; typedef struct wrap_readfile_struct { @@ -745,6 +746,25 @@ static HRESULT WINAPI IXACT3EngineImpl_GetFinalMixFormat(IXACT3Engine *iface, (FAudioWaveFormatExtensible*) pFinalMixFormat); } +static void FACTCALL fact_notification_cb(const FACTNotification *notification) +{ + XACT3EngineImpl *engine = (XACT3EngineImpl *)notification->pvContext; + + /* Older versions of FAudio don't pass through the context */ + if (!engine) + { + WARN("Notification context is NULL\n"); + return; + } + + if (notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + { + FIXME("Callback XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED\n"); + } + else + FIXME("Unsupported callback type %d\n", notification->type); +} + static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, const XACT_RUNTIME_PARAMETERS *pParams) { @@ -788,6 +808,9 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, GetOverlappedResult; params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; + params.fnNotificationCallback = fact_notification_cb; + + This->notification_callback = (XACT_NOTIFICATION_CALLBACK)pParams->fnNotificationCallback; ret = FACTAudioEngine_Initialize(This->fact_engine, &params); if (ret != 0) @@ -1062,6 +1085,7 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc); } @@ -1074,6 +1098,7 @@ static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *ifac TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc); }

1 0

Nikolay Sivov : combase: Move CoRevertToSelf().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 8d6d5a56b8642f6f6171050baba91c1476baa72f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6d5a56b8642f6f6171050b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:43 2020 +0300 combase: Move CoRevertToSelf(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 20 ++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 33 --------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index e63cce00dd..7f1d6a6320 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -567,3 +567,23 @@ HRESULT WINAPI CoImpersonateClient(void) return hr; } + +/*********************************************************************** + * CoRevertToSelf (combase.@) + */ +HRESULT WINAPI CoRevertToSelf(void) +{ + IServerSecurity *server_security; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&server_security); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_RevertToSelf(server_security); + IServerSecurity_Release(server_security); + } + + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3122588d7e..83a3d32aa6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -149,7 +149,7 @@ @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer -@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 507cc451e2..06dd4aefc7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4250,39 +4250,6 @@ HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) return S_OK; } -/*********************************************************************** - * CoRevertToSelf [OLE32.@] - * - * Ends the impersonation of the client of the currently executing server - * call in the current thread. - * - * PARAMS - * None. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoImpersonateClient, CoQueryClientBlanket, CoGetCallContext. - */ -HRESULT WINAPI CoRevertToSelf(void) -{ - IServerSecurity *pSrvSec; - HRESULT hr; - - TRACE("\n"); - - hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); - if (SUCCEEDED(hr)) - { - hr = IServerSecurity_RevertToSelf(pSrvSec); - IServerSecurity_Release(pSrvSec); - } - - return hr; -} - static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 049dd0ad61..e23c57b404 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -75,7 +75,7 @@ @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() -@ stdcall CoRevertToSelf() +@ stdcall CoRevertToSelf() combase.CoRevertToSelf @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy

1 0

Nikolay Sivov : combase: Add CoCreateErrorInfo() as an alias for CreateErrorInfo().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 7955d3d33ed05e601587028ecdc97249438160bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7955d3d33ed05e601587028e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:44 2020 +0300 combase: Add CoCreateErrorInfo() as an alias for CreateErrorInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 83a3d32aa6..e67e7159bd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -76,7 +76,7 @@ @ stub CoAllowUnmarshalerCLSID @ stub CoCancelCall @ stdcall CoCopyProxy(ptr ptr) -@ stub CoCreateErrorInfo +@ stdcall CoCreateErrorInfo(ptr) CreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance

1 0

Nikolay Sivov : combase: Move CoGetObjectContext().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: b8f21f7607c8d29d13cecc0f9a5f2dee280b507f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f21f7607c8d29d13cecc0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:45 2020 +0300 combase: Move CoGetObjectContext(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 20 ++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 28 ---------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7f1d6a6320..752658012c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -20,6 +20,8 @@ #define COBJMACROS #define NONAMELESSUNION +#define USE_COM_CONTEXT_DEF +#include "objbase.h" #include "oleauto.h" #include "wine/debug.h" @@ -587,3 +589,21 @@ HRESULT WINAPI CoRevertToSelf(void) return hr; } + +/*********************************************************************** + * CoGetObjectContext (combase.@) + */ +HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) +{ + IObjContext *context; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + hr = CoGetContextToken((ULONG_PTR *)&context); + if (FAILED(hr)) + return hr; + + return IObjContext_QueryInterface(context, riid, ppv); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e67e7159bd..c84c10a21f 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -113,7 +113,7 @@ @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType -@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid @ stub CoGetProcessIdentifier @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 06dd4aefc7..6a0c518081 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4789,34 +4789,6 @@ static const IObjContextVtbl Context_Object_Vtbl = Context_OC_Reserved7 }; -/*********************************************************************** - * CoGetObjectContext [OLE32.@] - * - * Retrieves an object associated with the current context (i.e. apartment). - * - * PARAMS - * riid [I] ID of the interface of the object to retrieve. - * ppv [O] Address where object will be stored on return. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) -{ - IObjContext *context; - HRESULT hr; - - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; - hr = CoGetContextToken((ULONG_PTR*)&context); - if (FAILED(hr)) - return hr; - - return IObjContext_QueryInterface(context, riid, ppv); -} - /*********************************************************************** * CoGetContextToken [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e23c57b404..faccb54292 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -41,7 +41,7 @@ @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr) -@ stdcall CoGetObjectContext(ptr ptr) +@ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext @ stdcall CoGetPSClsid(ptr ptr) @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr)

1 0