January 2011 - Wine-commits

Alexandre Julliard : makefiles: Generate . res files directly from message files.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 9771ad8ca79220b0892c1e1f20cf8dd37804c13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9771ad8ca79220b0892c1e1f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:56:02 2011 +0100 makefiles: Generate .res files directly from message files. --- .gitignore | 16 ---------------- Make.rules.in | 15 +++++++-------- tools/make_makefiles | 1 - tools/makedep.c | 2 +- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 87aad30..cbc189d 100644 --- a/.gitignore +++ b/.gitignore @@ -57,22 +57,6 @@ dlls/jscript/jscript_classes.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h -dlls/kernel32/nls/winerr_dan.mc.rc -dlls/kernel32/nls/winerr_deu.mc.rc -dlls/kernel32/nls/winerr_enu.mc.rc -dlls/kernel32/nls/winerr_fra.mc.rc -dlls/kernel32/nls/winerr_ita.mc.rc -dlls/kernel32/nls/winerr_jpn.mc.rc -dlls/kernel32/nls/winerr_kor.mc.rc -dlls/kernel32/nls/winerr_lth.mc.rc -dlls/kernel32/nls/winerr_nld.mc.rc -dlls/kernel32/nls/winerr_nor.mc.rc -dlls/kernel32/nls/winerr_plk.mc.rc -dlls/kernel32/nls/winerr_ptb.mc.rc -dlls/kernel32/nls/winerr_ptg.mc.rc -dlls/kernel32/nls/winerr_rus.mc.rc -dlls/kernel32/nls/winerr_sve.mc.rc -dlls/kernel32/nls/winerr_ukr.mc.rc dlls/libd3dcompiler.def dlls/libd3dx9.def dlls/libkernel.def diff --git a/Make.rules.in b/Make.rules.in index f5b2456..f44bc55 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -26,11 +26,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_FILES = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ - $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ - $(MC_SRCS:.mc=.mc.rc) $(PO_SRCS:%=rsrc.pot) + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(PO_SRCS:%=rsrc.pot) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ - $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) + $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) @@ -42,7 +41,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -59,8 +58,8 @@ filter: dummy .l.yy.c: $(FLEX) $(LEXFLAGS) -o$@ $< -.mc.mc.rc: - $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< +.mc.res: + $(LDPATH) $(WMC) -U -O res -o $@ $< .rc.res: $(LDPATH) $(WRC) $(RCFLAGS) -o $@ $< @@ -182,8 +181,8 @@ all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) rsrc.pot: $(WRC) $(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) -$(MC_SRCS:.mc=.mc.rc): $(WMC) -$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res): $(WRC) +$(MC_SRCS:.mc=.res): $(WMC) +$(RC_SRCS:.rc=.res): $(WRC) $(PO_SRCS:.rc=.res): $(ALL_PO_FILES) # Misc. rules diff --git a/tools/make_makefiles b/tools/make_makefiles index 97c8d40..991ef4b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -109,7 +109,6 @@ my @ignore_srcs = ( [ 'BISON_SRCS', '\.y', '.tab.c' ], [ 'BISON_SRCS', '\.y', '.tab.h' ], [ 'LEX_SRCS', '\.l', '.yy.c' ], - [ 'MC_SRCS', '\.mc', '.mc.rc' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], [ 'IDL_H_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '.h' ], diff --git a/tools/makedep.c b/tools/makedep.c index 27eb1e5..0d592a0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -858,7 +858,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else if (!strcmp( ext, "mc" )) /* message file */ { - *column += fprintf( file, "%s.mc.rc: %s", obj, pFile->filename ); + *column += fprintf( file, "%s.res: %s", obj, pFile->filename ); } else if (!strcmp( ext, "idl" )) /* IDL file */ {

1 0

Austin English : shell32/tests: fix a couple memory leaks (Valgrind).
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 19fa0b32fddb8a64f8bf8b324c8e8131f3ed9640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fa0b32fddb8a64f8bf8b324… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 18 01:45:50 2011 -0800 shell32/tests: fix a couple memory leaks (Valgrind). --- dlls/shell32/tests/shlfolder.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8701b4d..f2a1424 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4434,6 +4434,9 @@ static void test_SHChangeNotify(void) SHChangeNotify(exp_data->signal, SHCNF_PATHW | SHCNF_FLUSH, path1, path2); do_events(); ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); + + HeapFree(GetProcessHeap(), 0, path1); + HeapFree(GetProcessHeap(), 0, path2); } }

1 0

