March 2011 - Wine-commits - list.winehq.org

Francois Gouget : msxml3/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 7c676fbfd4759169eedb8200094b5f6ddeeb8565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c676fbfd4759169eedb82000… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:40:31 2011 +0200 msxml3/tests: Add a '\n' to an ok() call. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 29c20bf..650f3d5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7287,7 +7287,7 @@ static void test_nodeTypedValue(void) if (entry->type == (VT_ARRAY|VT_UI1)) { ok(!memcmp( V_BSTR(&value), entry->value, strlen(entry->value)), - "expected %s", entry->value); + "expected %s\n", entry->value); } else ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,

1 0

Francois Gouget : openal32: Make a bunch of wrapper functions static.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 09ba4265017814586f6a3081a7e604dfee6c1e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ba4265017814586f6a3081a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:41:12 2011 +0200 openal32: Make a bunch of wrapper functions static. --- dlls/openal32/openal.c | 72 ++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 784fbb5..b2bb2da 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -545,7 +545,7 @@ ALvoid CDECL wine_alBufferData(ALuint bid, ALenum format, const ALvoid* data, AL alBufferData(bid, format, data, size, freq); } -ALvoid CDECL wine_alBufferDataStatic(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq) +static ALvoid CDECL wine_alBufferDataStatic(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq) { alBufferDataStatic(bid, format, data, size, freq); } @@ -689,176 +689,176 @@ ALvoid CDECL wine_alSpeedOfSound(ALfloat value) } /* OpenAL EFX extension functions */ -ALvoid CDECL wine_alGenFilters(ALsizei n, ALuint* filters) +static ALvoid CDECL wine_alGenFilters(ALsizei n, ALuint* filters) { alGenFilters(n, filters); } -ALvoid CDECL wine_alDeleteFilters(ALsizei n, const ALuint* filters) +static ALvoid CDECL wine_alDeleteFilters(ALsizei n, const ALuint* filters) { alDeleteFilters(n, filters); } -ALboolean CDECL wine_alIsFilter(ALuint fid) +static ALboolean CDECL wine_alIsFilter(ALuint fid) { return alIsFilter(fid); } -ALvoid CDECL wine_alFilterf(ALuint fid, ALenum param, ALfloat value) +static ALvoid CDECL wine_alFilterf(ALuint fid, ALenum param, ALfloat value) { alFilterf(fid, param, value); } -ALvoid CDECL wine_alFilterfv(ALuint fid, ALenum param, const ALfloat* values) +static ALvoid CDECL wine_alFilterfv(ALuint fid, ALenum param, const ALfloat* values) { alFilterfv(fid, param, values); } -ALvoid CDECL wine_alFilteri(ALuint fid, ALenum param, ALint value) +static ALvoid CDECL wine_alFilteri(ALuint fid, ALenum param, ALint value) { alFilteri(fid, param, value); } -ALvoid CDECL wine_alFilteriv(ALuint fid, ALenum param, const ALint* values) +static ALvoid CDECL wine_alFilteriv(ALuint fid, ALenum param, const ALint* values) { alFilteriv(fid, param, values); } -ALvoid CDECL wine_alGetFilterf(ALuint fid, ALenum param, ALfloat* value) +static ALvoid CDECL wine_alGetFilterf(ALuint fid, ALenum param, ALfloat* value) { alGetFilterf(fid, param, value); } -ALvoid CDECL wine_alGetFilterfv(ALuint fid, ALenum param, ALfloat* values) +static ALvoid CDECL wine_alGetFilterfv(ALuint fid, ALenum param, ALfloat* values) { alGetFilterfv(fid, param, values); } -ALvoid CDECL wine_alGetFilteri(ALuint fid, ALenum param, ALint* value) +static ALvoid CDECL wine_alGetFilteri(ALuint fid, ALenum param, ALint* value) { alGetFilteri(fid, param, value); } -ALvoid CDECL wine_alGetFilteriv(ALuint fid, ALenum param, ALint* values) +static ALvoid CDECL wine_alGetFilteriv(ALuint fid, ALenum param, ALint* values) { alGetFilteriv(fid, param, values); } -ALvoid CDECL wine_alGenEffects(ALsizei n, ALuint* effects) +static ALvoid CDECL wine_alGenEffects(ALsizei n, ALuint* effects) { alGenEffects(n, effects); } -ALvoid CDECL wine_alDeleteEffects(ALsizei n, const ALuint* effects) +static ALvoid CDECL wine_alDeleteEffects(ALsizei n, const ALuint* effects) { alDeleteEffects(n, effects); } -ALboolean CDECL wine_alIsEffect(ALuint eid) +static ALboolean CDECL wine_alIsEffect(ALuint eid) { return alIsEffect(eid); } -ALvoid CDECL wine_alEffectf(ALuint eid, ALenum param, ALfloat value) +static ALvoid CDECL wine_alEffectf(ALuint eid, ALenum param, ALfloat value) { alEffectf(eid, param, value); } -ALvoid CDECL wine_alEffectfv(ALuint eid, ALenum param, const ALfloat* values) +static ALvoid CDECL wine_alEffectfv(ALuint eid, ALenum param, const ALfloat* values) { alEffectfv(eid, param, values); } -ALvoid CDECL wine_alEffecti(ALuint eid, ALenum param, ALint value) +static ALvoid CDECL wine_alEffecti(ALuint eid, ALenum param, ALint value) { alEffecti(eid, param, value); } -ALvoid CDECL wine_alEffectiv(ALuint eid, ALenum param, const ALint* values) +static ALvoid CDECL wine_alEffectiv(ALuint eid, ALenum param, const ALint* values) { alEffectiv(eid, param, values); } -ALvoid CDECL wine_alGetEffectf(ALuint eid, ALenum param, ALfloat* value) +static ALvoid CDECL wine_alGetEffectf(ALuint eid, ALenum param, ALfloat* value) { alGetEffectf(eid, param, value); } -ALvoid CDECL wine_alGetEffectfv(ALuint eid, ALenum param, ALfloat* values) +static ALvoid CDECL wine_alGetEffectfv(ALuint eid, ALenum param, ALfloat* values) { alGetEffectfv(eid, param, values); } -ALvoid CDECL wine_alGetEffecti(ALuint eid, ALenum param, ALint* value) +static ALvoid CDECL wine_alGetEffecti(ALuint eid, ALenum param, ALint* value) { alGetEffecti(eid, param, value); } -ALvoid CDECL wine_alGetEffectiv(ALuint eid, ALenum param, ALint* values) +static ALvoid CDECL wine_alGetEffectiv(ALuint eid, ALenum param, ALint* values) { alGetEffectiv(eid, param, values); } -ALvoid CDECL wine_alGenAuxiliaryEffectSlots(ALsizei n, ALuint* slots) +static ALvoid CDECL wine_alGenAuxiliaryEffectSlots(ALsizei n, ALuint* slots) { alGenAuxiliaryEffectSlots(n, slots); } -ALvoid CDECL wine_alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint* slots) +static ALvoid CDECL wine_alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint* slots) { alDeleteAuxiliaryEffectSlots(n, slots); } -ALboolean CDECL wine_alIsAuxiliaryEffectSlot(ALuint sid) +static ALboolean CDECL wine_alIsAuxiliaryEffectSlot(ALuint sid) { return alIsAuxiliaryEffectSlot(sid); } -ALvoid CDECL wine_alAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat value) +static ALvoid CDECL wine_alAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat value) { alAuxiliaryEffectSlotf(sid, param, value); } -ALvoid CDECL wine_alAuxiliaryEffectSlotfv(ALuint sid, ALenum param, const ALfloat* values) +static ALvoid CDECL wine_alAuxiliaryEffectSlotfv(ALuint sid, ALenum param, const ALfloat* values) { alAuxiliaryEffectSlotfv(sid, param, values); } -ALvoid CDECL wine_alAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint value) +static ALvoid CDECL wine_alAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint value) { alAuxiliaryEffectSloti(sid, param, value); } -ALvoid CDECL wine_alAuxiliaryEffectSlotiv(ALuint sid, ALenum param, const ALint* values) +static ALvoid CDECL wine_alAuxiliaryEffectSlotiv(ALuint sid, ALenum param, const ALint* values) { alAuxiliaryEffectSlotiv(sid, param, values); } -ALvoid CDECL wine_alGetAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat* value) +static ALvoid CDECL wine_alGetAuxiliaryEffectSlotf(ALuint sid, ALenum param, ALfloat* value) { alGetAuxiliaryEffectSlotf(sid, param, value); } -ALvoid CDECL wine_alGetAuxiliaryEffectSlotfv(ALuint sid, ALenum param, ALfloat* values) +static ALvoid CDECL wine_alGetAuxiliaryEffectSlotfv(ALuint sid, ALenum param, ALfloat* values) { alGetAuxiliaryEffectSlotfv(sid, param, values); } -ALvoid CDECL wine_alGetAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint* value) +static ALvoid CDECL wine_alGetAuxiliaryEffectSloti(ALuint sid, ALenum param, ALint* value) { alGetAuxiliaryEffectSloti(sid, param, value); } -ALvoid CDECL wine_alGetAuxiliaryEffectSlotiv(ALuint sid, ALenum param, ALint* values) +static ALvoid CDECL wine_alGetAuxiliaryEffectSlotiv(ALuint sid, ALenum param, ALint* values) { alGetAuxiliaryEffectSlotiv(sid, param, values); } /* Thread-local context functions */ -ALCboolean CDECL wine_alcSetThreadContext(ALCcontext *context) +static ALCboolean CDECL wine_alcSetThreadContext(ALCcontext *context) { EnterCriticalSection(&openal_cs); if(alcSetThreadContext(context) == ALC_FALSE) @@ -878,7 +878,7 @@ ALCboolean CDECL wine_alcSetThreadContext(ALCcontext *context) return ALC_TRUE; } -ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) +static ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) { return alcGetThreadContext(); }

