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

Ken Thomases : winemac: Ignore window frame changes while minimized but check again when unminimized .
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: a6dc4906de8caa187deb38bd0e044e5aab442ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc4906de8caa187deb38bd0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:54 2013 -0500 winemac: Ignore window frame changes while minimized but check again when unminimized. --- dlls/winemac.drv/cocoa_window.m | 2 ++ dlls/winemac.drv/window.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6fbd0db..9d8984c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1229,6 +1229,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) causing_becomeKeyWindow = FALSE; [controller windowGotFocus:self]; } + + [self windowDidResize:notification]; } - (void) windowDidEndLiveResize:(NSNotification *)notification diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a04f1e2..7e0c60e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1500,7 +1500,7 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) if (!hwnd) return; if (!(data = get_win_data(hwnd))) return; - if (!data->on_screen) + if (!data->on_screen || data->minimized) { release_win_data(data); return;

1 0

Ken Thomases : winemac: Improve the debug tracing in macdrv_SetWindowStyle( ).
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: f010a930dff00e959dec37c520ce366e9ce88eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f010a930dff00e959dec37c52… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:47 2013 -0500 winemac: Improve the debug tracing in macdrv_SetWindowStyle(). --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 77d2ea0..eacc0b6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -962,7 +962,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct macdrv_win_data *data; - TRACE("%p, %d, %p\n", hwnd, offset, style); + TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, style->styleOld, style->styleNew); if (hwnd == GetDesktopWindow()) return; if (!(data = get_win_data(hwnd))) return;

1 0

