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

Alexandre Julliard : widl: Fix a typo in updating the type format offset for strings.
by Alexandre Julliard 09 Jun '11

09 Jun '11

Module: wine Branch: master Commit: 3a709fa5bbc7843c8112ba0ee1ff267b55b55e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a709fa5bbc7843c8112ba0ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 13:18:58 2011 +0200 widl: Fix a typo in updating the type format offset for strings. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2cb8767..e07769c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -984,8 +984,8 @@ static unsigned char get_parameter_fc( const type_t *type, const attr_list_t *at if (is_declptr( type ) && get_pointer_fc( type, attrs, !is_return ) == RPC_FC_RP) { /* skip over pointer description straight to string description */ - if (is_conformant_array( type )) typestring_offset += 4; - else typestring_offset += 2; + if (is_conformant_array( type )) *typestring_offset += 4; + else *typestring_offset += 2; *flags |= IsSimpleRef; } break;

1 0

Alexandre Julliard : rpcrt4/tests: Add a few more marshalling tests.
by Alexandre Julliard 09 Jun '11

09 Jun '11

Module: wine Branch: master Commit: 3c5688a80d9798a52bcbe73594104c2b533ba486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5688a80d9798a52bcbe7359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:07:18 2011 +0200 rpcrt4/tests: Add a few more marshalling tests. --- dlls/rpcrt4/tests/server.c | 53 +++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 9 +++++- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1764718..f959d9d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -106,6 +106,41 @@ s_sum(int x, int y) return x + y; } +signed char s_sum_char(signed char x, signed char y) +{ + return x + y; +} + +short s_sum_short(short x, short y) +{ + return x + y; +} + +int s_sum_float(float x, float y) +{ + return x + y; +} + +int s_sum_double_int(int x, double y) +{ + return x + y; +} + +hyper s_sum_hyper(hyper x, hyper y) +{ + return x + y; +} + +int s_sum_hyper_int(hyper x, hyper y) +{ + return x + y; +} + +int s_sum_char_hyper(signed char x, hyper y) +{ + return x + y; +} + void s_square_out(int x, int *y) { @@ -825,6 +860,7 @@ basic_tests(void) short h; char c; int x; + hyper y; str_struct_t ss = {string}; wstr_struct_t ws = {wstring}; str_t str; @@ -834,7 +870,22 @@ basic_tests(void) ok(int_return() == INT_CODE, "RPC int_return\n"); ok(square(7) == 49, "RPC square\n"); - ok(sum(23, -4) == 19, "RPC sum\n"); + x = sum(23, -4); + ok(x == 19, "RPC sum got %d\n", x); + c = sum_char(-23, 50); + ok(c == 27, "RPC sum_char got %d\n", (int)c); + h = sum_short(1122, -344); + ok(h == 778, "RPC sum_short got %d\n", (int)h); + x = sum_float(123.45, -32.2); + ok(x == 91, "RPC sum_float got %d\n", x); + x = sum_double_int(-78, 148.46); + ok(x == 70, "RPC sum_double_int got %d\n", x); + y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); + ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); + x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 ); + ok(x == 0x33334450, "RPC char_hyper got 0x%x\n", x); x = 0; square_out(11, &x); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 56bf1a5..3be3f33 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -31,9 +31,7 @@ typedef int fnprintf(const char *format, ...); [ uuid(00000000-4114-0704-2301-000000000000), -#ifndef __midl implicit_handle(handle_t IServer_IfHandle) -#endif ] interface IServer { @@ -81,6 +79,13 @@ cpp_quote("#endif") int int_return(void); int square(int x); int sum(int x, int y); + signed char sum_char(signed char x, signed char y); + short sum_short(short x, short y); + int sum_float(float x, float y); + int sum_double_int(int x, double y); + hyper sum_hyper(hyper x, hyper y); + int sum_hyper_int(hyper x, hyper y); + int sum_char_hyper(signed char x, hyper y); void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s);

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DMaterial3 iface.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: d9fb7b9b92dd4c886fe8d79361de5fbb3864f984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fb7b9b92dd4c886fe8d7936… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:38:16 2011 +0200 ddraw: COM cleanup for the IDirect3DMaterial3 iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 73 +++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fb7b9b92dd4c886fe8d…

1 0

Louis Lenders : netapi32: Fill the data buffer with something useful in NetLocalGroupGetInfo.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 4680f63939dc8fd6b26d17125a4d0d9f95702217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4680f63939dc8fd6b26d17125… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 5 10:43:57 2011 +0200 netapi32: Fill the data buffer with something useful in NetLocalGroupGetInfo. --- dlls/netapi32/local_group.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index e125de5..7f7d3c1 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -145,8 +145,24 @@ NET_API_STATUS WINAPI NetLocalGroupGetInfo( DWORD level, LPBYTE* bufptr) { - FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername), + static const WCHAR commentW[]={'N','o',' ','c','o','m','m','e','n','t',0}; + LOCALGROUP_INFO_1* info; + DWORD size; + + FIXME("(%s %s %d %p) semi-stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); + + size = sizeof(*info) + sizeof(WCHAR) * (lstrlenW(groupname)+1) + sizeof(commentW); + NetApiBufferAllocate(size, (LPVOID*)&info); + + info->lgrpi1_name = (LPWSTR)(info + 1); + lstrcpyW(info->lgrpi1_name, groupname); + + info->lgrpi1_comment = info->lgrpi1_name + lstrlenW(groupname) + 1; + lstrcpyW(info->lgrpi1_comment, commentW); + + *bufptr = (LPBYTE)info; + return NERR_Success; }

1 0

Louis Lenders : netapi32/tests: Add small conformance test for NetLocalGroupGetInfo and LocalGroupGetMembers .
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: de2c4015278ee774133c7bf4c6474fe0f0060108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2c4015278ee774133c7bf4c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 5 09:58:33 2011 +0200 netapi32/tests: Add small conformance test for NetLocalGroupGetInfo and LocalGroupGetMembers. --- dlls/netapi32/tests/access.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b721c19..e8324d3 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -63,6 +63,8 @@ static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=N static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; static int init_access_tests(void) { @@ -320,6 +322,31 @@ static void run_userhandling_tests(void) ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } +static void run_localgroupgetinfo_tests(void) +{ + NET_API_STATUS status; + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + PLOCALGROUP_INFO_1 lgi = NULL; + PLOCALGROUP_MEMBERS_INFO_3 buffer = NULL; + DWORD entries_read = 0, total_entries =0; + int i; + + status = pNetLocalGroupGetInfo(NULL, admins, 1, (LPBYTE *)&lgi); + ok(status == NERR_Success, "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + + trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); + trace("Comment: %s\n", wine_dbgstr_w( lgi->lgrpi1_comment)); + + pNetApiBufferFree(lgi); + + status = pNetLocalGroupGetMembers(NULL, admins, 3, (LPBYTE *)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); + + for(i=0;i<entries_read;i++) + trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -331,6 +358,8 @@ START_TEST(access) pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); + pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); + pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -346,6 +375,7 @@ START_TEST(access) run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); + run_localgroupgetinfo_tests(); } FreeLibrary(hnetapi32);

1 0

Adam Martinson : ole32: Don't call IDropTarget::QueryInterface() in RegisterDragDrop().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: e85668b4630266845c44c23450f8006505ee73fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85668b4630266845c44c2345… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Jun 6 11:57:27 2011 -0500 ole32: Don't call IDropTarget::QueryInterface() in RegisterDragDrop(). --- dlls/ole32/ole2.c | 128 ++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/dragdrop.c | 2 +- 2 files changed, 120 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3254619..b449a76 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -6,6 +6,7 @@ * Copyright 1999 Noel Borthwick * Copyright 1999, 2000 Marcus Meissner * Copyright 2005 Juan Lang + * Copyright 2011 Adam Martinson for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -377,6 +378,116 @@ static HRESULT create_stream_from_map(HANDLE map, IStream **stream) return hr; } +/* This is to work around apps which break COM rules by not implementing + * IDropTarget::QueryInterface(). Windows doesn't expose this because it + * doesn't call CoMarshallInterface() in RegisterDragDrop(). + * The wrapper is only used internally, and only exists for the life of + * the marshal. */ +typedef struct { + IDropTarget IDropTarget_iface; + IDropTarget* inner; + LONG refs; +} DropTargetWrapper; + +static inline DropTargetWrapper* impl_from_IDropTarget(IDropTarget* iface) +{ + return CONTAINING_RECORD(iface, DropTargetWrapper, IDropTarget_iface); +} + +static HRESULT WINAPI DropTargetWrapper_QueryInterface(IDropTarget* iface, + REFIID riid, + void** ppvObject) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropTarget)) + { + IDropTarget_AddRef(&This->IDropTarget_iface); + *ppvObject = &This->IDropTarget_iface; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI DropTargetWrapper_AddRef(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI DropTargetWrapper_Release(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + IDropTarget_Release(This->inner); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI DropTargetWrapper_DragEnter(IDropTarget* iface, + IDataObject* pDataObj, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragEnter(This->inner, pDataObj, grfKeyState, pt, pdwEffect); +} + +static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragOver(This->inner, grfKeyState, pt, pdwEffect); +} + +static HRESULT WINAPI DropTargetWrapper_DragLeave(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragLeave(This->inner); +} + +static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, + IDataObject* pDataObj, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_Drop(This->inner, pDataObj, grfKeyState, pt, pdwEffect); +} + +static const IDropTargetVtbl DropTargetWrapperVTbl = +{ + DropTargetWrapper_QueryInterface, + DropTargetWrapper_AddRef, + DropTargetWrapper_Release, + DropTargetWrapper_DragEnter, + DropTargetWrapper_DragOver, + DropTargetWrapper_DragLeave, + DropTargetWrapper_Drop +}; + +static IDropTarget* WrapDropTarget(IDropTarget* inner) +{ + DropTargetWrapper* This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + + if (This) + { + IDropTarget_AddRef(inner); + This->IDropTarget_iface.lpVtbl = &DropTargetWrapperVTbl; + This->inner = inner; + This->refs = 1; + } + return &This->IDropTarget_iface; +} + /*********************************************************************** * get_droptarget_pointer * @@ -409,7 +520,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) HRESULT hr; IStream *stream; HANDLE map; - IUnknown *unk; + IDropTarget *wrapper; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -450,16 +561,15 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hr)) return hr; - unk = NULL; - hr = IDropTarget_QueryInterface(pDropTarget, &IID_IUnknown, (void**)&unk); - if (SUCCEEDED(hr) && !unk) hr = E_NOINTERFACE; - if(FAILED(hr)) + /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ + wrapper = WrapDropTarget(pDropTarget); + if(!wrapper) { - IStream_Release(stream); - return hr; + IStream_Release(stream); + return E_OUTOFMEMORY; } - hr = CoMarshalInterface(stream, &IID_IDropTarget, unk, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); - IUnknown_Release(unk); + hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)wrapper, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + IDropTarget_Release(wrapper); if(SUCCEEDED(hr)) { diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 0c56cb4..b0e1259 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -39,7 +39,7 @@ static int droptarget_refs; static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, void** ppvObject) { - todo_wine ok(0, "DropTarget_QueryInterface() shouldn't be called\n"); + ok(0, "DropTarget_QueryInterface() shouldn't be called\n"); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDropTarget)) {

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDrawGammaControl iface.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: abe0ee33eb0ab8ac19bd97323bdde6ca7f31ed1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0ee33eb0ab8ac19bd97323… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:23:17 2011 +0200 ddraw: COM cleanup for the IDirectDrawGammaControl iface. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d2b6ea9..cce8574 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -155,7 +155,7 @@ struct IDirectDrawSurfaceImpl IDirectDrawSurface7 IDirectDrawSurface7_iface; IDirectDrawSurface4 IDirectDrawSurface4_iface; IDirectDrawSurface3 IDirectDrawSurface3_iface; - const IDirectDrawGammaControlVtbl *IDirectDrawGammaControl_vtbl; + IDirectDrawGammaControl IDirectDrawGammaControl_iface; const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 74d9dc0..89a6bd1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -31,10 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static inline IDirectDrawSurfaceImpl *surface_from_gamma_control(IDirectDrawGammaControl *iface) +static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirectDrawGammaControl_vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); } /***************************************************************************** @@ -98,7 +97,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) ) { IUnknown_AddRef(iface); - *obj = &This->IDirectDrawGammaControl_vtbl; + *obj = &This->IDirectDrawGammaControl_iface; TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj); return S_OK; } @@ -159,9 +158,11 @@ static HRESULT WINAPI ddraw_surface3_QueryInterface(IDirectDrawSurface3 *iface, return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); } -static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, REFIID riid, void **object) +static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, + REFIID riid, void **object) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); @@ -230,7 +231,8 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p.\n", iface); return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); @@ -448,7 +450,8 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p.\n", iface); return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); @@ -3410,7 +3413,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl *iface, DWORD flags, DDGAMMARAMP *gamma_ramp) { - IDirectDrawSurfaceImpl *surface = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirectDrawGammaControl(iface); TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp); @@ -3452,7 +3455,7 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl * static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl *iface, DWORD flags, DDGAMMARAMP *gamma_ramp) { - IDirectDrawSurfaceImpl *surface = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirectDrawGammaControl(iface); TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp); @@ -4135,7 +4138,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; - surface->IDirectDrawGammaControl_vtbl = &ddraw_gamma_control_vtbl; + surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl; surface->ref = 1;

1 0

Michael Stefaniuc : ddraw: Rename d3d_material_init() and have it allocate the object too.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: db15ce658035ca018abc418f11c88d124ea7531c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db15ce658035ca018abc418f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:29:20 2011 +0200 ddraw: Rename d3d_material_init() and have it allocate the object too. --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 10 +++++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 51e8c8c..d3ee861 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4603,15 +4603,13 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 if (outer_unknown) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = d3d_material_create(This); if (!object) { ERR("Failed to allocate material memory.\n"); return DDERR_OUTOFMEMORY; } - d3d_material_init(object, This); - TRACE("Created material %p.\n", object); *material = (IDirect3DMaterial3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cce8574..0da8f55 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -429,7 +429,7 @@ struct IDirect3DMaterialImpl /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; -void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; +IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 10ce340..42e4809 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -507,11 +507,19 @@ static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = IDirect3DMaterialImpl_Unreserve }; -void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) +IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) { + IDirect3DMaterialImpl *material; + + material = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*material)); + if (!material) + return NULL; + material->lpVtbl = &d3d_material3_vtbl; material->IDirect3DMaterial2_iface.lpVtbl = &d3d_material2_vtbl; material->IDirect3DMaterial_iface.lpVtbl = &d3d_material1_vtbl; material->ref = 1; material->ddraw = ddraw; + + return material; }

1 0

Michael Stefaniuc : ddraw: Avoid "unsafe" IDirect3DMaterial3 to object casts.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 8d91f8b614d0cb22e6623a0c104ac8e71f595615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d91f8b614d0cb22e6623a0c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:33:26 2011 +0200 ddraw: Avoid "unsafe" IDirect3DMaterial3 to object casts. --- dlls/ddraw/ddraw.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3ee861..1ff43c4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4616,37 +4616,46 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 return D3D_OK; } -static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, IUnknown *outer_unknown) +static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, + IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); - IDirect3DMaterial3 *material3; - HRESULT hr; + IDirect3DMaterialImpl *object; TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial2_iface : NULL; + object = d3d_material_create(This); + if (!object) + { + ERR("Failed to allocate material memory.\n"); + return DDERR_OUTOFMEMORY; + } - TRACE("Returning material %p.\n", *material); + TRACE("Created material %p.\n", object); + *material = &object->IDirect3DMaterial2_iface; - return hr; + return D3D_OK; } -static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial **material, IUnknown *outer_unknown) +static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial **material, + IUnknown *outer_unknown) { - IDirect3DMaterial3 *material3; - HRESULT hr; - IDirectDrawImpl *This = impl_from_IDirect3D(iface); + IDirect3DMaterialImpl *object; TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial_iface : NULL; + object = d3d_material_create(This); + if (!object) + { + ERR("Failed to allocate material memory.\n"); + return DDERR_OUTOFMEMORY; + } - TRACE("Returning material %p.\n", *material); + TRACE("Created material %p.\n", object); + *material = &object->IDirect3DMaterial_iface; - return hr; + return D3D_OK; } /*****************************************************************************

1 0

Dylan Smith : d3dx9/tests: Add tests for D3DXLoadMeshFromXInMemory.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 4a32062f28ab7388cca383ebcb2e1fa1a43c70dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a32062f28ab7388cca383ebc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 7 19:43:24 2011 -0400 d3dx9/tests: Add tests for D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/tests/mesh.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index ee15fdb..9b924fd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1882,6 +1882,47 @@ static ID3DXAllocateHierarchyVtbl ID3DXAllocateHierarchyImpl_Vtbl = { }; static ID3DXAllocateHierarchy alloc_hier = { &ID3DXAllocateHierarchyImpl_Vtbl }; +#define test_LoadMeshFromX(device, xfile_str, vertex_array, fvf, index_array, materials_array, check_adjacency) \ + test_LoadMeshFromX_(__LINE__, device, xfile_str, sizeof(xfile_str) - 1, vertex_array, ARRAY_SIZE(vertex_array), fvf, \ + index_array, ARRAY_SIZE(index_array), sizeof(*index_array), materials_array, ARRAY_SIZE(materials_array), \ + check_adjacency); +static void test_LoadMeshFromX_(int line, IDirect3DDevice9 *device, const char *xfile_str, size_t xfile_strlen, + const void *vertices, DWORD num_vertices, DWORD fvf, const void *indices, DWORD num_indices, size_t index_size, + const D3DXMATERIAL *expected_materials, DWORD expected_num_materials, BOOL check_adjacency) +{ + HRESULT hr; + ID3DXBuffer *materials = NULL; + ID3DXBuffer *effects = NULL; + ID3DXBuffer *adjacency = NULL; + ID3DXMesh *mesh = NULL; + DWORD num_materials = 0; + + /* Adjacency is not checked when the X file contains multiple meshes, + * since calling GenerateAdjacency on the merged mesh is not equivalent + * to calling GenerateAdjacency on the individual meshes and then merging + * the adjacency data. */ + hr = D3DXLoadMeshFromXInMemory(xfile_str, xfile_strlen, D3DXMESH_MANAGED, device, + check_adjacency ? &adjacency : NULL, &materials, &effects, &num_materials, &mesh); + ok_(__FILE__,line)(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + if (SUCCEEDED(hr)) { + D3DXMATERIAL *materials_ptr = materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL; + D3DXEFFECTINSTANCE *effects_ptr = effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL; + DWORD *adjacency_ptr = check_adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL; + + check_vertex_buffer_(line, mesh, vertices, num_vertices, fvf); + check_index_buffer_(line, mesh, indices, num_indices, index_size); + check_materials_(line, materials_ptr, num_materials, expected_materials, expected_num_materials); + check_generated_effects_(line, materials_ptr, num_materials, effects_ptr); + if (check_adjacency) + check_generated_adjacency_(line, mesh, adjacency_ptr, 0.0f); + + if (materials) ID3DXBuffer_Release(materials); + if (effects) ID3DXBuffer_Release(effects); + if (adjacency) ID3DXBuffer_Release(adjacency); + IUnknown_Release(mesh); + } +} + static void D3DXLoadMeshTest(void) { static const char empty_xfile[] = "xof 0303txt 0032"; @@ -1926,6 +1967,13 @@ static void D3DXLoadMeshTest(void) {{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {2.0, 1.0, 0.0}}, {{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {3.0, 1.0, 0.0}}, }; + static const WORD merged_index_buffer[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + /* frame transforms accumulates for D3DXLoadMeshFromX */ + static const D3DXVECTOR3 merged_vertex_buffer[] = { + {0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 1.0, 0.0}, + {0.0, 0.0, 2.0}, {0.0, 1.0, 2.0}, {2.0, 1.0, 2.0}, + {0.0, 0.0, 5.0}, {0.0, 1.0, 5.0}, {3.0, 1.0, 5.0}, + }; const DWORD framed_fvf = D3DFVF_XYZ; /*________________________*/ static const char box_xfile[] = @@ -2088,6 +2136,18 @@ static void D3DXLoadMeshTest(void) }; const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1; /*________________________*/ + static const D3DXMATERIAL default_materials[] = { + { + { + {0.5, 0.5, 0.5, 0.0}, /* Diffuse */ + {0.0, 0.0, 0.0, 0.0}, /* Ambient */ + {0.5, 0.5, 0.5, 0.0}, /* Specular */ + {0.0, 0.0, 0.0, 0.0}, /* Emissive */ + 0.0, /* Power */ + }, + NULL, /* pTextureFilename */ + } + }; HRESULT hr; HWND wnd = NULL; IDirect3D9 *d3d = NULL; @@ -2223,6 +2283,41 @@ static void D3DXLoadMeshTest(void) frame_hier = NULL; } + + hr = D3DXLoadMeshFromXInMemory(NULL, 0, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, &mesh); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(NULL, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, &mesh); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(simple_xfile, 0, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, &mesh); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, + NULL, NULL, NULL, NULL, NULL, &mesh); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(empty_xfile, sizeof(empty_xfile) - 1, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, &mesh); + ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + + hr = D3DXLoadMeshFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, + device, NULL, NULL, NULL, NULL, &mesh); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(mesh); + + test_LoadMeshFromX(device, simple_xfile, simple_vertex_buffer, simple_fvf, simple_index_buffer, default_materials, TRUE); + test_LoadMeshFromX(device, box_xfile, box_vertex_buffer, box_fvf, box_index_buffer, box_materials, TRUE); + test_LoadMeshFromX(device, framed_xfile, merged_vertex_buffer, framed_fvf, merged_index_buffer, default_materials, FALSE); + cleanup: if (device) IDirect3DDevice9_Release(device); if (d3d) IDirect3D9_Release(d3d);

1 0