November 2019 - Wine-Devel - list.winehq.org

[PATCH resend 0/9] Implement DInput8 mouse using RawInput and XInput2.
by Rémi Bernon Nov. 11, 2019

Nov. 11, 2019

This is a rebase/resend of: https://www.winehq.org/pipermail/wine-devel/2019-September/151347.html It should fix several issues related to mouse cursor position sometimes jumping around in some games as well as improving the performance with high polling rate mouses by avoiding a rountrip to the server in the dinput8 implementation. The first patches are in common with the HID rawinput implementation patches that have been previously sent here: https://www.winehq.org/pipermail/wine-devel/2019-October/152735.html Rémi Bernon (9): server: Add send_hardware_message flags for rawinput translation. server: Implement rawinput hardware message broadcast. user32: Add __wine_send_input flags to hint raw input translation. user32: Add support for RIDEV_INPUTSINK flag in RegisterRawInputDevices. user32: Implement GetRegisteredRawInputDevices. dinput8: Add support for dinput devices that use raw input interface. dinput8: Use raw input interface for dinput8 mouse device. winex11.drv: Advertise XInput2 version 2.1 support. winex11.drv: Listen to RawMotion and RawButton* events in the desktop thread. dlls/dinput/device_private.h | 3 + dlls/dinput/dinput_main.c | 84 +++++++++++++++++++- dlls/dinput/mouse.c | 117 ++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 23 +----- dlls/user32/input.c | 4 +- dlls/user32/rawinput.c | 64 ++++++++++++++- dlls/user32/tests/rawinput.c | 2 - dlls/user32/user32.spec | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 +- dlls/winemac.drv/ime.c | 4 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/event.c | 10 ++- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 128 +++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 6 +- dlls/winex11.drv/x11drv_main.c | 4 + include/winuser.h | 2 +- server/protocol.def | 9 +++ server/queue.c | 135 ++++++++++++++++++++++++++------ 21 files changed, 489 insertions(+), 120 deletions(-) -- 2.24.0.rc2

3 20

[PATCH 1/6] d3dx9: Correctly handle NULL constant state for objects on 64 bit arch.
by Matteo Bruni Nov. 11, 2019

