wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Stefan Dösinger : wined3d: Don' t drop VBOs for full buffer reloading without conversion.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 46d879eef60d6c2c6c8a7e9daf12b1448bdec7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d879eef60d6c2c6c8a7e9da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 23:28:11 2011 +0100 wined3d: Don't drop VBOs for full buffer reloading without conversion. --- dlls/wined3d/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9e4ae2a..6d44c2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,7 +1002,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) * changes it every minute drop the VBO after VB_MAX_DECL_CHANGES minutes. So count draws without * decl changes and reset the decl change count after a specific number of them */ - if (buffer_is_fully_dirty(buffer)) + if (buffer->conversion_map && buffer_is_fully_dirty(buffer)) { ++buffer->full_conversion_count; if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS)

1 0

Dmitry Timoshkov : user32: Fix the single menu item activation using a hot key.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 629f382a80efe35f3f48c41b4a1aff0fecce8977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629f382a80efe35f3f48c41b4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 12 19:07:45 2011 +0900 user32: Fix the single menu item activation using a hot key. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0e2d9fb..e834cbd 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3397,7 +3397,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) if( uItem == NO_SELECTED_ITEM ) MENU_MoveSelection( hwnd, hTrackMenu, ITEM_NEXT ); else - PostMessageW( hwnd, WM_KEYDOWN, VK_DOWN, 0L ); + PostMessageW( hwnd, WM_KEYDOWN, VK_RETURN, 0 ); } track_menu: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 89e1edf..c3b9493 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12163,7 +12163,7 @@ static void test_menu_messages(void) TranslateMessage(&msg); DispatchMessage(&msg); } - ok_sequence(wm_single_menu_item, "single menu item command", TRUE); + ok_sequence(wm_single_menu_item, "single menu item command", FALSE); set_menu_style(hmenu, 0); style = get_menu_style(hmenu);

1 0

