wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

André Hentschel : uxtheme: Add OpenThemeDataEx.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0304a3e998d917be8bcf2ad5680ab500c9b646c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0304a3e998d917be8bcf2ad56… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 23 19:29:59 2011 +0100 uxtheme: Add OpenThemeDataEx. --- dlls/uxtheme/system.c | 17 ++++++++++++++--- dlls/uxtheme/uxtheme.spec | 2 +- include/uxtheme.h | 5 +++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index b84e978..60e55ee 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -630,16 +630,19 @@ static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, } /*********************************************************************** - * OpenThemeData (UXTHEME.@) + * OpenThemeDataEx (UXTHEME.61) */ -HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR pszClassList) +HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) { WCHAR szAppBuff[256]; WCHAR szClassBuff[256]; LPCWSTR pszAppName; LPCWSTR pszUseClassList; HTHEME hTheme = NULL; - TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); + TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + + if(flags) + FIXME("unhandled flags: %x\n", flags); if(bThemeActive) { @@ -659,6 +662,14 @@ HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR pszClassList) } /*********************************************************************** + * OpenThemeData (UXTHEME.@) + */ +HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist) +{ + return OpenThemeDataEx(hwnd, classlist, 0); +} + +/*********************************************************************** * GetWindowTheme (UXTHEME.@) * * Retrieve the last theme opened for a window. diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index f44aa6e..198957a 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -38,7 +38,7 @@ 46 stub -noname ClassicAdjustWindowRectEx 48 stub -noname GetThemeParseErrorInfo 60 stub -noname CreateThemeDataFromObjects -61 stub -noname OpenThemeDataEx +61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection diff --git a/include/uxtheme.h b/include/uxtheme.h index ef369dc..8e65f56 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -160,6 +160,10 @@ HTHEME WINAPI GetWindowTheme(HWND); #define HTTB_SIZINGTEMPLATE 0x0100 #define HTTB_SYSTEMSIZINGMARGINS 0x0200 +#define OTD_FORCE_RECT_SIZING 0x0001 +#define OTD_NONCLIENT 0x0002 +#define OTD_VALIDBITS (OTD_FORCE_RECT_SIZING | OTD_NONCLIENT) + HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, HRGN,POINT,WORD*); BOOL WINAPI IsAppThemed(void); @@ -168,6 +172,7 @@ BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int); BOOL WINAPI IsThemeDialogTextureEnabled(HWND); BOOL WINAPI IsThemePartDefined(HTHEME,int,int); HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); +HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD); void WINAPI SetThemeAppProperties(DWORD); HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);

1 0

David Hedberg : user32: Fix return value when passing a non-sibling preceding window to SetWindowPos .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: c764210731d4d4b6fda53bf27e2150b704e09ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c764210731d4d4b6fda53bf27… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 02:40:46 2011 +0100 user32: Fix return value when passing a non-sibling preceding window to SetWindowPos. Acrobat Reader relies on SetWindowPos, with hwndInsertAfter set to a non-sibling window and no SWP_NOZORDER passed, to return true. --- dlls/user32/tests/win.c | 22 +++++++++------------- dlls/user32/winpos.c | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 67601b1..278a282 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2064,7 +2064,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) /* Returns TRUE also for windows that are not siblings */ ret = SetWindowPos(hwnd_child, hwnd2, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); - todo_wine ok(ret, "Got %d\n", ret); + ok(ret, "Got %d\n", ret); check_active_state(hwnd2, hwnd2, hwnd2); ret = SetWindowPos(hwnd2, hwnd_child, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); @@ -2074,7 +2074,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) /* Does not seem to do anything even without passing flags, still returns TRUE */ GetWindowRect(hwnd_child, &rc1); ret = SetWindowPos(hwnd_child, hwnd2 , 1, 2, 3, 4, 0); - todo_wine ok(ret, "Got %d\n", ret); + ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); ok(rc1.left == rc2.left && rc1.top == rc2.top && rc1.right == rc2.right && rc1.bottom == rc2.bottom, @@ -2087,20 +2087,16 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd2, hwnd_child, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd2, &rc2); - todo_wine - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", - rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); + ok(rc1.left == rc2.left && rc1.top == rc2.top && + rc1.right == rc2.right && rc1.bottom == rc2.bottom, + "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); - /* Restore window */ - SetWindowPos(hwnd2, HWND_TOP, rc1.left, rc1.top, rc1.right-rc1.left, rc1.bottom-rc1.top, 0); - /* .. and with these windows. */ GetWindowRect(hwnd_grandchild, &rc1); ret = SetWindowPos(hwnd_grandchild, hwnd_child2, 1, 2, 3, 4, 0); - todo_wine ok(ret, "Got %d\n", ret); + ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_grandchild, &rc2); ok(rc1.left == rc2.left && rc1.top == rc2.top && rc1.right == rc2.right && rc1.bottom == rc2.bottom, @@ -2154,8 +2150,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) check_active_state(hwnd2, hwnd2, hwnd2); ret = SetWindowPos(hwnd, hwnd_desktop, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); - todo_wine ok(!ret, "Got %d\n", ret); - todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + ok(!ret, "Got %d\n", ret); + check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_grandchild); DestroyWindow(hwnd_child); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 789238f..57ccb81 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1902,11 +1902,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) /* Check hwndInsertAfter */ if (winpos->flags & SWP_NOZORDER) goto done; - /* fix sign extension */ - if (winpos->hwndInsertAfter == (HWND)0xffff) winpos->hwndInsertAfter = HWND_TOPMOST; - else if (winpos->hwndInsertAfter == (HWND)0xfffe) winpos->hwndInsertAfter = HWND_NOTOPMOST; - - /* hwndInsertAfter must be a sibling of the window */ if (winpos->hwndInsertAfter == HWND_TOP) { if (GetWindow(winpos->hwnd, GW_HWNDFIRST) == winpos->hwnd) @@ -1929,16 +1924,9 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) } else { - if (GetAncestor( winpos->hwndInsertAfter, GA_PARENT ) != parent) ret = FALSE; - else - { - /* don't need to change the Zorder of hwnd if it's already inserted - * after hwndInsertAfter or when inserting hwnd after itself. - */ - if ((winpos->hwnd == winpos->hwndInsertAfter) || - (winpos->hwnd == GetWindow( winpos->hwndInsertAfter, GW_HWNDNEXT ))) - winpos->flags |= SWP_NOZORDER; - } + if ((winpos->hwnd == winpos->hwndInsertAfter) || + (winpos->hwnd == GetWindow( winpos->hwndInsertAfter, GW_HWNDNEXT ))) + winpos->flags |= SWP_NOZORDER; } done: WIN_ReleasePtr( wndPtr ); @@ -2033,8 +2021,29 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) UINT orig_flags; orig_flags = winpos->flags; - - /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ + + /* First, check z-order arguments. */ + if (!(winpos->flags & SWP_NOZORDER)) + { + /* fix sign extension */ + if (winpos->hwndInsertAfter == (HWND)0xffff) winpos->hwndInsertAfter = HWND_TOPMOST; + else if (winpos->hwndInsertAfter == (HWND)0xfffe) winpos->hwndInsertAfter = HWND_NOTOPMOST; + + if (!(winpos->hwndInsertAfter == HWND_TOP || + winpos->hwndInsertAfter == HWND_BOTTOM || + winpos->hwndInsertAfter == HWND_TOPMOST || + winpos->hwndInsertAfter == HWND_NOTOPMOST)) + { + HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); + HWND insertafter_parent = GetAncestor( winpos->hwndInsertAfter, GA_PARENT ); + + /* hwndInsertAfter must be a sibling of the window */ + if (!insertafter_parent) return FALSE; + if (insertafter_parent != parent) return TRUE; + } + } + + /* Make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOMOVE)) { if (winpos->x < -32768) winpos->x = -32768;

1 0

David Hedberg : user32/tests: Add some more tests for SetWindowPos.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 955ec5017330aecc6bf4d462fe2c3b0a63fa1592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955ec5017330aecc6bf4d462f… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 02:40:45 2011 +0100 user32/tests: Add some more tests for SetWindowPos. --- dlls/user32/tests/win.c | 219 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 175 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=955ec5017330aecc6bf4d…

1 0

Rico Schüller : d3dx9: Use init function for ID3DXBuffer.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 22abfd6edce6d396ea4cf54426ff8f6aafd41ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22abfd6edce6d396ea4cf5442… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:49 2011 +0200 d3dx9: Use init function for ID3DXBuffer. --- dlls/d3dx9_36/core.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index d94fae5..06a8305 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -116,27 +116,45 @@ static const struct ID3DXBufferVtbl ID3DXBufferImpl_Vtbl = ID3DXBufferImpl_GetBufferSize }; +static HRESULT d3dx9_buffer_init(struct ID3DXBufferImpl *buffer, DWORD size) +{ + buffer->ID3DXBuffer_iface.lpVtbl = &ID3DXBufferImpl_Vtbl; + buffer->ref = 1; + buffer->size = size; + + buffer->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!buffer->buffer) + { + ERR("Failed to allocate buffer memory\n"); + return E_OUTOFMEMORY; + } + + return D3D_OK; +} + HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) { struct ID3DXBufferImpl *object; + HRESULT hr; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (object == NULL) + if (!object) { - *buffer = NULL; + ERR("Failed to allocate buffer memory\n"); return E_OUTOFMEMORY; } - object->ID3DXBuffer_iface.lpVtbl = &ID3DXBufferImpl_Vtbl; - object->ref = 1; - object->size = size; - object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (object->buffer == NULL) + + hr = d3dx9_buffer_init(object, size); + if (FAILED(hr)) { + WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *buffer = NULL; - return E_OUTOFMEMORY; + return hr; } *buffer = &object->ID3DXBuffer_iface; + + TRACE("Created ID3DBuffer %p\n", *buffer); + return D3D_OK; }

1 0

Rico Schüller : d3dx9: Add a some TRACEs to ID3DXBufferImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 87f6f86ce9c54bff026db3013ff818b6303a368c URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f6f86ce9c54bff026db3013… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:46 2011 +0200 d3dx9: Add a some TRACEs to ID3DXBufferImpl. --- dlls/d3dx9_36/core.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 22a5ccf..d94fae5 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -46,17 +46,18 @@ static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) { - struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return D3D_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + return E_NOINTERFACE; } @@ -65,7 +66,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u\n", This, ref); return ref; } @@ -75,25 +76,32 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u\n", This, ref); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This->buffer); HeapFree(GetProcessHeap(), 0, This); } + return ref; } static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) { struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + + TRACE("iface %p\n", iface); + return This->buffer; } static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + + TRACE("iface %p\n", iface); + return This->size; }

1 0

Rico Schüller : d3dx9: Rename some variables.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 404de72fe097d325eeed30625e99721242cab3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=404de72fe097d325eeed30625… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:43 2011 +0200 d3dx9: Rename some variables. --- dlls/d3dx9_36/core.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 26eec9b..22a5ccf 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -35,8 +35,8 @@ struct ID3DXBufferImpl ID3DXBuffer ID3DXBuffer_iface; LONG ref; - DWORD *buffer; - DWORD bufferSize; + void *buffer; + DWORD size; }; static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) @@ -94,39 +94,41 @@ static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); - return This->bufferSize; + return This->size; } -const ID3DXBufferVtbl D3DXBuffer_Vtbl = +static const struct ID3DXBufferVtbl ID3DXBufferImpl_Vtbl = { + /* IUnknown methods */ ID3DXBufferImpl_QueryInterface, ID3DXBufferImpl_AddRef, ID3DXBufferImpl_Release, + /* ID3DXBuffer methods */ ID3DXBufferImpl_GetBufferPointer, ID3DXBufferImpl_GetBufferSize }; -HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) +HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) { struct ID3DXBufferImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL) { - *ppBuffer = NULL; + *buffer = NULL; return E_OUTOFMEMORY; } - object->ID3DXBuffer_iface.lpVtbl = &D3DXBuffer_Vtbl; + object->ID3DXBuffer_iface.lpVtbl = &ID3DXBufferImpl_Vtbl; object->ref = 1; - object->bufferSize = NumBytes; - object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); + object->size = size; + object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (object->buffer == NULL) { HeapFree(GetProcessHeap(), 0, object); - *ppBuffer = NULL; + *buffer = NULL; return E_OUTOFMEMORY; } - *ppBuffer = &object->ID3DXBuffer_iface; + *buffer = &object->ID3DXBuffer_iface; return D3D_OK; }