Nov. 11, 2019

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Avoid assignments inside function call arguments. dlls/d3dx9_36/effect.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 63c931e1728..e69a1fd1f87 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5345,8 +5345,11 @@ static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects) { - DWORD offset; + struct d3dx_parameter *param = &state->parameter; + enum STATE_CLASS state_class; const char *ptr2; + void *new_data; + DWORD offset; HRESULT hr; state->type = ST_CONSTANT; @@ -5360,7 +5363,7 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx_parse_effect_typedef(effect, &state->parameter, data, &ptr2, NULL, 0); + hr = d3dx_parse_effect_typedef(effect, param, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5369,18 +5372,42 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx_parse_init_value(effect, &state->parameter, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } + if (((state_class = state_table[state->operation].class) == SC_VERTEXSHADER + || state_class == SC_PIXELSHADER || state_class == SC_TEXTURE) + && param->bytes < sizeof(void *)) + { + if (param->type != D3DXPT_INT || *(unsigned int *)param->data) + { + FIXME("Unexpected parameter for object, param->type %#x, param->class %#x, *param->data %#x.\n", + param->type, param->class, *(unsigned int *)param->data); + hr = D3DXERR_INVALIDDATA; + goto err_out; + } + + new_data = heap_realloc(param->data, sizeof(void *)); + if (!new_data) + { + ERR("Out of memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + memset(new_data, 0, sizeof(void *)); + param->data = new_data; + param->bytes = sizeof(void *); + } + return D3D_OK; err_out: - free_parameter(&state->parameter, FALSE, FALSE); + free_parameter(param, FALSE, FALSE); return hr; } -- 2.21.0

2 6

[PATCH 4/4] gdi32: Load Wine builtin TrueType fonts from %WINDIR%\fonts first.
by Jactry Zeng Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdi32/freetype.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1559e8fc4b..31b517fb7a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3093,6 +3093,20 @@ static void load_font_from_fonts_dir(const WCHAR *filename, DWORD flags) static void load_system_fonts(void) { + static const WCHAR marlett_ttf[] = {'m','a','r','l','e','t','t','.','t','t','f',0}; + static const WCHAR symbol_ttf[] = {'s','y','m','b','o','l','.','t','t','f',0}; + static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0}; + static const WCHAR tahomabd_ttf[] = {'t','a','h','o','m','a','b','d','.','t','t','f',0}; + static const WCHAR wingding_ttf[] = {'w','i','n','g','d','i','n','g','.','t','t','f',0}; + static const WCHAR *builtin_fonts[] = + { + marlett_ttf, + symbol_ttf, + tahoma_ttf, + tahomabd_ttf, + wingding_ttf + }; + int i; HKEY hkey; WCHAR data[MAX_PATH]; const WCHAR * const *value; @@ -3107,6 +3121,9 @@ static void load_system_fonts(void) } RegCloseKey(hkey); } + + for (i = 0; i < ARRAY_SIZE(builtin_fonts); i++) + load_font_from_fonts_dir(builtin_fonts[i], ADDFONT_ADD_TO_CACHE); } static WCHAR *get_full_path_name(const WCHAR *name) @@ -4247,7 +4264,7 @@ static void init_font_list(void) delete_external_font_keys(); - /* load the system bitmap fonts */ + /* load the system bitmap fonts and other builtin fonts */ load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ @@ -4259,13 +4276,6 @@ static void init_font_list(void) HeapFree(GetProcessHeap(), 0, unixname); } - /* load the wine fonts */ - if ((unixname = get_font_dir())) - { - ReadFontDir(unixname, TRUE); - HeapFree(GetProcessHeap(), 0, unixname); - } - /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their full path as the entry. Also look for any .fon fonts, since ReadFontDir -- 2.24.0

1 0

[PATCH 3/4] gdi32: Add a helper for loading fonts from %WINDIR%\fonts first.
by Jactry Zeng Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/gdi32/freetype.c | 52 +++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..1559e8fc4b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3049,7 +3049,7 @@ static char *get_data_dir_path( LPCWSTR file ) return unix_name; } -static BOOL load_font_from_data_dir(LPCWSTR file) +static BOOL load_font_from_data_dir(LPCWSTR file, DWORD flags) { BOOL ret = FALSE; char *unix_name = get_data_dir_path( file ); @@ -3057,7 +3057,7 @@ static BOOL load_font_from_data_dir(LPCWSTR file) if (unix_name) { EnterCriticalSection( &freetype_cs ); - ret = AddFontToList(unix_name, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); + ret = AddFontToList(unix_name, NULL, 0, flags); LeaveCriticalSection( &freetype_cs ); HeapFree(GetProcessHeap(), 0, unix_name); } @@ -3076,32 +3076,34 @@ static char *get_winfonts_dir_path(LPCWSTR file) return wine_get_unix_file_name( windowsdir ); } +static void load_font_from_fonts_dir(const WCHAR *filename, DWORD flags) +{ + BOOL added = FALSE; + char *unixname; + + unixname = get_winfonts_dir_path(filename); + if (unixname) + { + added = AddFontToList(unixname, NULL, 0, flags); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!added) + load_font_from_data_dir(filename, flags); +} + static void load_system_fonts(void) { HKEY hkey; - WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; + WCHAR data[MAX_PATH]; const WCHAR * const *value; DWORD dlen, type; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; - char *unixname; if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); - strcatW(windowsdir, fontsW); for(value = SystemFontValues; *value; value++) { dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && - type == REG_SZ) { - BOOL added = FALSE; - - sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) { - added = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - HeapFree(GetProcessHeap(), 0, unixname); - } - if (!added) - load_font_from_data_dir(data); - } + type == REG_SZ) + load_font_from_fonts_dir(data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); } RegCloseKey(hkey); } @@ -4295,20 +4297,8 @@ static void init_font_list(void) } } else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) - { - WCHAR pathW[MAX_PATH]; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; - BOOL added = FALSE; + load_font_from_fonts_dir(data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) - { - added = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - HeapFree(GetProcessHeap(), 0, unixname); - } - if (!added) - load_font_from_data_dir(data); - } /* reset dlen and vlen */ dlen = datalen; vlen = valuelen; -- 2.24.0

1 0