1 0

Francois Gouget : msxml3: Make xslpattern_error() static.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 95b6e6b3cd49fbb8d5414ff55868e6bc41c9204a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b6e6b3cd49fbb8d5414ff55… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:43:13 2011 +0200 msxml3: Make xslpattern_error() static. --- dlls/msxml3/xslpattern.h | 2 +- dlls/msxml3/xslpattern.y | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/xslpattern.h b/dlls/msxml3/xslpattern.h index ead3b3f..99bf8ca 100644 --- a/dlls/msxml3/xslpattern.h +++ b/dlls/msxml3/xslpattern.h @@ -51,6 +51,6 @@ int xslpattern_lex_init(void**); int xslpattern_lex_destroy(void*); void xslpattern_set_extra(parser_param*, void*); int xslpattern_parse(parser_param*, void*); -void xslpattern_error(parser_param* param, void const* scanner, char const* msg); + #endif /* __XSLPATTERN__ */ diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 68c4c3c..5187761 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -42,6 +42,23 @@ static inline BOOL is_literal(xmlChar const* tok) (tok[0] == '\'' || tok[0] == '"')); } +static void xslpattern_error(parser_param* param, void const* scanner, char const* msg) +{ + FIXME("%s:\n" + " param {\n" + " yyscanner=%p\n" + " ctx=%p\n" + " in=\"%s\"\n" + " pos=%i\n" + " len=%i\n" + " out=\"%s\"\n" + " err=%i\n" + " }\n" + " scanner=%p\n", + msg, param->yyscanner, param->ctx, param->in, param->pos, + param->len, param->out, ++param->err, scanner); +} + %} %token TOK_Parent TOK_Self TOK_DblFSlash TOK_FSlash TOK_Axis TOK_Colon @@ -728,22 +745,4 @@ static inline BOOL is_literal(xmlChar const* tok) %% -void xslpattern_error(parser_param* param, void const* scanner, char const* msg) -{ - FIXME("%s:\n" - " param {\n" - " yyscanner=%p\n" - " ctx=%p\n" - " in=\"%s\"\n" - " pos=%i\n" - " len=%i\n" - " out=\"%s\"\n" - " err=%i\n" - " }\n" - " scanner=%p\n", - msg, param->yyscanner, param->ctx, param->in, param->pos, - param->len, param->out, ++param->err, scanner); -} - - #endif /* HAVE_LIBXML2 */