Michael Stefaniuc : ddraw: Avoid some unsafe IDirect3D7 iface to IDirectDrawImpl transitions.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: b3ced2fa8a500c427cdb4829aaaad34c3fef6793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ced2fa8a500c427cdb4829a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 18 12:22:48 2011 +0100 ddraw: Avoid some unsafe IDirect3D7 iface to IDirectDrawImpl transitions. --- dlls/ddraw/device.c | 54 ++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a7eb2dd..d08bf01 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1727,56 +1727,50 @@ IDirect3DDeviceImpl_7_GetDirect3D(IDirect3DDevice7 *iface, return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_3_GetDirect3D(IDirect3DDevice3 *iface, - IDirect3D3 **Direct3D3) +static HRESULT WINAPI IDirect3DDeviceImpl_3_GetDirect3D(IDirect3DDevice3 *iface, + IDirect3D3 **Direct3D3) { IDirect3DDeviceImpl *This = device_from_device3(iface); - HRESULT ret; - IDirect3D7 *ret_ptr; TRACE("iface %p, d3d %p.\n", iface, Direct3D3); - ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); - if(ret != D3D_OK) - return ret; - *Direct3D3 = ret_ptr ? (IDirect3D3 *)&ddraw_from_d3d7(ret_ptr)->IDirect3D3_vtbl : NULL; + if(!Direct3D3) + return DDERR_INVALIDPARAMS; + + IDirect3D3_AddRef((IDirect3D3 *)&This->ddraw->IDirect3D3_vtbl); + *Direct3D3 = (IDirect3D3 *)&This->ddraw->IDirect3D3_vtbl; TRACE(" returning interface %p\n", *Direct3D3); return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface, - IDirect3D2 **Direct3D2) +static HRESULT WINAPI IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface, + IDirect3D2 **Direct3D2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - HRESULT ret; - IDirect3D7 *ret_ptr; TRACE("iface %p, d3d %p.\n", iface, Direct3D2); - ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); - if(ret != D3D_OK) - return ret; - *Direct3D2 = ret_ptr ? (IDirect3D2 *)&ddraw_from_d3d7(ret_ptr)->IDirect3D2_vtbl : NULL; + if(!Direct3D2) + return DDERR_INVALIDPARAMS; + + IDirect3D2_AddRef((IDirect3D2 *)&This->ddraw->IDirect3D2_vtbl); + *Direct3D2 = (IDirect3D2 *)&This->ddraw->IDirect3D2_vtbl; TRACE(" returning interface %p\n", *Direct3D2); return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface, - IDirect3D **Direct3D) +static HRESULT WINAPI IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface, + IDirect3D **Direct3D) { IDirect3DDeviceImpl *This = device_from_device1(iface); - HRESULT ret; - IDirect3D7 *ret_ptr; TRACE("iface %p, d3d %p.\n", iface, Direct3D); - ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr); - if(ret != D3D_OK) - return ret; - *Direct3D = ret_ptr ? (IDirect3D *)&ddraw_from_d3d7(ret_ptr)->IDirect3D_vtbl : NULL; + if(!Direct3D) + return DDERR_INVALIDPARAMS; + + IDirect3D_AddRef((IDirect3D *)&This->ddraw->IDirect3D_vtbl); + *Direct3D = (IDirect3D *)&This->ddraw->IDirect3D_vtbl; TRACE(" returning interface %p\n", *Direct3D); return D3D_OK; } @@ -6806,7 +6800,7 @@ static const struct IDirect3DDevice3Vtbl d3d_device3_vtbl = Thunk_IDirect3DDeviceImpl_3_EnumTextureFormats, Thunk_IDirect3DDeviceImpl_3_BeginScene, Thunk_IDirect3DDeviceImpl_3_EndScene, - Thunk_IDirect3DDeviceImpl_3_GetDirect3D, + IDirect3DDeviceImpl_3_GetDirect3D, IDirect3DDeviceImpl_3_SetCurrentViewport, IDirect3DDeviceImpl_3_GetCurrentViewport, Thunk_IDirect3DDeviceImpl_3_SetRenderTarget, @@ -6855,7 +6849,7 @@ static const struct IDirect3DDevice2Vtbl d3d_device2_vtbl = IDirect3DDeviceImpl_2_EnumTextureFormats, Thunk_IDirect3DDeviceImpl_2_BeginScene, Thunk_IDirect3DDeviceImpl_2_EndScene, - Thunk_IDirect3DDeviceImpl_2_GetDirect3D, + IDirect3DDeviceImpl_2_GetDirect3D, Thunk_IDirect3DDeviceImpl_2_SetCurrentViewport, Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport, Thunk_IDirect3DDeviceImpl_2_SetRenderTarget, @@ -6903,7 +6897,7 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_DeleteMatrix, Thunk_IDirect3DDeviceImpl_1_BeginScene, Thunk_IDirect3DDeviceImpl_1_EndScene, - Thunk_IDirect3DDeviceImpl_1_GetDirect3D + IDirect3DDeviceImpl_1_GetDirect3D }; /*****************************************************************************

1 0

Michael Stefaniuc : ddraw: Pass an IDirectDrawImpl* instead of an iface to ddraw_set_display_mode().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 0b362f6fa4d53686b86d28c56ed9af26f01db190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b362f6fa4d53686b86d28c56… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 18 12:24:26 2011 +0100 ddraw: Pass an IDirectDrawImpl* instead of an iface to ddraw_set_display_mode(). --- dlls/ddraw/ddraw.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c0354ce..626993c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -762,15 +762,14 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window * ddraw7_SetDisplayMode. * *****************************************************************************/ -static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD Height, +static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Height, DWORD BPP, DWORD RefreshRate, DWORD Flags) { - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; WINED3DDISPLAYMODE Mode; HRESULT hr; - TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", - iface, Width, Height, BPP, RefreshRate, Flags); + TRACE("ddraw %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", ddraw, Width, + Height, BPP, RefreshRate, Flags); EnterCriticalSection(&ddraw_cs); if( !Width || !Height ) @@ -782,7 +781,7 @@ static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD He } /* Check the exclusive mode - if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) + if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; * This is WRONG. Don't know if the SDK is completely * wrong and if there are any conditions when DDERR_NOEXCLUSIVE @@ -808,11 +807,9 @@ static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD He */ /* TODO: Lose the primary surface */ - hr = IWineD3DDevice_SetDisplayMode(This->wineD3DDevice, - 0, /* First swapchain */ - &Mode); - IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); - IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, This->dest_window, Width, Height); + hr = IWineD3DDevice_SetDisplayMode(ddraw->wineD3DDevice, 0, &Mode); + IWineD3DDevice_RestoreFullscreenWindow(ddraw->wineD3DDevice, ddraw->dest_window); + IWineD3DDevice_SetupFullscreenWindow(ddraw->wineD3DDevice, ddraw->dest_window, Width, Height); LeaveCriticalSection(&ddraw_cs); switch(hr) { @@ -846,6 +843,8 @@ static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD He static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DWORD Height, DWORD BPP, DWORD RefreshRate, DWORD Flags) { + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", iface, Width, Height, BPP, RefreshRate, Flags); @@ -856,7 +855,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DW RefreshRate = force_refresh_rate; } - return ddraw_set_display_mode(iface, Width, Height, BPP, RefreshRate, Flags); + return ddraw_set_display_mode(This, Width, Height, BPP, RefreshRate, Flags); } static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, @@ -923,7 +922,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) TRACE("iface %p.\n", iface); - return ddraw_set_display_mode(iface, This->orig_width, This->orig_height, This->orig_bpp, 0, 0); + return ddraw_set_display_mode(This, This->orig_width, This->orig_height, This->orig_bpp, 0, 0); } static HRESULT WINAPI ddraw4_RestoreDisplayMode(IDirectDraw4 *iface)