Jacek Caban : mshtml: Use xul.dll directly instead of via xpcom.dll.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: d3a57f8079b7e439138aa444e827dae579b462a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a57f8079b7e439138aa444e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 11:39:20 2011 +0200 mshtml: Use xul.dll directly instead of via xpcom.dll. --- dlls/mshtml/nsembed.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 7b7a84f..fb283e0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -64,7 +64,7 @@ static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,PRBool*); -static HINSTANCE hXPCOM = NULL; +static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; @@ -307,26 +307,26 @@ static void set_environment(LPCWSTR gre_path) } } -static BOOL load_xpcom(const PRUnichar *gre_path) +static BOOL load_xul(const PRUnichar *gre_path) { - static const WCHAR strXPCOM[] = {'\\','x','p','c','o','m','.','d','l','l',0}; + static const WCHAR xul_dllW[] = {'\\','x','u','l','.','d','l','l',0}; WCHAR file_name[MAX_PATH]; strcpyW(file_name, gre_path); - strcatW(file_name, strXPCOM); + strcatW(file_name, xul_dllW); TRACE("(%s)\n", debugstr_w(file_name)); set_environment(gre_path); - hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); - if(!hXPCOM) { + xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if(!xul_handle) { WARN("Could not load XPCOM: %d\n", GetLastError()); return FALSE; } #define NS_DLSYM(func) \ - func = (void *)GetProcAddress(hXPCOM, #func); \ + func = (void *)GetProcAddress(xul_handle, #func "_P"); \ if(!func) \ ERR("Could not GetProcAddress(" #func ") failed\n") @@ -407,7 +407,7 @@ static BOOL load_wine_gecko_v(PRUnichar *gre_path, HKEY mshtml_key, if(!check_version(gre_path, version_string)) return FALSE; - return load_xpcom(gre_path); + return load_xul(gre_path); } static BOOL load_wine_gecko(PRUnichar *gre_path) @@ -568,14 +568,14 @@ static BOOL init_xpcom(const PRUnichar *gre_path) nsAString_Finish(&path); if(NS_FAILED(nsres)) { ERR("NS_NewLocalFile failed: %08x\n", nsres); - FreeLibrary(hXPCOM); + FreeLibrary(xul_handle); return FALSE; } nsres = NS_InitXPCOM2(&pServMgr, gre_dir, &nsDirectoryServiceProvider); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08x\n", nsres); - FreeLibrary(hXPCOM); + FreeLibrary(xul_handle); return FALSE; }

1 0

Francois Gouget : programs: Standardize the About menus.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: d1b51d85021a1730e95de9e1e0194d3737f6d315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b51d85021a1730e95de9e1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 12 10:57:30 2011 +0200 programs: Standardize the About menus. --- dlls/user32/user32.rc | 2 +- po/ar.po | 565 ++++++++++++++++++++-------------------- po/bg.po | 568 ++++++++++++++++++++-------------------- po/ca.po | 565 ++++++++++++++++++++-------------------- po/cs.po | 572 +++++++++++++++++++++-------------------- po/da.po | 572 +++++++++++++++++++++-------------------- po/de.po | 572 +++++++++++++++++++++-------------------- po/el.po | 562 ++++++++++++++++++++-------------------- po/en.po | 570 ++++++++++++++++++++-------------------- po/en_US.po | 572 ++++++++++++++++++++-------------------- po/eo.po | 566 ++++++++++++++++++++-------------------- po/es.po | 572 +++++++++++++++++++++-------------------- po/fa.po | 565 ++++++++++++++++++++-------------------- po/fi.po | 569 ++++++++++++++++++++-------------------- po/fr.po | 572 +++++++++++++++++++++-------------------- po/he.po | 572 +++++++++++++++++++++-------------------- po/hi.po | 569 ++++++++++++++++++++-------------------- po/hu.po | 569 ++++++++++++++++++++-------------------- po/it.po | 572 +++++++++++++++++++++-------------------- po/ja.po | 572 +++++++++++++++++++++-------------------- po/ko.po | 572 +++++++++++++++++++++-------------------- po/lt.po | 572 +++++++++++++++++++++-------------------- po/ml.po | 569 ++++++++++++++++++++-------------------- po/nb_NO.po | 572 +++++++++++++++++++++-------------------- po/nl.po | 572 +++++++++++++++++++++-------------------- po/or.po | 569 ++++++++++++++++++++-------------------- po/pa.po | 569 ++++++++++++++++++++-------------------- po/pl.po | 572 +++++++++++++++++++++-------------------- po/pt_BR.po | 572 +++++++++++++++++++++-------------------- po/pt_PT.po | 572 +++++++++++++++++++++-------------------- po/rm.po | 571 ++++++++++++++++++++-------------------- po/ro.po | 572 +++++++++++++++++++++-------------------- po/ru.po | 572 +++++++++++++++++++++-------------------- po/sk.po | 568 ++++++++++++++++++++-------------------- po/sl.po | 572 +++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 566 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 566 ++++++++++++++++++++-------------------- po/sv.po | 572 +++++++++++++++++++++-------------------- po/te.po | 569 ++++++++++++++++++++-------------------- po/th.po | 563 ++++++++++++++++++++-------------------- po/tr.po | 572 +++++++++++++++++++++-------------------- po/uk.po | 572 +++++++++++++++++++++-------------------- po/wa.po | 566 ++++++++++++++++++++-------------------- po/wine.pot | 562 ++++++++++++++++++++-------------------- po/zh_CN.po | 572 +++++++++++++++++++++-------------------- po/zh_TW.po | 572 +++++++++++++++++++++-------------------- programs/clock/clock.rc | 2 +- programs/cmdlgtst/En.rc | 2 +- programs/notepad/notepad.rc | 3 +- programs/progman/progman.rc | 3 +- programs/regedit/regedit.rc | 1 - programs/taskmgr/taskmgr.rc | 1 - programs/winefile/winefile.rc | 3 +- programs/winemine/winemine.rc | 2 +- programs/winhlp32/winhlp32.rc | 1 - 55 files changed, 12883 insertions(+), 12771 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b51d85021a1730e95de…

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DCubeTexture9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 29116e24003f1bb64d3f30ba9944fe288b653cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=29116e24003f1bb64d3f30ba9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:17:09 2011 +0200 d3d9: COM cleanup for the IDirect3DCubeTexture9 iface. --- dlls/d3d9/cubetexture.c | 112 ++++++++++++++++++++++++++++----------------- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 +- 3 files changed, 73 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29116e24003f1bb64d3f3…

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DStateBlock9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: a991b6708b4eb5a72f59c6c08ccbd0ea7b7266a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a991b6708b4eb5a72f59c6c08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:10:34 2011 +0200 d3d9: COM cleanup for the IDirect3DStateBlock9 iface. --- dlls/d3d9/d3d9_private.h | 5 ++--- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/stateblock.c | 39 +++++++++++++++++++++++++-------------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 0947a54..4d13ce7 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -377,15 +377,14 @@ HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice * IDirect3DStateBlock9 implementation structure */ typedef struct IDirect3DStateBlock9Impl { - /* IUnknown fields */ - const IDirect3DStateBlock9Vtbl *lpVtbl; + IDirect3DStateBlock9 IDirect3DStateBlock9_iface; LONG ref; /* IDirect3DStateBlock9 fields */ struct wined3d_stateblock *wined3d_stateblock; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DStateBlock9Impl; HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd5b167..1f38f36 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1509,7 +1509,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex * } TRACE("Created stateblock %p.\n", object); - *stateblock = (IDirect3DStateBlock9 *)object; + *stateblock = &object->IDirect3DStateBlock9_iface; return D3D_OK; } @@ -1568,7 +1568,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *ifa } TRACE("Created stateblock %p.\n", object); - *stateblock = (IDirect3DStateBlock9 *)object; + *stateblock = &object->IDirect3DStateBlock9_iface; return D3D_OK; } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 13f2b9f..46a4de5 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -25,9 +25,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -/* IDirect3DStateBlock9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DStateBlock9Impl, IDirect3DStateBlock9_iface); +} + +static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, + REFIID riid, void **ppobj) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -43,8 +49,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLO return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -52,8 +59,9 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) return ref; } -static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static ULONG WINAPI IDirect3DStateBlock9Impl_Release(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -70,9 +78,10 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface } /* IDirect3DStateBlock9 Interface follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, + IDirect3DDevice9 **device) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -84,8 +93,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -97,8 +107,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 ifa return hr; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -128,7 +139,7 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im { HRESULT hr; - stateblock->lpVtbl = &Direct3DStateBlock9_Vtbl; + stateblock->IDirect3DStateBlock9_iface.lpVtbl = &Direct3DStateBlock9_Vtbl; stateblock->ref = 1; if (wined3d_stateblock)

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DQuery9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 78ea105b85c18b7e840a6a600898e5f256d99319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea105b85c18b7e840a6a600… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:04:02 2011 +0200 d3d9: COM cleanup for the IDirect3DQuery9 iface. --- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 4 +- dlls/d3d9/query.c | 51 ++++++++++++++++++++++++++++----------------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f1c0a8c..0947a54 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -465,15 +465,14 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DQuery9Impl { - /* IUnknown fields */ - const IDirect3DQuery9Vtbl *lpVtbl; + IDirect3DQuery9 IDirect3DQuery9_iface; LONG ref; /* IDirect3DQuery9 fields */ struct wined3d_query *wineD3DQuery; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DQuery9Impl; HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9565815..bd5b167 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2706,8 +2706,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(IDirect3DDevice9Ex *iface } TRACE("Created query %p.\n", object); - if (query) *query = (IDirect3DQuery9 *)object; - else IDirect3DQuery9_Release((IDirect3DQuery9 *)object); + if (query) *query = &object->IDirect3DQuery9_iface; + else IDirect3DQuery9_Release(&object->IDirect3DQuery9_iface); return D3D_OK; } diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 34debd9..918c21f 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -25,9 +25,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -/* IDirect3DQuery9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DQuery9Impl, IDirect3DQuery9_iface); +} + +static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -43,8 +49,9 @@ static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static ULONG WINAPI IDirect3DQuery9Impl_AddRef(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -52,8 +59,9 @@ static ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { return ref; } -static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static ULONG WINAPI IDirect3DQuery9Impl_Release(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -69,10 +77,10 @@ static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { return ref; } -/* IDirect3DQuery9 Interface follow: */ -static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, + IDirect3DDevice9 **device) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -84,8 +92,9 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, IDir return D3D_OK; } -static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -97,8 +106,9 @@ static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { return hr; } -static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); DWORD ret; TRACE("iface %p.\n", iface); @@ -110,8 +120,9 @@ static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { return ret; } -static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dwIssueFlags) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static HRESULT WINAPI IDirect3DQuery9Impl_Issue(IDirect3DQuery9 *iface, DWORD dwIssueFlags) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, flags %#x.\n", iface, dwIssueFlags); @@ -123,8 +134,10 @@ static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dw return hr; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static HRESULT WINAPI IDirect3DQuery9Impl_GetData(IDirect3DQuery9 *iface, void *pData, + DWORD dwSize, DWORD dwGetDataFlags) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, data %p, size %u, flags %#x.\n", @@ -154,7 +167,7 @@ HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, D3D { HRESULT hr; - query->lpVtbl = &Direct3DQuery9_Vtbl; + query->IDirect3DQuery9_iface.lpVtbl = &Direct3DQuery9_Vtbl; query->ref = 1; wined3d_mutex_lock();