[PATCH 2/4] wine.inf: Add registry entries for builtin TrueType fonts.
by Jactry Zeng Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- loader/wine.inf.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0b431a7447..96b3bb4969 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -221,6 +221,8 @@ MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" +Fonts="Software\Microsoft\Windows\CurrentVersion\Fonts" +FontsNT="Software\Microsoft\Windows NT\CurrentVersion\Fonts" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" @@ -632,6 +634,16 @@ HKLM,%Control%\Session Manager\Memory Management,PagingFiles,,"%24%\pagefile.sys HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1 [Fonts] +HKLM,%Fonts%,"Marlett (TrueType)",,"marlett.ttf" +HKLM,%Fonts%,"Symbol (TrueType)",,"symbol.ttf" +HKLM,%Fonts%,"Tahoma (TrueType)",,"tahoma.ttf" +HKLM,%Fonts%,"Tahoma Bold (TrueType)",,"tahomabd.ttf" +HKLM,%Fonts%,"Wingdings (TrueType)",,"wingding.ttf" +HKLM,%FontsNT%,"Marlett (TrueType)",,"marlett.ttf" +HKLM,%FontsNT%,"Symbol (TrueType)",,"symbol.ttf" +HKLM,%FontsNT%,"Tahoma (TrueType)",,"tahoma.ttf" +HKLM,%FontsNT%,"Tahoma Bold (TrueType)",,"tahomabd.ttf" +HKLM,%FontsNT%,"Wingdings (TrueType)",,"wingding.ttf" HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186" HKLM,%FontSubStr%,"Arial CE,238",,"Arial,238" HKLM,%FontSubStr%,"Arial CYR,204",,"Arial,204" -- 2.24.0

1 0

[PATCH 1/4] wine.inf: Add fonts section for copying builtin fonts to %WINDIR%\fonts.
by Jactry Zeng Nov. 11, 2019

Nov. 11, 2019

This patchset is trying to setup Wine builtin fonts in %WINDIR%\fonts and load these fonts from there first. This is mostly for a game named Achron. It assumes arial.ttf and tahoma.ttf are system fonts. So it got their file names by reading key values from "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\", and appending the file name to "C:\\Windows\\Fonts\\" for getting a full path. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- loader/wine.inf.in | 66 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0f6e0a391..0b431a7447 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=l_intl_section, inf_section +CopyFiles=l_intl_section, inf_section, fonts_section AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=l_intl_section, inf_section +CopyFiles=l_intl_section, inf_section, fonts_section AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=l_intl_section, inf_section +CopyFiles=l_intl_section, inf_section, fonts_section AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=l_intl_section, inf_section +CopyFiles=l_intl_section, inf_section, fonts_section AddReg=\ Classes,\ ContentIndex,\ @@ -3853,6 +3853,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [DestinationDirs] l_intl_section = 11 inf_section = 17 +fonts_section = 20 [l_intl_section] l_intl.nls @@ -3860,3 +3861,60 @@ l_intl.nls [inf_section] winebus.inf winehid.inf + +[fonts_section] +coue1255.fon,fonts\coue1255.fon +coue1256.fon,fonts\coue1256.fon +coue1257.fon,fonts\coue1257.fon +couree.fon,fonts\couree.fon +coure.fon,fonts\coure.fon +coureg.fon,fonts\coureg.fon +courer.fon,fonts\courer.fon +couret.fon,fonts\couret.fon +cvgasys.fon,fonts\cvgasys.fon +hvgasys.fon,fonts\hvgasys.fon +jsmalle.fon,fonts\jsmalle.fon +jvgafix.fon,fonts\jvgafix.fon +jvgasys.fon,fonts\jvgasys.fon +marlett.ttf,fonts\marlett.ttf +smae1255.fon,fonts\smae1255.fon +smae1256.fon,fonts\smae1256.fon +smae1257.fon,fonts\smae1257.fon +smallee.fon,fonts\smallee.fon +smalle.fon,fonts\smalle.fon +smalleg.fon,fonts\smalleg.fon +smaller.fon,fonts\smaller.fon +smallet.fon,fonts\smallet.fon +ssee1255.fon,fonts\ssee1255.fon +ssee1256.fon,fonts\ssee1256.fon +ssee1257.fon,fonts\ssee1257.fon +ssee874.fon,fonts\ssee874.fon +ssef1255.fon,fonts\ssef1255.fon +ssef1256.fon,fonts\ssef1256.fon +ssef1257.fon,fonts\ssef1257.fon +ssef874.fon,fonts\ssef874.fon +sserifee.fon,fonts\sserifee.fon +sserife.fon,fonts\sserife.fon +sserifeg.fon,fonts\sserifeg.fon +sserifer.fon,fonts\sserifer.fon +sserifet.fon,fonts\sserifet.fon +sseriffe.fon,fonts\sseriffe.fon +sseriff.fon,fonts\sseriff.fon +sseriffg.fon,fonts\sseriffg.fon +sseriffr.fon,fonts\sseriffr.fon +sserifft.fon,fonts\sserifft.fon +svgasys.fon,fonts\svgasys.fon +symbol.ttf,fonts\symbol.ttf +tahomabd.ttf,fonts\tahomabd.ttf +tahoma.ttf,fonts\tahoma.ttf +vgafix.fon,fonts\vgafix.fon +vgas1255.fon,fonts\vgas1255.fon +vgas1256.fon,fonts\vgas1256.fon +vgas1257.fon,fonts\vgas1257.fon +vgas874.fon,fonts\vgas874.fon +vgasyse.fon,fonts\vgasyse.fon +vgasys.fon,fonts\vgasys.fon +vgasysg.fon,fonts\vgasysg.fon +vgasysr.fon,fonts\vgasysr.fon +vgasyst.fon,fonts\vgasyst.fon +wingding.ttf,fonts\wingding.ttf -- 2.24.0