1 0

Michael Stefaniuc : ddraw: Pass an IDirectDrawImpl* instead of an iface to CreateSurface().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 055c5e205a5bbdb781a8bce871fa6ffd6774168c URL: http://source.winehq.org/git/wine.git/?a=commit;h=055c5e205a5bbdb781a8bce87… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 18 12:25:50 2011 +0100 ddraw: Pass an IDirectDrawImpl* instead of an iface to CreateSurface(). --- dlls/ddraw/ddraw.c | 85 +++++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=055c5e205a5bbdb781a8b…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D iface.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 8255d464db03633f174223515f2b6da3360107f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8255d464db03633f174223515… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 18 12:28:15 2011 +0100 ddraw: COM cleanup for the IDirect3D iface. --- dlls/ddraw/ddraw.c | 41 +++++++++++++++++++++++++++++++---------- dlls/ddraw/ddraw_private.h | 7 +------ dlls/ddraw/device.c | 6 +++--- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73cb58e..fa7777c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -66,6 +66,11 @@ static inline IDirectDrawImpl *ddraw_from_ddraw4(IDirectDraw4 *iface) return (IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawImpl, IDirectDraw4_vtbl)); } +static inline IDirectDrawImpl *impl_from_IDirect3D(IDirect3D *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawImpl, IDirect3D_iface); +} + /***************************************************************************** * IUnknown Methods *****************************************************************************/ @@ -174,7 +179,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, if ( IsEqualGUID( &IID_IDirect3D , refiid ) ) { This->d3dversion = 1; - *obj = &This->IDirect3D_vtbl; + *obj = &This->IDirect3D_iface; TRACE(" returning Direct3D interface at %p.\n", *obj); } else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) @@ -265,9 +270,11 @@ static HRESULT WINAPI d3d2_QueryInterface(IDirect3D2 *iface, REFIID riid, void * static HRESULT WINAPI d3d1_QueryInterface(IDirect3D *iface, REFIID riid, void **object) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw7_QueryInterface((IDirectDraw7 *)ddraw_from_d3d1(iface), riid, object); + return ddraw7_QueryInterface((IDirectDraw7 *)This, riid, object); } /***************************************************************************** @@ -371,9 +378,11 @@ static ULONG WINAPI d3d2_AddRef(IDirect3D2 *iface) static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p.\n", iface); - return ddraw1_AddRef((IDirectDraw *)&ddraw_from_d3d1(iface)->IDirectDraw_vtbl); + return ddraw1_AddRef((IDirectDraw *)&This->IDirectDraw_vtbl); } /***************************************************************************** @@ -506,9 +515,11 @@ static ULONG WINAPI d3d2_Release(IDirect3D2 *iface) static ULONG WINAPI d3d1_Release(IDirect3D *iface) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p.\n", iface); - return ddraw1_Release((IDirectDraw *)&ddraw_from_d3d1(iface)->IDirectDraw_vtbl); + return ddraw1_Release((IDirectDraw *)&This->IDirectDraw_vtbl); } /***************************************************************************** @@ -4257,9 +4268,11 @@ static HRESULT WINAPI d3d2_EnumDevices(IDirect3D2 *iface, LPD3DENUMDEVICESCALLBA static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBACK callback, void *context) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, callback %p, context %p.\n", iface, callback, context); - return d3d3_EnumDevices((IDirect3D3 *)&ddraw_from_d3d1(iface)->IDirect3D3_vtbl, callback, context); + return d3d3_EnumDevices((IDirect3D3 *)&This->IDirect3D3_vtbl, callback, context); } /***************************************************************************** @@ -4315,9 +4328,11 @@ static HRESULT WINAPI d3d2_CreateLight(IDirect3D2 *iface, IDirect3DLight **light static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, IUnknown *outer_unknown) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, light %p, outer_unknown %p.\n", iface, light, outer_unknown); - return d3d3_CreateLight((IDirect3D3 *)&ddraw_from_d3d1(iface)->IDirect3D3_vtbl, light, outer_unknown); + return d3d3_CreateLight((IDirect3D3 *)&This->IDirect3D3_vtbl, light, outer_unknown); } /***************************************************************************** @@ -4383,9 +4398,11 @@ static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial ** IDirect3DMaterial3 *material3; HRESULT hr; + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial((IDirect3D3 *)&ddraw_from_d3d1(iface)->IDirect3D3_vtbl, &material3, outer_unknown); + hr = d3d3_CreateMaterial((IDirect3D3 *)&This->IDirect3D3_vtbl, &material3, outer_unknown); *material = material3 ? (IDirect3DMaterial *)&((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial_vtbl : NULL; TRACE("Returning material %p.\n", *material); @@ -4446,9 +4463,11 @@ static HRESULT WINAPI d3d2_CreateViewport(IDirect3D2 *iface, IDirect3DViewport2 static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport **viewport, IUnknown *outer_unknown) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, viewport %p, outer_unknown %p.\n", iface, viewport, outer_unknown); - return d3d3_CreateViewport((IDirect3D3 *)&ddraw_from_d3d1(iface)->IDirect3D3_vtbl, + return d3d3_CreateViewport((IDirect3D3 *)&This->IDirect3D3_vtbl, (IDirect3DViewport3 **)viewport, outer_unknown); } @@ -4525,9 +4544,11 @@ static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fd static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { + IDirectDrawImpl *This = impl_from_IDirect3D(iface); + TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice((IDirect3D3 *)&ddraw_from_d3d1(iface)->IDirect3D3_vtbl, fds, fdr); + return d3d3_FindDevice((IDirect3D3 *)&This->IDirect3D3_vtbl, fds, fdr); } /***************************************************************************** @@ -5762,7 +5783,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->IDirectDraw2_vtbl = &ddraw2_vtbl; ddraw->IDirectDraw3_vtbl = &ddraw3_vtbl; ddraw->IDirectDraw4_vtbl = &ddraw4_vtbl; - ddraw->IDirect3D_vtbl = &d3d1_vtbl; + ddraw->IDirect3D_iface.lpVtbl = &d3d1_vtbl; ddraw->IDirect3D2_vtbl = &d3d2_vtbl; ddraw->IDirect3D3_vtbl = &d3d3_vtbl; ddraw->IDirect3D7_vtbl = &d3d7_vtbl; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1518db2..2a7459f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -104,7 +104,7 @@ struct IDirectDrawImpl const IDirect3D7Vtbl *IDirect3D7_vtbl; const IDirect3D3Vtbl *IDirect3D3_vtbl; const IDirect3D2Vtbl *IDirect3D2_vtbl; - const IDirect3DVtbl *IDirect3D_vtbl; + IDirect3D IDirect3D_iface; const IWineD3DDeviceParentVtbl *device_parent_vtbl; /* See comment in IDirectDraw::AddRef */ @@ -184,11 +184,6 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN; IWineD3DVertexDeclaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; -static inline IDirectDrawImpl *ddraw_from_d3d1(IDirect3D *iface) -{ - return (IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawImpl, IDirect3D_vtbl)); -} - static inline IDirectDrawImpl *ddraw_from_d3d2(IDirect3D2 *iface) { return (IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawImpl, IDirect3D2_vtbl)); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d08bf01..c9e3493 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -141,7 +141,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, /* Direct3D */ else if ( IsEqualGUID( &IID_IDirect3D , refiid ) ) { - *obj = &This->ddraw->IDirect3D_vtbl; + *obj = &This->ddraw->IDirect3D_iface; TRACE("(%p) Returning IDirect3D interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) @@ -1769,8 +1769,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface, if(!Direct3D) return DDERR_INVALIDPARAMS; - IDirect3D_AddRef((IDirect3D *)&This->ddraw->IDirect3D_vtbl); - *Direct3D = (IDirect3D *)&This->ddraw->IDirect3D_vtbl; + IDirect3D_AddRef(&This->ddraw->IDirect3D_iface); + *Direct3D = &This->ddraw->IDirect3D_iface; TRACE(" returning interface %p\n", *Direct3D); return D3D_OK; }