1 0

Rico Schüller : d3dx9: Remove typedef from ID3DXBufferImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 62c1fb0941a723b399f6f31e91d4a3cd10eb5574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c1fb0941a723b399f6f31e9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:40 2011 +0200 d3dx9: Remove typedef from ID3DXBufferImpl. --- dlls/d3dx9_36/core.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index c1e9641..26eec9b 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -30,23 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -typedef struct ID3DXBufferImpl +struct ID3DXBufferImpl { ID3DXBuffer ID3DXBuffer_iface; LONG ref; DWORD *buffer; DWORD bufferSize; -} ID3DXBufferImpl; +}; -static inline ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) +static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) { - return CONTAINING_RECORD(iface, ID3DXBufferImpl, ID3DXBuffer_iface); + return CONTAINING_RECORD(iface, struct ID3DXBufferImpl, ID3DXBuffer_iface); } static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) @@ -62,7 +62,7 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); @@ -72,7 +72,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); @@ -87,13 +87,13 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->buffer; } static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->bufferSize; } @@ -108,7 +108,7 @@ const ID3DXBufferVtbl D3DXBuffer_Vtbl = HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { - ID3DXBufferImpl *object; + struct ID3DXBufferImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL)

1 0

Rico Schüller : d3dx9: Use variable instead of type in HeapAlloc.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 98001ca8c84e880cbbb788ba3a2ba0ce0e663722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98001ca8c84e880cbbb788ba3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:37 2011 +0200 d3dx9: Use variable instead of type in HeapAlloc. --- dlls/d3dx9_36/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 6990fbd..c1e9641 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -110,7 +110,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { ID3DXBufferImpl *object; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL) { *ppBuffer = NULL;

1 0

Rico Schüller : d3dx9: Don' t zero memory when it will be overridden.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 41e34d77c51734b54ef6240f133a7b9a9c9382dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e34d77c51734b54ef6240f1… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:08 2011 +0200 d3dx9: Don't zero memory when it will be overridden. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d06c9ac..3f89eb8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2684,7 +2684,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); + srcfileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectFromFileExW(device, srcfileW, defines, include, skipconstants, flags, pool, effect, compilationerrors); @@ -2821,7 +2821,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); + srcfileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectCompilerFromFileW(srcfileW, defines, include, flags, effectcompiler, parseerrors);

1 0

Hans Leidekker : msi: Avoid sprintf for simple concatenations.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 6f552fd2f72d42097e684fb19e5987582b3154a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f552fd2f72d42097e684fb19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:32:39 2011 +0200 msi: Avoid sprintf for simple concatenations. --- dlls/msi/package.c | 5 +- dlls/msi/registry.c | 342 +++++++++++++++++++++----------------------------- 2 files changed, 147 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f552fd2f72d42097e684…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
85
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 March 2011