1 0

Francois Gouget : wineps.drv: PSDRV_YWStoDS() is unused so remove it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0377d0a2e65ee3c6b11e24032fd9bfcdfbaf6061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0377d0a2e65ee3c6b11e24032… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:42:29 2011 +0200 wineps.drv: PSDRV_YWStoDS() is unused so remove it. --- dlls/wineps.drv/graphics.c | 17 ----------------- dlls/wineps.drv/psdrv.h | 1 - 2 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 16a4482..95e9653 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -52,23 +52,6 @@ INT PSDRV_XWStoDS( PSDRV_PDEVICE *physDev, INT width ) } /*********************************************************************** - * PSDRV_YWStoDS - * - * Performs a world-to-viewport transformation on the specified height. - */ -INT PSDRV_YWStoDS( PSDRV_PDEVICE *physDev, INT height ) -{ - POINT pt[2]; - - pt[0].x = 0; - pt[0].y = 0; - pt[1].x = 0; - pt[1].y = height; - LPtoDP( physDev->hdc, pt, 2 ); - return pt[1].y - pt[0].y; -} - -/*********************************************************************** * PSDRV_DrawLine */ static void PSDRV_DrawLine( PSDRV_PDEVICE *physDev ) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index c6c7571..0d17bf6 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -419,7 +419,6 @@ extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm, extern void PSDRV_FreeAFMList( FONTFAMILY *head ); extern INT PSDRV_XWStoDS( PSDRV_PDEVICE *physDev, INT width ); -extern INT PSDRV_YWStoDS( PSDRV_PDEVICE *physDev, INT height ); extern BOOL PSDRV_Brush(PSDRV_PDEVICE *physDev, BOOL EO); extern BOOL PSDRV_SetFont( PSDRV_PDEVICE *physDev );

1 0

Francois Gouget : kernel32: Only get the Windows directory if PROFILE_Open( ) needs it.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f3aabde8cb60ff2e77dc437b7897083a88828930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aabde8cb60ff2e77dc437b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 30 16:43:36 2011 +0200 kernel32: Only get the Windows directory if PROFILE_Open() needs it. --- dlls/kernel32/profile.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 26c6736..a2bd5b5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -734,7 +734,6 @@ static BOOL is_not_current(FILETIME * ft) */ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) { - WCHAR windirW[MAX_PATH]; WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; FILETIME LastWriteTime; @@ -757,8 +756,6 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } - GetWindowsDirectoryW( windirW, MAX_PATH ); - if (!filename) filename = wininiW; @@ -766,6 +763,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; + WCHAR windirW[MAX_PATH]; + GetWindowsDirectoryW( windirW, MAX_PATH ); strcpyW(buffer, windirW); strcatW(buffer, wszSeparator); strcatW(buffer, filename);

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: 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

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

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

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