1 0

Owen Rudge : hhctrl.ocx: Implement pop-up menu for Options button.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 27048ce116016ddb98ff14550beac1c30b179d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27048ce116016ddb98ff14550… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jan 17 22:26:50 2011 +0000 hhctrl.ocx: Implement pop-up menu for Options button. --- dlls/hhctrl.ocx/help.c | 48 ++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 19 ++++++ dlls/hhctrl.ocx/resource.h | 4 + po/ar.po | 112 ++++++++++++++++++++++--------------- po/bg.po | 124 +++++++++++++++++++++++++---------------- po/ca.po | 110 ++++++++++++++++++++++-------------- po/cs.po | 115 +++++++++++++++++++++++--------------- po/da.po | 133 ++++++++++++++++++++++++++----------------- po/de.po | 113 +++++++++++++++++++++++-------------- po/el.po | 119 ++++++++++++++++++++++++--------------- po/en.po | 124 ++++++++++++++++++++++++++--------------- po/en_US.po | 110 ++++++++++++++++++++++-------------- po/eo.po | 112 ++++++++++++++++++++++--------------- po/es.po | 123 +++++++++++++++++++++++++---------------- po/fa.po | 112 ++++++++++++++++++++++--------------- po/fi.po | 119 +++++++++++++++++++++++++--------------- po/fr.po | 127 ++++++++++++++++++++++++++---------------- po/he.po | 123 +++++++++++++++++++++++++---------------- po/hi.po | 112 ++++++++++++++++++++++--------------- po/hu.po | 117 ++++++++++++++++++++++++-------------- po/it.po | 123 +++++++++++++++++++++++++---------------- po/ja.po | 117 ++++++++++++++++++++++++-------------- po/ko.po | 117 ++++++++++++++++++++++++-------------- po/lt.po | 113 +++++++++++++++++++++++-------------- po/ml.po | 112 ++++++++++++++++++++++--------------- po/nb_NO.po | 123 +++++++++++++++++++++++++---------------- po/nl.po | 127 ++++++++++++++++++++++++++---------------- po/or.po | 112 ++++++++++++++++++++++--------------- po/pa.po | 112 ++++++++++++++++++++++--------------- po/pl.po | 117 ++++++++++++++++++++++++-------------- po/pt_BR.po | 113 +++++++++++++++++++++++-------------- po/pt_PT.po | 127 ++++++++++++++++++++++++++---------------- po/rm.po | 114 +++++++++++++++++++++++--------------- po/ro.po | 113 +++++++++++++++++++++++-------------- po/ru.po | 113 +++++++++++++++++++++++-------------- po/sk.po | 112 ++++++++++++++++++++++--------------- po/sl.po | 127 ++++++++++++++++++++++++++---------------- po/sr_RS(a)cyrillic.po | 119 +++++++++++++++++++++++++--------------- po/sr_RS(a)latin.po | 119 +++++++++++++++++++++++++--------------- po/sv.po | 117 ++++++++++++++++++++++++-------------- po/te.po | 112 ++++++++++++++++++++++--------------- po/th.po | 112 ++++++++++++++++++++++--------------- po/tr.po | 117 ++++++++++++++++++++++++-------------- po/uk.po | 113 +++++++++++++++++++++++-------------- po/wa.po | 112 ++++++++++++++++++++++--------------- po/wine.pot | 110 ++++++++++++++++++++++-------------- po/zh_CN.po | 123 +++++++++++++++++++++++++---------------- po/zh_TW.po | 123 +++++++++++++++++++++++++---------------- 48 files changed, 3321 insertions(+), 2024 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27048ce116016ddb98ff1…