1 0

[PATCH] d3d8: Fix an incorrect type.
by Zhiyi Zhang Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index c5239844c3..5c87963050 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -101,15 +101,15 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - HRESULT hr; + UINT count; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_get_adapter_count(d3d8->wined3d); + count = wined3d_get_adapter_count(d3d8->wined3d); wined3d_mutex_unlock(); - return hr; + return count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, -- 2.23.0

1 0

[PATCH] ole32: Add separate IEnumSTATPROPSTG implementation.
by Nikolay Sivov Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/enumx.c | 205 ------------------------------ dlls/ole32/enumx.h | 34 ----- dlls/ole32/stg_prop.c | 281 +++++++++++++++++++++++++---------------- 4 files changed, 175 insertions(+), 346 deletions(-) delete mode 100644 dlls/ole32/enumx.c delete mode 100644 dlls/ole32/enumx.h diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 32de987a8c..310f6fc119 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ datacache.c \ defaulthandler.c \ dictionary.c \ - enumx.c \ errorinfo.c \ filelockbytes.c \ filemoniker.c \ diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c deleted file mode 100644 index 4279ca81fa..0000000000 --- a/dlls/ole32/enumx.c +++ /dev/null @@ -1,205 +0,0 @@ -/* - * IEnum* implementation - * - * Copyright 2006 Mike McCormack - * - * 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 "windef.h" -#include "winbase.h" -#include "objbase.h" - -#include "enumx.h" - -#include "wine/list.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -struct tagEnumSTATPROPSETSTG_impl -{ - const void *vtbl; - LONG ref; - struct list elements; - struct list *current; - ULONG elem_size; - GUID riid; -}; - -/************************************************************************ - * enumx_QueryInterface - */ -HRESULT WINAPI enumx_QueryInterface( - enumx_impl *This, - REFIID riid, - void** ppvObject) -{ - if ( ppvObject==0 ) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualGUID(&IID_IUnknown, riid) || - IsEqualGUID(&This->riid, riid)) - { - IUnknown_AddRef(((IUnknown*)This)); - *ppvObject = This; - return S_OK; - } - - return E_NOINTERFACE; -} - -/************************************************************************ - * enumx_AddRef - */ -ULONG WINAPI enumx_AddRef(enumx_impl *This) -{ - return InterlockedIncrement(&This->ref); -} - -/************************************************************************ - * enumx_Release - */ -ULONG WINAPI enumx_Release(enumx_impl *This) -{ - ULONG ref; - - ref = InterlockedDecrement(&This->ref); - if (ref == 0) - { - while (!list_empty(&This->elements)) - { - struct list *x = list_head(&This->elements); - list_remove(x); - HeapFree(GetProcessHeap(), 0, x); - } - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -/************************************************************************ - * enumx_Next - */ -HRESULT WINAPI enumx_Next(enumx_impl *This, ULONG celt, - void *rgelt, ULONG *pceltFetched) -{ - unsigned char *p; - ULONG count = 0; - - TRACE("%p %u %p\n", This, celt, pceltFetched); - - if (This->current == NULL) - This->current = list_head(&This->elements); - p = rgelt; - while (count < celt && This->current && This->current != &This->elements) - { - memcpy(p, &This->current[1], This->elem_size); - p += This->elem_size; - This->current = This->current->next; - count++; - } - if (pceltFetched) - *pceltFetched = count; - if (count < celt) - return S_FALSE; - return S_OK; -} - -/************************************************************************ - * enumx_Skip - */ -HRESULT WINAPI enumx_Skip(enumx_impl *This, ULONG celt) -{ - ULONG count = 0; - - TRACE("%p %u\n", This, celt); - - if (This->current == NULL) - This->current = list_head(&This->elements); - - while (count < celt && This->current && This->current != &This->elements) - count++; - - return S_OK; -} - -/************************************************************************ - * enumx_Reset - */ -HRESULT WINAPI enumx_Reset(enumx_impl *This) -{ - TRACE("\n"); - - This->current = NULL; - return S_OK; -} - -/************************************************************************ - * enumx_fnClone - */ -HRESULT WINAPI enumx_Clone( - enumx_impl *iface, - enumx_impl **ppenum) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -/************************************************************************ - * enumx_allocate - * - * Allocate a generic enumerator - */ -enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size) -{ - enumx_impl *enumx; - - enumx = HeapAlloc(GetProcessHeap(), 0, sizeof *enumx); - if (enumx) - { - enumx->vtbl = vtbl; - enumx->ref = 1; - enumx->current = NULL; - enumx->elem_size = elem_size; - enumx->riid = *riid; - list_init(&enumx->elements); - } - - return enumx; -} - -/************************************************************************ - * enumx_add_element - * - * Add an element to the enumeration. - */ -void *enumx_add_element(enumx_impl *enumx, const void *data) -{ - struct list *element; - - element = HeapAlloc(GetProcessHeap(), 0, sizeof *element + enumx->elem_size); - if (!element) - return NULL; - memcpy(&element[1], data, enumx->elem_size); - list_add_tail(&enumx->elements, element); - return &element[1]; -} diff --git a/dlls/ole32/enumx.h b/dlls/ole32/enumx.h deleted file mode 100644 index da76e13769..0000000000 --- a/dlls/ole32/enumx.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2006 Mike McCormack - * - * 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 __OLE_ENUM_H__ -#define __OLE_ENUM_H__ - -typedef struct tagEnumSTATPROPSETSTG_impl enumx_impl; - -extern HRESULT WINAPI enumx_QueryInterface(enumx_impl *, REFIID, void**) DECLSPEC_HIDDEN; -extern ULONG WINAPI enumx_AddRef(enumx_impl *) DECLSPEC_HIDDEN; -extern ULONG WINAPI enumx_Release(enumx_impl *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI enumx_Next(enumx_impl *, ULONG, void *, ULONG *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI enumx_Skip(enumx_impl *, ULONG) DECLSPEC_HIDDEN; -extern HRESULT WINAPI enumx_Reset(enumx_impl *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI enumx_Clone(enumx_impl *, enumx_impl **) DECLSPEC_HIDDEN; -extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG) DECLSPEC_HIDDEN; -extern void *enumx_add_element(enumx_impl *, const void *) DECLSPEC_HIDDEN; - -#endif diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 2e43d16b35..70b8cd3b0e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -10,6 +10,7 @@ * Copyright 1999 Thuy Nguyen * Copyright 2005 Mike McCormack * Copyright 2005 Juan Lang + * Copyright 2006 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,7 +55,6 @@ #include "wine/heap.h" #include "dictionary.h" #include "storage32.h" -#include "enumx.h" #include "oleauto.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); @@ -143,8 +143,6 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, LCID targetCP); static const IPropertyStorageVtbl IPropertyStorage_Vtbl; -static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl; -static HRESULT create_EnumSTATPROPSTG(PropertyStorage_impl *, IEnumSTATPROPSTG**); /*********************************************************************** * Implementation of IPropertyStorage @@ -175,6 +173,174 @@ static inline PropertyStorage_impl *impl_from_IPropertyStorage(IPropertyStorage return CONTAINING_RECORD(iface, PropertyStorage_impl, IPropertyStorage_iface); } +struct enum_stat_prop_stg +{ + IEnumSTATPROPSTG IEnumSTATPROPSTG_iface; + LONG refcount; + STATPROPSTG *stats; + size_t current; + size_t count; +}; + +static struct enum_stat_prop_stg *impl_from_IEnumSTATPROPSTG(IEnumSTATPROPSTG *iface) +{ + return CONTAINING_RECORD(iface, struct enum_stat_prop_stg, IEnumSTATPROPSTG_iface); +} + +static HRESULT WINAPI enum_stat_prop_stg_QueryInterface(IEnumSTATPROPSTG *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IEnumSTATPROPSTG) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IEnumSTATPROPSTG_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_stat_prop_stg_AddRef(IEnumSTATPROPSTG *iface) +{ + struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); + LONG refcount = InterlockedIncrement(&penum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI enum_stat_prop_stg_Release(IEnumSTATPROPSTG *iface) +{ + struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); + LONG refcount = InterlockedDecrement(&penum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(penum->stats); + heap_free(penum); + } + + return refcount; +} + +static HRESULT WINAPI enum_stat_prop_stg_Next(IEnumSTATPROPSTG *iface, ULONG celt, STATPROPSTG *ret, ULONG *fetched) +{ + struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); + ULONG count = 0; + + TRACE("%p, %u, %p, %p.\n", iface, celt, ret, fetched); + + if (penum->current == ~0u) + penum->current = 0; + + while (count < celt && penum->current < penum->count) + ret[count++] = penum->stats[penum->current++]; + + if (fetched) + *fetched = count; + + return count < celt ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enum_stat_prop_stg_Skip(IEnumSTATPROPSTG *iface, ULONG celt) +{ + FIXME("%p, %u.\n", iface, celt); + + return S_OK; +} + +static HRESULT WINAPI enum_stat_prop_stg_Reset(IEnumSTATPROPSTG *iface) +{ + struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); + + TRACE("%p.\n", iface); + + penum->current = ~0u; + + return S_OK; +} + +static HRESULT WINAPI enum_stat_prop_stg_Clone(IEnumSTATPROPSTG *iface, IEnumSTATPROPSTG **ppenum) +{ + FIXME("%p, %p.\n", iface, ppenum); + + return E_NOTIMPL; +} + +static const IEnumSTATPROPSTGVtbl enum_stat_prop_stg_vtbl = +{ + enum_stat_prop_stg_QueryInterface, + enum_stat_prop_stg_AddRef, + enum_stat_prop_stg_Release, + enum_stat_prop_stg_Next, + enum_stat_prop_stg_Skip, + enum_stat_prop_stg_Reset, + enum_stat_prop_stg_Clone, +}; + +static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg) +{ + struct enum_stat_prop_stg *stg = arg; + PROPID propid = PtrToUlong(k); + const PROPVARIANT *prop = v; + STATPROPSTG *dest; + + dest = &stg->stats[stg->count]; + + dest->lpwstrName = NULL; + dest->propid = propid; + dest->vt = prop->vt; + stg->count++; + + return TRUE; +} + +static BOOL prop_enum_stat_count(const void *k, const void *v, void *extra, void *arg) +{ + DWORD *count = arg; + + *count += 1; + + return TRUE; +} + +static HRESULT create_enum_stat_prop_stg(PropertyStorage_impl *storage, IEnumSTATPROPSTG **ret) +{ + struct enum_stat_prop_stg *enum_obj; + DWORD count; + + enum_obj = heap_alloc_zero(sizeof(*enum_obj)); + if (!enum_obj) + return E_OUTOFMEMORY; + + enum_obj->IEnumSTATPROPSTG_iface.lpVtbl = &enum_stat_prop_stg_vtbl; + enum_obj->refcount = 1; + + count = 0; + dictionary_enumerate(storage->propid_to_prop, prop_enum_stat_count, &count); + + if (count) + { + if (!(enum_obj->stats = heap_alloc(sizeof(*enum_obj->stats) * count))) + { + IEnumSTATPROPSTG_Release(&enum_obj->IEnumSTATPROPSTG_iface); + return E_OUTOFMEMORY; + } + + dictionary_enumerate(storage->propid_to_prop, prop_enum_stat, enum_obj); + } + + *ret = &enum_obj->IEnumSTATPROPSTG_iface; + + return S_OK; +} + /************************************************************************ * IPropertyStorage_fnQueryInterface (IPropertyStorage) */ @@ -853,12 +1019,13 @@ static HRESULT WINAPI IPropertyStorage_fnRevert( /************************************************************************ * IPropertyStorage_fnEnum (IPropertyStorage) */ -static HRESULT WINAPI IPropertyStorage_fnEnum( - IPropertyStorage* iface, - IEnumSTATPROPSTG** ppenum) +static HRESULT WINAPI IPropertyStorage_fnEnum(IPropertyStorage *iface, IEnumSTATPROPSTG **ppenum) { - PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); - return create_EnumSTATPROPSTG(This, ppenum); + PropertyStorage_impl *storage = impl_from_IPropertyStorage(iface); + + TRACE("%p, %p.\n", iface, ppenum); + + return create_enum_stat_prop_stg(storage, ppenum); } /************************************************************************ @@ -2516,93 +2683,6 @@ static HRESULT WINAPI IPropertySetStorage_fnEnum(IPropertySetStorage *iface, IEn return create_enum_stat_propset_stg(storage, enum_obj); } -/************************************************************************ - * Implement IEnumSTATPROPSTG using enumx - */ -static HRESULT WINAPI IEnumSTATPROPSTG_fnQueryInterface( - IEnumSTATPROPSTG *iface, - REFIID riid, - void** ppvObject) -{ - return enumx_QueryInterface((enumx_impl*)iface, riid, ppvObject); -} - -static ULONG WINAPI IEnumSTATPROPSTG_fnAddRef( - IEnumSTATPROPSTG *iface) -{ - return enumx_AddRef((enumx_impl*)iface); -} - -static ULONG WINAPI IEnumSTATPROPSTG_fnRelease( - IEnumSTATPROPSTG *iface) -{ - return enumx_Release((enumx_impl*)iface); -} - -static HRESULT WINAPI IEnumSTATPROPSTG_fnNext( - IEnumSTATPROPSTG *iface, - ULONG celt, - STATPROPSTG *rgelt, - ULONG *pceltFetched) -{ - return enumx_Next((enumx_impl*)iface, celt, rgelt, pceltFetched); -} - -static HRESULT WINAPI IEnumSTATPROPSTG_fnSkip( - IEnumSTATPROPSTG *iface, - ULONG celt) -{ - return enumx_Skip((enumx_impl*)iface, celt); -} - -static HRESULT WINAPI IEnumSTATPROPSTG_fnReset( - IEnumSTATPROPSTG *iface) -{ - return enumx_Reset((enumx_impl*)iface); -} - -static HRESULT WINAPI IEnumSTATPROPSTG_fnClone( - IEnumSTATPROPSTG *iface, - IEnumSTATPROPSTG **ppenum) -{ - return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum); -} - -static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg) -{ - enumx_impl *enumx = arg; - PROPID propid = PtrToUlong(k); - const PROPVARIANT *prop = v; - STATPROPSTG stat; - - stat.lpwstrName = NULL; - stat.propid = propid; - stat.vt = prop->vt; - - enumx_add_element(enumx, &stat); - - return TRUE; -} - -static HRESULT create_EnumSTATPROPSTG( - PropertyStorage_impl *This, - IEnumSTATPROPSTG** ppenum) -{ - enumx_impl *enumx; - - TRACE("%p %p\n", This, ppenum); - - enumx = enumx_allocate(&IID_IEnumSTATPROPSTG, - &IEnumSTATPROPSTG_Vtbl, - sizeof (STATPROPSTG)); - - dictionary_enumerate(This->propid_to_prop, prop_enum_stat, enumx); - - *ppenum = (IEnumSTATPROPSTG*) enumx; - - return S_OK; -} - /*********************************************************************** * vtables */ @@ -2636,17 +2716,6 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl = IPropertyStorage_fnStat, }; -static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl = -{ - IEnumSTATPROPSTG_fnQueryInterface, - IEnumSTATPROPSTG_fnAddRef, - IEnumSTATPROPSTG_fnRelease, - IEnumSTATPROPSTG_fnNext, - IEnumSTATPROPSTG_fnSkip, - IEnumSTATPROPSTG_fnReset, - IEnumSTATPROPSTG_fnClone, -}; - /*********************************************************************** * Format ID <-> name conversion */ -- 2.24.0

1 0

[PATCH 1/7] comsvcs: Implement BindToObject() for "new" moniker.
by Nikolay Sivov Nov. 11, 2019

Nov. 11, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/main.c | 37 ++++++++++++++++++++++++++++++++++-- dlls/comsvcs/tests/comsvcs.c | 8 ++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 86ffe2587b..827a6e8e5e 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -551,9 +551,42 @@ static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *si static HRESULT WINAPI new_moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ret) { - FIXME("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + struct new_moniker *moniker = impl_from_IMoniker(iface); + IClassActivator *activator; + IClassFactory *factory; + BIND_OPTS2 bindopts; + MULTI_QI qi; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + + bindopts.cbStruct = sizeof(bindopts); + if (FAILED(hr = IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts))) + return hr; + + if (!pmkToLeft) + { + qi.pIID = riid; + qi.pItf = NULL; + qi.hr = S_OK; + hr = CoCreateInstanceEx(&moniker->clsid, NULL, bindopts.dwClassContext, bindopts.pServerInfo, 1, &qi); + *ret = qi.pItf; + } + else + { + if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassActivator, (void **)&activator))) + { + hr = IClassActivator_GetClassObject(activator, &moniker->clsid, bindopts.dwClassContext, bindopts.locale, riid, ret); + IClassActivator_Release(activator); + } + else if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassFactory, (void **)&factory))) + { + hr = IClassFactory_CreateInstance(factory, NULL, riid, ret); + IClassFactory_Release(factory); + } + } + + return hr; } static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index d94b99afd1..29de7cfe97 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -352,10 +352,8 @@ todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); todo_wine @@ -423,10 +421,8 @@ todo_wine bind_opts.dwClassContext = CLSCTX_INPROC_SERVER; hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); IBindCtx_Release(bindctx); } -- 2.24.0

1 6

[PATCH] dmband: Rename IDirectMusicTrack8Impl to band_track.
by Alistair Leslie-Hughes Nov. 10, 2019

Nov. 10, 2019

Fixed subjet. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/bandtrack.c | 72 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index eb62ec11ce..290b35c5f3 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * return S_OK; } -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) return ref; } -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -88,7 +88,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance, void **state_data, DWORD virtual_track8id, DWORD flags) { @@ -107,14 +107,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -141,7 +141,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -149,7 +149,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -196,7 +196,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -217,7 +217,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param, void *state_data, DWORD flags) { @@ -229,7 +229,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -240,7 +240,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -249,7 +249,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { @@ -259,24 +259,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { - IDirectMusicTrack8Impl_QueryInterface, - IDirectMusicTrack8Impl_AddRef, - IDirectMusicTrack8Impl_Release, - IDirectMusicTrack8Impl_Init, - IDirectMusicTrack8Impl_InitPlay, - IDirectMusicTrack8Impl_EndPlay, - IDirectMusicTrack8Impl_Play, - IDirectMusicTrack8Impl_GetParam, - IDirectMusicTrack8Impl_SetParam, - IDirectMusicTrack8Impl_IsParamSupported, - IDirectMusicTrack8Impl_AddNotificationType, - IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicTrack8Impl_Clone, - IDirectMusicTrack8Impl_PlayEx, - IDirectMusicTrack8Impl_GetParamEx, - IDirectMusicTrack8Impl_SetParamEx, - IDirectMusicTrack8Impl_Compose, - IDirectMusicTrack8Impl_Join + band_track_QueryInterface, + band_track_AddRef, + band_track_Release, + band_track_Init, + band_track_InitPlay, + band_track_EndPlay, + band_track_Play, + band_track_GetParam, + band_track_SetParam, + band_track_IsParamSupported, + band_track_AddNotificationType, + band_track_RemoveNotificationType, + band_track_Clone, + band_track_PlayEx, + band_track_GetParamEx, + band_track_SetParamEx, + band_track_Compose, + band_track_Join }; /* IDirectMusicBandTrack IPersistStream part: */ -- 2.17.1

2 4