Piotr Caban : msvcrt: Reuse FILE object in wfreopen function.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 598ff4dd5a44e1632e9eb2bf6d59a2a363afe854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598ff4dd5a44e1632e9eb2bf6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 11:16:50 2013 +0200 msvcrt: Reuse FILE object in wfreopen function. --- dlls/msvcrt/file.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c0c7124..1f17a93 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3797,20 +3797,28 @@ MSVCRT_size_t CDECL fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t ele */ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, MSVCRT_FILE* file) { - int fd; + int open_flags, stream_flags, fd; - TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); - LOCK_FILES(); - if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend) - file = NULL; - else - { - MSVCRT_fclose(file); - file = MSVCRT__wfsopen(path, mode, MSVCRT__SH_DENYNO); - } - UNLOCK_FILES(); - return file; + LOCK_FILES(); + if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend) + file = NULL; + else + { + MSVCRT_fclose(file); + if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) + file = NULL; + else if((fd = MSVCRT__wopen(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) < 0) + file = NULL; + else if(msvcrt_init_fp(file, fd, stream_flags) == -1) + { + file->_flag = 0; + file = NULL; + } + } + UNLOCK_FILES(); + return file; } /*********************************************************************

1 0

Alistair Leslie-Hughes : oleaut32/tests: Correct output arguments.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 6d1db050d28bcb149d16d5186d33fd20492347fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1db050d28bcb149d16d5186… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 08:51:07 2013 +1000 oleaut32/tests: Correct output arguments. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c7b46db..0d38b9d 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5510,7 +5510,7 @@ static void test_VarCat(void) /* Determine the error code for the vt combination */ ok(hres == expected_error_num, "VarCat: %d, %d returned error, 0x%X expected 0x%X.\n", - leftvt, rightvt, expected_error_num, hres); + leftvt, rightvt, hres, expected_error_num); /* Check types are correct */ ok(V_VT(&result) == resultvt,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeLib::SaveAllChanges.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: af3ae0c4f23366ea071dd1d48f7539ba6bad3a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3ae0c4f23366ea071dd1d48… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:30 2013 -0500 oleaut32: Implement ICreateTypeLib::SaveAllChanges. --- dlls/oleaut32/typelib.c | 1251 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1249 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af3ae0c4f23366ea071dd…

1 0

Hans Leidekker : wbemprox: Add a partial implementation of CIM_DataFile.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 97f9d6fd8f3a4622ea68cfa59243cdc1e8f5da20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f9d6fd8f3a4622ea68cfa59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:29:03 2013 +0200 wbemprox: Add a partial implementation of CIM_DataFile. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 613f3ff..1e42d3f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 +IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ce97196..8878ddc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,7 @@ #include "winternl.h" #include "winioctl.h" #include "winsvc.h" +#include "winver.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -51,6 +52,8 @@ static const WCHAR class_cdromdriveW[] = {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_datafileW[] = + {'C','I','M','_','D','a','t','a','F','i','l','e',0}; static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = @@ -262,10 +265,15 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_datafile[] = +{ + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_directory[] = { { prop_accessmaskW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_KEY } + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY } }; static const struct column col_diskdrive[] = { @@ -498,6 +506,11 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_datafile +{ + const WCHAR *name; + const WCHAR *version; +}; struct record_directory { UINT32 accessmask; @@ -1092,6 +1105,121 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) return ret; } +static WCHAR *get_file_version( const WCHAR *filename ) +{ + static const WCHAR slashW[] = {'\\',0}, fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + VS_FIXEDFILEINFO *info; + DWORD size; + void *block; + WCHAR *ret; + + if (!(ret = heap_alloc( (4 * 5 + sizeof(fmtW) / sizeof(fmtW[0])) * sizeof(WCHAR) ))) return NULL; + if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) + { + heap_free( ret ); + return NULL; + } + if (!GetFileVersionInfoW( filename, 0, size, block ) || + !VerQueryValueW( block, slashW, (void **)&info, &size )) + { + heap_free( block ); + heap_free( ret ); + return NULL; + } + sprintfW( ret, fmtW, info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, + info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); + heap_free( block ); + return ret; +} + +static enum fill_status fill_datafile( struct table *table, const struct expr *cond ) +{ + static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; + struct record_datafile *rec; + UINT i, len, row = 0, offset = 0, num_expected_rows; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + DWORD drives = GetLogicalDrives(); + WIN32_FIND_DATAW data; + HANDLE handle; + struct dirstack *dirstack = alloc_dirstack(2); + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 8, sizeof(*rec) )) return FILL_STATUS_FAILED; + + for (i = 0; i < sizeof(drives); i++) + { + if (!(drives & (1 << i))) continue; + + root[0] = 'A' + i; + if (GetDriveTypeW( root ) != DRIVE_FIXED) continue; + + num_expected_rows = 0; + if (!seed_dirs( dirstack, cond, root[0], &num_expected_rows )) clear_dirstack( dirstack ); + + for (;;) + { + path = pop_dir( dirstack, &len ); + if (!(glob = build_glob( root[0], path, len ))) + { + status = FILL_STATUS_FAILED; + goto done; + } + if ((handle = FindFirstFileW( glob, &data )) != INVALID_HANDLE_VALUE) + { + do + { + if (!resize_table( table, row + 1, sizeof(*rec) )) + { + status = FILL_STATUS_FAILED; + goto done; + } + if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) continue; + new_path = append_path( path, data.cFileName, &len ); + + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (push_dir( dirstack, new_path, len )) continue; + heap_free( new_path ); + status = FILL_STATUS_FAILED; + goto done; + } + rec = (struct record_datafile *)(table->data + offset); + rec->name = build_name( root[0], new_path ); + rec->version = get_file_version( rec->name ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + else if (num_expected_rows && row == num_expected_rows - 1) + { + row++; + FindClose( handle ); + status = FILL_STATUS_FILTERED; + goto done; + } + offset += sizeof(*rec); + row++; + } + while (FindNextFileW( handle, &data )); + FindClose( handle ); + } + if (!peek_dir( dirstack )) break; + heap_free( glob ); + heap_free( path ); + } + } + +done: + free_dirstack( dirstack ); + heap_free( glob ); + heap_free( path ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static enum fill_status fill_directory( struct table *table, const struct expr *cond ) { static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; @@ -1870,6 +1998,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), 0, (BYTE *)data_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition },

1 0

Hans Leidekker : wbemprox: Add a function to resize a table.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 0f8cbab1a9c99c63da4a880912abdb2d7280ce02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8cbab1a9c99c63da4a88091… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:28:21 2013 +0200 wbemprox: Add a function to resize a table. --- dlls/wbemprox/builtin.c | 127 ++++++++++++++++++-------------------- dlls/wbemprox/class.c | 2 +- dlls/wbemprox/table.c | 20 +++--- dlls/wbemprox/wbemprox_private.h | 3 +- 4 files changed, 74 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f8cbab1a9c99c63da4a8…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICEARRAY.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 8550e69af067a571690bb033b61bddb9466d0751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8550e69af067a571690bb033b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:09 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICEARRAY. --- dlls/d3drm/d3drm.c | 20 ++++++-------------- include/d3drm.h | 6 +++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index b39db28..bd7155d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -374,11 +374,9 @@ static HRESULT WINAPI IDirect3DRMImpl_SetDefaultTextureShades(IDirect3DRM* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_GetDevices(IDirect3DRM* iface, LPDIRECT3DRMDEVICEARRAY * ppDeviceArray) +static HRESULT WINAPI IDirect3DRMImpl_GetDevices(IDirect3DRM *iface, IDirect3DRMDeviceArray **array) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppDeviceArray); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -747,12 +745,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_SetDefaultTextureShades(IDirect3DRM2* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_GetDevices(IDirect3DRM2* iface, - LPDIRECT3DRMDEVICEARRAY * ppDeviceArray) +static HRESULT WINAPI IDirect3DRM2Impl_GetDevices(IDirect3DRM2 *iface, IDirect3DRMDeviceArray **array) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppDeviceArray); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -1141,12 +1136,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_SetDefaultTextureShades(IDirect3DRM3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_GetDevices(IDirect3DRM3* iface, - LPDIRECT3DRMDEVICEARRAY* DeviceArray) +static HRESULT WINAPI IDirect3DRM3Impl_GetDevices(IDirect3DRM3 *iface, IDirect3DRMDeviceArray **array) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, DeviceArray); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 2a23e51..7427d32 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -94,7 +94,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; - STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; + STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags, @@ -234,7 +234,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; - STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; + STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags, @@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(GetSearchPath)(THIS_ DWORD *size_return, LPSTR path_return) PURE; STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE; STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE; - STDMETHOD(GetDevices)(THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE; + STDMETHOD(GetDevices)(THIS_ IDirect3DRMDeviceArray **array) PURE; STDMETHOD(GetNamedObject)(THIS_ const char *name, IDirect3DRMObject **object) PURE; STDMETHOD(EnumerateObjects)(THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE; STDMETHOD(Load)(THIS_ void *source, void *object_id, IID **iids, DWORD iid_count, D3DRMLOADOPTIONS flags,

1 0

Christian Costa : d3dx9_36: Fix typo.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 539d28a11289ca4c9db6fe080497803a8776b771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539d28a11289ca4c9db6fe080… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:31:52 2013 +0200 d3dx9_36: Fix typo. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index be80ede..1924c07 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5631,7 +5631,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_resource(base, data, &ptr); if (hr != D3D_OK) { - WARN("Failed to parse data\n"); + WARN("Failed to parse resource\n"); goto err_out; } }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACEARRAY.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: d6ac5a4b88f852b1cb1fceddeb2b33dfc8c60e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ac5a4b88f852b1cb1fcedde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:10 2013 +0200 d3drm: Avoid LPDIRECT3DRMFACEARRAY. --- dlls/d3drm/meshbuilder.c | 43 ++++++++++++++++--------------------------- include/d3drmobj.h | 18 +++++++++--------- 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 42a5a7e..136065c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -612,15 +612,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFaces(IDirect3DRMMeshBuilder2* iface, - DWORD vcount, D3DVECTOR *vertices, - DWORD ncount, D3DVECTOR *normals, - DWORD *data, - LPDIRECT3DRMFACEARRAY* pFaceArray) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFaces(IDirect3DRMMeshBuilder2 *iface, + DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, + DWORD *face_data, IDirect3DRMFaceArray **array) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%d,%p,%d,%p,%p,%p): stub\n", This, vcount, vertices, ncount, normals, data, pFaceArray); + FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p, array %p stub!\n", + iface, vertex_count, vertices, normal_count, normals, face_data, array); return E_NOTIMPL; } @@ -771,12 +768,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetVertexColorRGB(IDirect3DRMM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFaces(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMFACEARRAY* pFaceArray) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFaces(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMFaceArray **array) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pFaceArray); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -1765,16 +1760,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFaces(IDirect3DRMMeshBuilder3* iface, - DWORD vcount, D3DVECTOR* vertices, - DWORD ncount, D3DVECTOR* normals, - DWORD* data, - LPDIRECT3DRMFACEARRAY* FaceArray) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFaces(IDirect3DRMMeshBuilder3 *iface, + DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals, + DWORD *face_data, IDirect3DRMFaceArray **array) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%d,%p,%d,%p,%p,%p): stub\n", This, vcount, vertices, ncount, - normals, data, FaceArray); + FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p array %p stub!\n", + iface, vertex_count, vertices, normal_count, normals, face_data, array); return E_NOTIMPL; } @@ -1939,12 +1930,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertexColorRGB(IDirect3DRMM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFaces(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACEARRAY* FaceArray) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFaces(IDirect3DRMMeshBuilder3 *iface, + IDirect3DRMFaceArray **array) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, FaceArray); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5576701..a26427d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2513,8 +2513,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; - STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, - LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, + D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; @@ -2528,7 +2528,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE; STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE; STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; - STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(GetVertices)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals, DWORD *face_data_size, DWORD *face_data) PURE; STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; @@ -2684,8 +2684,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE; - STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, - LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, + D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; @@ -2699,7 +2699,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE; STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE; STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; - STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(GetVertices)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals, DWORD *face_data_size, DWORD *face_data) PURE; STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; @@ -2864,8 +2864,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; STDMETHOD(AddFace)(THIS_ IDirect3DRMFace2 *face) PURE; - STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, - LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, + D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE; @@ -2879,7 +2879,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE; STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE; STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE; - STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE; + STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE; STDMETHOD(GetGeometry)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals, DWORD *face_data_size, DWORD *face_data) PURE; STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE;

1 0