1 0

Juan Lang : crypt32: Fix memory leak (Valgrind).
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: fdd0114407221caedd57fd3f77213b6200813037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd0114407221caedd57fd3f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 17 18:25:05 2011 -0800 crypt32: Fix memory leak (Valgrind). --- dlls/crypt32/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b083d26..ee80f1a 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1599,6 +1599,7 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( CryptDestroyKey(expKey); } + CryptMemFree(keyInfo.PublicKey.pbData); CryptMemFree(keyInfo.Algorithm.pszObjId); CryptMemFree(keyInfo.Algorithm.Parameters.pbData); return ret;

1 0

Hans Leidekker : msi: Free memory on error (valgrind).
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 17cc23d3657fb7c0eab0a019dfba69f1ef81e524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cc23d3657fb7c0eab0a019d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 18 09:16:28 2011 +0100 msi: Free memory on error (valgrind). --- dlls/msi/assembly.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 04d42b4..539855c 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -319,6 +319,9 @@ MSIASSEMBLY *load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { WARN("can't get display name\n"); msiobj_release( &rec->hdr ); + msi_free( a->feature ); + msi_free( a->manifest ); + msi_free( a->application ); msi_free( a ); return NULL; }

1 0

Vincent Povirk : oleaut32: Deserialize VT_BOOL as 2 bytes, not 4.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 63f2121d92bd404a0430f78bd85f43b0941794ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f2121d92bd404a0430f78bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 17 23:27:39 2011 -0600 oleaut32: Deserialize VT_BOOL as 2 bytes, not 4. --- dlls/oleaut32/tmarshal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 45aacf2..9d3d73e 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -556,7 +556,6 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { return sizeof(DATE); case VT_CY: return sizeof(CY); - /* FIXME: VT_BOOL should return 2? */ case VT_VARIANT: return sizeof(VARIANT)+3; /* FIXME: why the +3? */ case VT_CARRAY: { @@ -573,6 +572,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { return 8; case VT_UI2: case VT_I2: + case VT_BOOL: return 2; case VT_UI1: case VT_I1: @@ -628,7 +628,6 @@ serialize_param( if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,8); return hres; - case VT_BOOL: case VT_ERROR: case VT_INT: case VT_UINT: @@ -642,6 +641,7 @@ serialize_param( return hres; case VT_I2: case VT_UI2: + case VT_BOOL: hres = S_OK; if (debugout) TRACE_(olerelay)("%04x\n",*arg & 0xffff); if (writeit) @@ -927,7 +927,6 @@ deserialize_param( if (debugout) TRACE_(olerelay)("%x%x",arg[0],arg[1]); return hres; case VT_ERROR: - case VT_BOOL: case VT_I4: case VT_INT: case VT_UINT: @@ -941,6 +940,7 @@ deserialize_param( return hres; case VT_I2: case VT_UI2: + case VT_BOOL: if (readit) { DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD));

1 0