1 0

Rico Schüller : d3dx9: Parse value data.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 0f10e1b3442b4d629a36007a1a76c4060c78501e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f10e1b3442b4d629a36007a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:39 2011 +0200 d3dx9: Parse value data. --- dlls/d3dx9_36/effect.c | 130 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 120 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 67877ec..f31ac31 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -36,6 +36,7 @@ struct d3dx_parameter char *name; char *semantic; + void *data; D3DXPARAMETER_CLASS class; D3DXPARAMETER_TYPE type; UINT rows; @@ -111,23 +112,28 @@ static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) return (D3DXHANDLE) parameter; } -static void free_parameter(D3DXHANDLE handle, BOOL element) +static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); - TRACE("Free parameter %p\n", param); + TRACE("Free parameter %p, child %s\n", param, child ? "yes" : "no"); if (!param) { return; } + if (!child) + { + HeapFree(GetProcessHeap(), 0, param->data); + } + if (param->annotation_handles) { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(param->annotation_handles[i], FALSE); + free_parameter(param->annotation_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, param->annotation_handles); } @@ -141,7 +147,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element) for (i = 0; i < count; ++i) { - free_parameter(param->member_handles[i], param->element_count != 0); + free_parameter(param->member_handles[i], param->element_count != 0, TRUE); } HeapFree(GetProcessHeap(), 0, param->member_handles); } @@ -166,7 +172,7 @@ static void free_base_effect(struct ID3DXBaseEffectImpl *base) { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(base->parameter_handles[i], FALSE); + free_parameter(base->parameter_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, base->parameter_handles); } @@ -2406,6 +2412,100 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) +{ + unsigned int i; + HRESULT hr; + UINT old_size = 0; + + if (param->element_count) + { + param->data = value; + + for (i = 0; i < param->element_count; ++i) + { + struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); + + hr = d3dx9_parse_value(member, (char *)value + old_size); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } + + old_size += member->bytes; + } + + return D3D_OK; + } + + switch(param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + param->data = value; + break; + + case D3DXPC_STRUCT: + param->data = value; + + for (i = 0; i < param->member_count; ++i) + { + struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); + + hr = d3dx9_parse_value(member, (char *)value + old_size); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } + + old_size += member->bytes; + } + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + + return D3D_OK; +} + + +static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *ptr) +{ + UINT size = param->bytes; + HRESULT hr; + void *value; + + TRACE("param size: %u\n", size); + + value = HeapAlloc(GetProcessHeap(), 0, size); + if (!value) + { + ERR("Failed to allocate data memory.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Data: %s.\n", debugstr_an(ptr, size)); + memcpy(value, ptr, size); + + hr = d3dx9_parse_value(param, value); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + HeapFree(GetProcessHeap(), 0, value); + return hr; + } + + param->data = value; + + return D3D_OK; +} + static HRESULT d3dx9_parse_name(char **name, const char *ptr) { DWORD size; @@ -2609,7 +2709,7 @@ err_out: for (i = 0; i < count; ++i) { - free_parameter(member_handles[i], param->element_count != 0); + free_parameter(member_handles[i], param->element_count != 0, TRUE); } HeapFree(GetProcessHeap(), 0, member_handles); } @@ -2645,7 +2745,12 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - /* todo: Parse value */ + hr = d3dx9_parse_init_value(anno, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } return D3D_OK; } @@ -2678,7 +2783,12 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const return hr; } - /* todo: Parse value */ + hr = d3dx9_parse_init_value(param, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse value\n"); + return hr; + } if (param->annotation_count) { @@ -2724,7 +2834,7 @@ err_out: { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(annotation_handles[i], FALSE); + free_parameter(annotation_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, annotation_handles); } @@ -2793,7 +2903,7 @@ err_out: { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(parameter_handles[i], FALSE); + free_parameter(parameter_handles[i], FALSE, FALSE); } HeapFree(GetProcessHeap(), 0, parameter_handles); }

1 0

Rico Schüller : d3dx9: Parse name and semantics.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 53d0a02c20c80d66b31636e76595f4823835fdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d0a02c20c80d66b31636e76… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:37 2011 +0200 d3dx9: Parse name and semantics. --- dlls/d3dx9_36/effect.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a7c2b6e..67877ec 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -34,6 +34,8 @@ struct d3dx_parameter { struct ID3DXBaseEffectImpl *base; + char *name; + char *semantic; D3DXPARAMETER_CLASS class; D3DXPARAMETER_TYPE type; UINT rows; @@ -109,7 +111,7 @@ static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) return (D3DXHANDLE) parameter; } -static void free_parameter(D3DXHANDLE handle) +static void free_parameter(D3DXHANDLE handle, BOOL element) { unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); @@ -125,7 +127,7 @@ static void free_parameter(D3DXHANDLE handle) { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(param->annotation_handles[i]); + free_parameter(param->annotation_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, param->annotation_handles); } @@ -139,11 +141,18 @@ static void free_parameter(D3DXHANDLE handle) for (i = 0; i < count; ++i) { - free_parameter(param->member_handles[i]); + free_parameter(param->member_handles[i], param->element_count != 0); } HeapFree(GetProcessHeap(), 0, param->member_handles); } + /* only the parent has to release name and semantic */ + if (!element) + { + HeapFree(GetProcessHeap(), 0, param->name); + HeapFree(GetProcessHeap(), 0, param->semantic); + } + HeapFree(GetProcessHeap(), 0, param); } @@ -157,7 +166,7 @@ static void free_base_effect(struct ID3DXBaseEffectImpl *base) { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(base->parameter_handles[i]); + free_parameter(base->parameter_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, base->parameter_handles); } @@ -2397,6 +2406,31 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_name(char **name, const char *ptr) +{ + DWORD size; + + read_dword(&ptr, &size); + TRACE("Name size: %#x\n", size); + + if (!size) + { + return D3D_OK; + } + + *name = HeapAlloc(GetProcessHeap(), 0, size); + if (!*name) + { + ERR("Failed to allocate name memory.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Name: %s.\n", debugstr_an(ptr, size)); + memcpy(*name, ptr, size); + + return D3D_OK; +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent) { DWORD offset; @@ -2414,11 +2448,21 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch read_dword(ptr, &offset); TRACE("Type name offset: %#x\n", offset); - /* todo: Parse name */ + hr = d3dx9_parse_name(&param->name, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse name\n"); + goto err_out; + } read_dword(ptr, &offset); TRACE("Type semantic offset: %#x\n", offset); - /* todo: Parse semantic */ + hr = d3dx9_parse_name(&param->semantic, data + offset); + if (hr != D3D_OK) + { + WARN("Failed to parse semantic\n"); + goto err_out; + } read_dword(ptr, &param->element_count); TRACE("Elements: %u\n", param->element_count); @@ -2464,6 +2508,8 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch /* elements */ param->type = parent->type; param->class = parent->class; + param->name = parent->name; + param->semantic = parent->semantic; param->element_count = 0; param->annotation_count = 0; param->member_count = parent->member_count; @@ -2563,11 +2609,19 @@ err_out: for (i = 0; i < count; ++i) { - free_parameter(member_handles[i]); + free_parameter(member_handles[i], param->element_count != 0); } HeapFree(GetProcessHeap(), 0, member_handles); } + if (!parent) + { + HeapFree(GetProcessHeap(), 0, param->name); + HeapFree(GetProcessHeap(), 0, param->semantic); + } + param->name = NULL; + param->semantic = NULL; + return hr; } @@ -2670,7 +2724,7 @@ err_out: { for (i = 0; i < param->annotation_count; ++i) { - free_parameter(annotation_handles[i]); + free_parameter(annotation_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, annotation_handles); } @@ -2739,7 +2793,7 @@ err_out: { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(parameter_handles[i]); + free_parameter(parameter_handles[i], FALSE); } HeapFree(GetProcessHeap(), 0, parameter_handles); }

1 0

Rico Schüller : d3dx9: Parse effect type D3DXPC_STRUCT .
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: e4a0ef69f5fec3c82d5df693c1ecc38900a830d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0ef69f5fec3c82d5df693c… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 11 21:20:34 2011 +0200 d3dx9: Parse effect type D3DXPC_STRUCT. --- dlls/d3dx9_36/effect.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e93706..a7c2b6e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -132,7 +132,12 @@ static void free_parameter(D3DXHANDLE handle) if (param->member_handles) { - for (i = 0; i < param->element_count; ++i) + unsigned int count; + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) { free_parameter(param->member_handles[i]); } @@ -2444,6 +2449,11 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = 4 * param->rows * param->columns; break; + case D3DXPC_STRUCT: + read_dword(ptr, &param->member_count); + TRACE("Members: %u\n", param->member_count); + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -2502,6 +2512,41 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = param_bytes; } + else if (param->member_count) + { + member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->member_count); + if (!member_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < param->member_count; ++i) + { + struct d3dx_parameter *member; + + member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); + if (!member) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + member_handles[i] = get_parameter_handle(member); + member->base = param->base; + + hr = d3dx9_parse_effect_typedef(member, data, ptr, NULL); + if (hr != D3D_OK) + { + WARN("Failed to parse member\n"); + goto err_out; + } + + param->bytes += member->bytes; + } + } param->member_handles = member_handles; @@ -2511,7 +2556,12 @@ err_out: if (member_handles) { - for (i = 0; i < param->element_count; ++i) + unsigned int count; + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) { free_parameter(member_handles[i]); }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011