October 2011 - Wine-Commits

Francois Gouget : kernel32: Fix the NT path returned by QueryFullProcessImageName().
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: a2af890483580c9acbd00555dd4daa9d447e83fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2af890483580c9acbd00555d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 3 23:56:12 2011 +0200 kernel32: Fix the NT path returned by QueryFullProcessImageName(). --- dlls/kernel32/process.c | 60 +++++++++++++++++++++++++++++----------- dlls/kernel32/tests/process.c | 8 +++--- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3c6ae63..c540f44 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3429,14 +3429,12 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp { BYTE buffer[sizeof(UNICODE_STRING) + MAX_PATH*sizeof(WCHAR)]; /* this buffer should be enough */ UNICODE_STRING *dynamic_buffer = NULL; - UNICODE_STRING nt_path; UNICODE_STRING *result = NULL; NTSTATUS status; DWORD needed; - RtlInitUnicodeStringEx(&nt_path, NULL); - /* FIXME: On Windows, ProcessImageFileName return an NT path. We rely that it being a DOS path, - * as this is on Wine. */ + /* FIXME: On Windows, ProcessImageFileName return an NT path. In Wine it + * is a DOS path and we depend on this. */ status = NtQueryInformationProcess(hProcess, ProcessImageFileName, buffer, sizeof(buffer) - sizeof(WCHAR), &needed); if (status == STATUS_INFO_LENGTH_MISMATCH) @@ -3452,28 +3450,56 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp if (dwFlags & PROCESS_NAME_NATIVE) { - result->Buffer[result->Length / sizeof(WCHAR)] = 0; - if (!RtlDosPathNameToNtPathName_U(result->Buffer, &nt_path, NULL, NULL)) + WCHAR drive[3]; + WCHAR device[1024]; + DWORD ntlen, devlen; + + if (result->Buffer[1] != ':' || result->Buffer[0] < 'A' || result->Buffer[0] > 'Z') { - status = STATUS_OBJECT_PATH_NOT_FOUND; + /* We cannot convert it to an NT device path so fail */ + status = STATUS_NO_SUCH_DEVICE; goto cleanup; } - result = &nt_path; - } - if (result->Length/sizeof(WCHAR) + 1 > *pdwSize) - { - status = STATUS_BUFFER_TOO_SMALL; - goto cleanup; + /* Find this drive's NT device path */ + drive[0] = result->Buffer[0]; + drive[1] = ':'; + drive[2] = 0; + if (!QueryDosDeviceW(drive, device, sizeof(device)/sizeof(*device))) + { + status = STATUS_NO_SUCH_DEVICE; + goto cleanup; + } + + devlen = lstrlenW(device); + ntlen = devlen + (result->Length/sizeof(WCHAR) - 2); + if (ntlen + 1 > *pdwSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + *pdwSize = ntlen; + + memcpy(lpExeName, device, devlen * sizeof(*device)); + memcpy(lpExeName + devlen, result->Buffer + 2, result->Length - 2 * sizeof(WCHAR)); + lpExeName[*pdwSize] = 0; + TRACE("NT path: %s\n", debugstr_w(lpExeName)); } + else + { + if (result->Length/sizeof(WCHAR) + 1 > *pdwSize) + { + status = STATUS_BUFFER_TOO_SMALL; + goto cleanup; + } - *pdwSize = result->Length/sizeof(WCHAR); - memcpy( lpExeName, result->Buffer, result->Length ); - lpExeName[*pdwSize] = 0; + *pdwSize = result->Length/sizeof(WCHAR); + memcpy( lpExeName, result->Buffer, result->Length ); + lpExeName[*pdwSize] = 0; + } cleanup: HeapFree(GetProcessHeap(), 0, dynamic_buffer); - RtlFreeUnicodeString(&nt_path); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 65c2836..ac387bf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1802,7 +1802,7 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(TRUE, pQueryFullProcessImageNameW(hSelf, PROCESS_NAME_NATIVE, buf, &size)); expect_eq_d(lstrlenW(buf), size); ok(buf[0] == '\\', "NT path should begin with '\\'\n"); - todo_wine ok(memcmp(buf, deviceW, sizeof(WCHAR)*lstrlenW(deviceW)) == 0, "NT path should begin with \\Device\n"); + ok(memcmp(buf, deviceW, sizeof(WCHAR)*lstrlenW(deviceW)) == 0, "NT path should begin with \\Device\n"); module_name[2] = '\0'; *device = '\0'; @@ -1817,10 +1817,10 @@ static void test_QueryFullProcessImageNameW(void) } else { - todo_wine ok(buf[len] == '\\', "expected '%c' to be a '\\' in %s\n", buf[len], wine_dbgstr_w(module_name)); + ok(buf[len] == '\\', "expected '%c' to be a '\\' in %s\n", buf[len], wine_dbgstr_w(module_name)); buf[len] = '\0'; - todo_wine ok(lstrcmpiW(device, buf) == 0, "expected %s to match %s\n", wine_dbgstr_w(device), wine_dbgstr_w(buf)); - todo_wine ok(lstrcmpiW(module_name+3, buf+len+1) == 0, "expected '%s' to match '%s'\n", wine_dbgstr_w(module_name+3), wine_dbgstr_w(buf+len+1)); + ok(lstrcmpiW(device, buf) == 0, "expected %s to match %s\n", wine_dbgstr_w(device), wine_dbgstr_w(buf)); + ok(lstrcmpiW(module_name+3, buf+len+1) == 0, "expected '%s' to match '%s'\n", wine_dbgstr_w(module_name+3), wine_dbgstr_w(buf+len+1)); } CloseHandle(hSelf);

1 0

Charles Davis : libwine: Fix resetting the install_name on Mac OS.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 07decea8721e8cb9098f02e4b6d93d6c435d270f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07decea8721e8cb9098f02e4b… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 3 12:16:39 2011 -0600 libwine: Fix resetting the install_name on Mac OS. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index fe33595..1ef9ff2 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -128,7 +128,7 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -headerpad_max_install_names libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@

1 0

Hans Leidekker : include: Add patchapi.h.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: e5f1ea57999d4a5252bc03105ffe47921277ab24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f1ea57999d4a5252bc03105… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 14:59:25 2011 -0500 include: Add patchapi.h. --- include/Makefile.in | 1 + include/patchapi.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1aac2c5..fc9c38a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -422,6 +422,7 @@ SRCDIR_INCLUDES = \ oledberr.h \ oledlg.h \ opnrst.idl \ + patchapi.h \ pdh.h \ pdhmsg.h \ pktdef.h \ diff --git a/include/patchapi.h b/include/patchapi.h new file mode 100644 index 0000000..44a4a15 --- /dev/null +++ b/include/patchapi.h @@ -0,0 +1,39 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PATCHAPI_H_ +#define _PATCHAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 +#define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 +#define APPLY_OPTION_TEST_ONLY 0x00000004 +#define APPLY_OPTION_VALID_FLAGS 0x00000007 + +BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); +BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); +#define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) + +#ifdef __cplusplus +} +#endif + +#endif /* _PATCHAPI_H_ */

1 0

Ričardas Barkauskas : ddraw: COM cleanup for the IDirectDrawPalette interface.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: a6656468ef0bbd9f2df0341d5d134ea706db0ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6656468ef0bbd9f2df0341d5… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:27 2011 -0500 ddraw: COM cleanup for the IDirectDrawPalette interface. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 7 ++++++- dlls/ddraw/palette.c | 14 +++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3fe3204..140ee88 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3609,7 +3609,7 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags, } TRACE("Created palette %p.\n", object); - *Palette = (IDirectDrawPalette *)object; + *Palette = &object->IDirectDrawPalette_iface; LeaveCriticalSection(&ddraw_cs); return DD_OK; } @@ -3626,7 +3626,7 @@ static HRESULT WINAPI ddraw4_CreatePalette(IDirectDraw4 *iface, DWORD flags, PAL hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); if (SUCCEEDED(hr) && *palette) { - IDirectDrawPaletteImpl *impl = (IDirectDrawPaletteImpl *)*palette; + IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw4_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3646,7 +3646,7 @@ static HRESULT WINAPI ddraw2_CreatePalette(IDirectDraw2 *iface, DWORD flags, hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); if (SUCCEEDED(hr) && *palette) { - IDirectDrawPaletteImpl *impl = (IDirectDrawPaletteImpl *)*palette; + IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; } @@ -3666,7 +3666,7 @@ static HRESULT WINAPI ddraw1_CreatePalette(IDirectDraw *iface, DWORD flags, hr = ddraw7_CreatePalette(&This->IDirectDraw7_iface, flags, entries, palette, outer_unknown); if (SUCCEEDED(hr) && *palette) { - IDirectDrawPaletteImpl *impl = (IDirectDrawPaletteImpl *)*palette; + IDirectDrawPaletteImpl *impl = impl_from_IDirectDrawPalette(*palette); IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7898d28..f587126 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -360,7 +360,7 @@ IDirectDrawClipperImpl *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper * struct IDirectDrawPaletteImpl { /* IUnknown fields */ - const IDirectDrawPaletteVtbl *lpVtbl; + IDirectDrawPalette IDirectDrawPalette_iface; LONG ref; struct wined3d_palette *wineD3DPalette; @@ -369,6 +369,11 @@ struct IDirectDrawPaletteImpl IUnknown *ifaceToRelease; }; +static inline IDirectDrawPaletteImpl *impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, IDirectDrawPalette_iface); +} + IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN; HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index ff78411..534255a 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -70,7 +70,7 @@ IDirectDrawPaletteImpl_QueryInterface(IDirectDrawPalette *iface, static ULONG WINAPI IDirectDrawPaletteImpl_AddRef(IDirectDrawPalette *iface) { - IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; + IDirectDrawPaletteImpl *This = impl_from_IDirectDrawPalette(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -90,7 +90,7 @@ IDirectDrawPaletteImpl_AddRef(IDirectDrawPalette *iface) static ULONG WINAPI IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface) { - IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; + IDirectDrawPaletteImpl *This = impl_from_IDirectDrawPalette(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectDrawPaletteImpl_GetCaps(IDirectDrawPalette *iface, DWORD *Caps) { - IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; + IDirectDrawPaletteImpl *This = impl_from_IDirectDrawPalette(iface); TRACE("iface %p, caps %p.\n", iface, Caps); @@ -191,7 +191,7 @@ IDirectDrawPaletteImpl_SetEntries(IDirectDrawPalette *iface, DWORD Count, PALETTEENTRY *PalEnt) { - IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; + IDirectDrawPaletteImpl *This = impl_from_IDirectDrawPalette(iface); HRESULT hr; TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n", @@ -230,7 +230,7 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface, DWORD Count, PALETTEENTRY *PalEnt) { - IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; + IDirectDrawPaletteImpl *This = impl_from_IDirectDrawPalette(iface); HRESULT hr; TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n", @@ -262,7 +262,7 @@ IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette * { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_palette_vtbl); - return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, lpVtbl); + return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, IDirectDrawPalette_iface); } HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, @@ -270,7 +270,7 @@ HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, { HRESULT hr; - palette->lpVtbl = &ddraw_palette_vtbl; + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; hr = wined3d_palette_create(ddraw->wined3d_device, flags,

1 0

Ričardas Barkauskas : ddraw: Use impl_from_IDirect3DViewport3 instead of cast to IDirect3DViewportImpl* .
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 26be3c300016fc44bda0575f7621e7a85c9a5748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26be3c300016fc44bda0575f7… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:42 2011 -0500 ddraw: Use impl_from_IDirect3DViewport3 instead of cast to IDirect3DViewportImpl*. --- dlls/ddraw/viewport.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 741090d..3eb348e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -109,6 +109,11 @@ static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp) lpvp->dvMinZ, lpvp->dvMaxZ); } +static inline IDirect3DViewportImpl *impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, lpVtbl); +} + /***************************************************************************** * IUnknown Methods. *****************************************************************************/ @@ -161,7 +166,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_QueryInterface(IDirect3DViewport3 *i static ULONG WINAPI IDirect3DViewportImpl_AddRef(IDirect3DViewport3 *iface) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -181,7 +186,7 @@ IDirect3DViewportImpl_AddRef(IDirect3DViewport3 *iface) static ULONG WINAPI IDirect3DViewportImpl_Release(IDirect3DViewport3 *iface) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -235,7 +240,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface, D3DVIEWPORT *lpData) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); DWORD dwSize; TRACE("iface %p, data %p.\n", iface, lpData); @@ -288,8 +293,8 @@ static HRESULT WINAPI IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, D3DVIEWPORT *lpData) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - LPDIRECT3DVIEWPORT3 current_viewport; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); + IDirect3DViewport3 *current_viewport; TRACE("iface %p, data %p.\n", iface, lpData); @@ -358,7 +363,7 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface, DWORD dwFlags, DWORD *lpOffScreen) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); D3DMATRIX view_mat, world_mat, proj_mat, mat; float *in; float *out; @@ -515,7 +520,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE hMat) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); IDirect3DMaterialImpl *m; TRACE("iface %p, material %#x.\n", iface, hMat); @@ -565,7 +570,7 @@ IDirect3DViewportImpl_GetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE *lphMat, BOOL *lpValid) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); TRACE("iface %p, material %p, valid %p.\n", iface, lphMat, lpValid); @@ -655,10 +660,10 @@ IDirect3DViewportImpl_GetBackgroundDepth(IDirect3DViewport3 *iface, static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, DWORD dwCount, D3DRECT *lpRects, DWORD dwFlags) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); DWORD color = 0x00000000; HRESULT hr; - LPDIRECT3DVIEWPORT3 current_viewport; + IDirect3DViewport3 *current_viewport; IDirect3DDevice3 *d3d_device3; TRACE("iface %p, rect_count %u, rects %p, flags %#x.\n", iface, dwCount, lpRects, dwFlags); @@ -692,7 +697,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); if(current_viewport) { - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)current_viewport; + IDirect3DViewportImpl *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE); IDirect3DViewport3_Release(current_viewport); } @@ -718,7 +723,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, static HRESULT WINAPI IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); IDirect3DLightImpl *lpDirect3DLightImpl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); DWORD i = 0; DWORD map = This->map_lights; @@ -773,7 +778,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, static HRESULT WINAPI IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); IDirect3DLightImpl *l = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); @@ -815,7 +820,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *ifac static HRESULT WINAPI IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight, IDirect3DLight **lplpDirect3DLight, DWORD dwFlags) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); IDirect3DLightImpl *l = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); struct list *entry; HRESULT hr; @@ -896,7 +901,7 @@ static HRESULT WINAPI IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 *iface, D3DVIEWPORT2 *lpData) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); DWORD dwSize; TRACE("iface %p, data %p.\n", iface, lpData); @@ -948,8 +953,8 @@ static HRESULT WINAPI IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface, D3DVIEWPORT2 *lpData) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - LPDIRECT3DVIEWPORT3 current_viewport; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); + IDirect3DViewport3 *current_viewport; TRACE("iface %p, data %p.\n", iface, lpData); @@ -1051,9 +1056,9 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, D3DVALUE dvZ, DWORD dwStencil) { - IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; + IDirect3DViewportImpl *This = impl_from_IDirect3DViewport3(iface); HRESULT hr; - LPDIRECT3DVIEWPORT3 current_viewport; + IDirect3DViewport3 *current_viewport; IDirect3DDevice3 *d3d_device3; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", @@ -1074,7 +1079,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil); IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); if(current_viewport) { - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)current_viewport; + IDirect3DViewportImpl *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE); IDirect3DViewport3_Release(current_viewport); }

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DViewport3 interface.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 6253d319cbd889cc38fc144304dedfff800f0a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6253d319cbd889cc38fc14430… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:51 2011 -0500 ddraw: COM cleanup for IDirect3DViewport3 interface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 26 +++++++++++++++----------- dlls/ddraw/viewport.c | 6 +++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 140ee88..d4bdf28 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4150,7 +4150,7 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 d3d_viewport_init(object, This); TRACE("Created viewport %p.\n", object); - *viewport = (IDirect3DViewport3 *)object; + *viewport = &object->IDirect3DViewport3_iface; return D3D_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a2f0007..a8f384f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -442,7 +442,7 @@ IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) DECLSPEC_HIDD *****************************************************************************/ struct IDirect3DViewportImpl { - const IDirect3DViewport3Vtbl *lpVtbl; + IDirect3DViewport3 IDirect3DViewport3_iface; LONG ref; /* IDirect3DViewport fields */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eb43aa3..4ca94f6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -775,7 +775,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface, TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); - return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); + return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, &vp->IDirect3DViewport3_iface); } static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, @@ -786,7 +786,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); - return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); + return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, &vp->IDirect3DViewport3_iface); } /***************************************************************************** @@ -836,7 +836,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *ifa TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); - return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); + return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, &vp->IDirect3DViewport3_iface); } static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *iface, @@ -847,7 +847,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *ifac TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); - return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); + return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, &vp->IDirect3DViewport3_iface); } /***************************************************************************** @@ -876,6 +876,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, { IDirect3DDeviceImpl *This = device_from_device3(iface); IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Viewport3); + IDirect3DViewportImpl *next; struct list *entry; TRACE("iface %p, viewport %p, next %p, flags %#x.\n", @@ -911,7 +912,10 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, } if (entry) - *lplpDirect3DViewport3 = (IDirect3DViewport3 *)LIST_ENTRY(entry, IDirect3DViewportImpl, entry); + { + next = LIST_ENTRY(entry, IDirect3DViewportImpl, entry); + *lplpDirect3DViewport3 = &next->IDirect3DViewport3_iface; + } else *lplpDirect3DViewport3 = NULL; @@ -931,7 +935,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface iface, Viewport2, lplpDirect3DViewport2, Flags); hr = IDirect3DDevice3_NextViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, - (IDirect3DViewport3 *)vp, &res, Flags); + &vp->IDirect3DViewport3_iface, &res, Flags); *lplpDirect3DViewport2 = (IDirect3DViewport2 *)res; return hr; } @@ -948,7 +952,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface, iface, Viewport, lplpDirect3DViewport, Flags); hr = IDirect3DDevice3_NextViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, - (IDirect3DViewport3 *)vp, &res, Flags); + &vp->IDirect3DViewport3_iface, &res, Flags); *lplpDirect3DViewport = (IDirect3DViewport *)res; return hr; } @@ -1726,8 +1730,8 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, if (This->current_viewport) { TRACE("ViewportImpl is at %p, interface is at %p\n", This->current_viewport, - (IDirect3DViewport3 *)This->current_viewport); - IDirect3DViewport3_Release((IDirect3DViewport3 *)This->current_viewport); + &This->current_viewport->IDirect3DViewport3_iface); + IDirect3DViewport3_Release(&This->current_viewport->IDirect3DViewport3_iface); } IDirect3DViewport3_AddRef(Direct3DViewport3); @@ -1750,7 +1754,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2 TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); return IDirect3DDevice3_SetCurrentViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, - (IDirect3DViewport3 *)vp); + &vp->IDirect3DViewport3_iface); } /***************************************************************************** @@ -1780,7 +1784,7 @@ IDirect3DDeviceImpl_3_GetCurrentViewport(IDirect3DDevice3 *iface, return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - *Direct3DViewport3 = (IDirect3DViewport3 *)This->current_viewport; + *Direct3DViewport3 = &This->current_viewport->IDirect3DViewport3_iface; /* AddRef the returned viewport */ if(*Direct3DViewport3) IDirect3DViewport3_AddRef(*Direct3DViewport3); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 910fcab..6024aae 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -111,7 +111,7 @@ static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp) static inline IDirect3DViewportImpl *impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) { - return CONTAINING_RECORD(iface, IDirect3DViewportImpl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } /***************************************************************************** @@ -1124,12 +1124,12 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *i { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_viewport_vtbl); - return CONTAINING_RECORD(iface, IDirect3DViewportImpl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) { - viewport->lpVtbl = &d3d_viewport_vtbl; + viewport->IDirect3DViewport3_iface.lpVtbl = &d3d_viewport_vtbl; viewport->ref = 1; viewport->ddraw = ddraw; viewport->use_vp2 = 0xff;

1 0

Bruno Jesus : ws2_32: Fix UDP LINGER support in getsockopt.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: d278834dabc29e4f37027c39e1e6ca31ea961d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d278834dabc29e4f37027c39e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 4 00:10:25 2011 -0300 ws2_32: Fix UDP LINGER support in getsockopt. --- dlls/ws2_32/socket.c | 10 ++++++++-- dlls/ws2_32/tests/sock.c | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0313fc..7a1947f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2575,7 +2575,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { struct linger lingval; - unsigned int len = sizeof(struct linger); + int so_type; + unsigned int len = sizeof(struct linger), slen = sizeof(int); /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) @@ -2586,7 +2587,12 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) + if ((getsockopt(fd, SOL_SOCKET, SO_TYPE, &so_type, &slen) == 0 && so_type == SOCK_DGRAM)) + { + SetLastError(WSAENOPROTOOPT); + ret = SOCKET_ERROR; + } + else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b358250..7a64e0e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2630,12 +2630,12 @@ static void test_extendedSocketOptions(void) "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", ret, WSAGetLastError(), optval, optval); + SetLastError(0xdeadbeef); optlen = sizeof(LINGER); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen); - todo_wine{ - ok(ret == SOCKET_ERROR, "getsockopt should fail for UDP sockets but return value is 0x%08x\n", ret); - } - + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAENOPROTOOPT), + "getsockopt should fail for UDP sockets setting last error to WSAENOPROTOOPT, got %d with %d\n", + ret, WSAGetLastError()); closesocket(sock); if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) {

1 0

Thomas Faber : gdi32/tests: Fix MSVC build in icm.c.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 412565136629687be09e754cb146a7e8b8b298bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=412565136629687be09e754cb… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 16:47:02 2011 +0200 gdi32/tests: Fix MSVC build in icm.c. --- dlls/gdi32/tests/icm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 65ce208..4afae6b 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -170,7 +170,7 @@ static void test_SetICMMode( HDC dc ) DeleteDC( dc ); } -static CALLBACK INT enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) { trace("%s\n", filename); return 1; @@ -191,7 +191,7 @@ static void test_EnumICMProfilesA( HDC dc ) ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); } -static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) { return 1; }

1 0

Thomas Faber : gdi32/tests: Fix MSVC build in bitmap.c.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 1354d15a056e1f77a735c1734ea497379155915d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354d15a056e1f77a735c1734… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 20:05:34 2011 +0200 gdi32/tests: Fix MSVC build in bitmap.c. --- dlls/gdi32/tests/bitmap.c | 64 ++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bb4d43f..c5e8f59 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -816,8 +816,7 @@ static void test_dibsections(void) static void test_dib_formats(void) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])]; - BITMAPINFO *bi = (BITMAPINFO *)buffer; + BITMAPINFO *bi; char data[256]; void *bits; int planes, bpp, compr; @@ -826,6 +825,7 @@ static void test_dib_formats(void) UINT ret; BOOL expect_ok, todo; + bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); hdc = GetDC( 0 ); memdc = CreateCompatibleDC( 0 ); hbmp = CreateCompatibleBitmap( hdc, 10, 10 ); @@ -1123,6 +1123,7 @@ static void test_dib_formats(void) DeleteDC( memdc ); DeleteObject( hbmp ); ReleaseDC( 0, hdc ); + HeapFree( GetProcessHeap(), 0, bi ); } static void test_mono_dibsection(void) @@ -1448,10 +1449,8 @@ static void test_bmBits(void) static void test_GetDIBits_selected_DIB(UINT bpp) { HBITMAP dib; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; UINT dib_size, dib32_size; @@ -1461,6 +1460,9 @@ static void test_GetDIBits_selected_DIB(UINT bpp) UINT i; int res; + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + /* Create a DIB section with a color table */ info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -1549,15 +1551,15 @@ static void test_GetDIBits_selected_DIB(UINT bpp) SelectObject(dib_dc, old_bmp); DeleteDC(dib_dc); DeleteObject(dib); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits_selected_DDB(BOOL monochrome) { HBITMAP ddb; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; HDC ddb_dc, dc; @@ -1567,6 +1569,9 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) UINT i, j; int res; + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + width = height = 16; /* Create a DDB (device-dependent bitmap) */ @@ -1659,6 +1664,8 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) SelectObject(ddb_dc, old_bmp); DeleteDC(ddb_dc); DeleteObject(ddb); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits(void) @@ -3575,15 +3582,14 @@ static void test_GetSetDIBits_rtl(void) static void test_GetDIBits_scanlines(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); HBITMAP dib; DWORD data[128], inverted_bits[64]; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -3888,20 +3894,20 @@ static void test_GetDIBits_scanlines(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4064,12 +4070,12 @@ static void test_SetDIBits(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE4(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle4_data[26] = { 0x03, 0x52, 0x07, 0x68, 0x00, 0x00, /* 5, 2, 5, 6, 8, 6, 8, 6, (8, 6,) <eol> */ @@ -4088,7 +4094,7 @@ static void test_SetDIBits_RLE4(void) 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4119,12 +4125,12 @@ static void test_SetDIBits_RLE4(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle8_data[20] = { 0x03, 0x02, 0x04, 0xf0, 0x00, 0x00, /* 2, 2, 2, f0, f0, f0, f0, <eol> */ @@ -4150,7 +4156,7 @@ static void test_SetDIBits_RLE8(void) 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4268,21 +4274,20 @@ static void test_SetDIBits_RLE8(void) memset( dib_bits, 0xaa, 64 * 4 ); DeleteObject( dib ); - ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4635,12 +4640,12 @@ static void test_SetDIBitsToDevice(void) DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); BYTE rle8_data[20] = { 0x04, 0x02, 0x03, 0xf0, 0x00, 0x00, /* 2, 2, 2, 2, f0, f0, f0, <eol> */ @@ -4666,7 +4671,7 @@ static void test_SetDIBitsToDevice_RLE8(void) 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4856,6 +4861,7 @@ static void test_SetDIBitsToDevice_RLE8(void) DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } START_TEST(bitmap)

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport for application provided interfaces .
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 25bf0e914cf20fda2984953b32d673d9cd68238b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf0e914cf20fda2984953b3… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:54 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a8f384f..b50c0bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -470,6 +470,7 @@ struct IDirect3DViewportImpl }; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) DECLSPEC_HIDDEN; /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ca94f6..a2e27ac 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,7 +712,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl *buffer = unsafe_impl_from_IDirect3DExecuteBuffer(ExecuteBuffer); - IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *Direct3DViewportImpl = unsafe_impl_from_IDirect3DViewport(Viewport); HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); @@ -782,7 +782,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); @@ -843,7 +843,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *ifac IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); @@ -944,7 +944,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface, IDirect3DViewport *Viewport, IDirect3DViewport **lplpDirect3DViewport, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Viewport); IDirect3DViewport3 *res; HRESULT hr; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 6024aae..bbff45b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1127,6 +1127,14 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *i return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) +{ + /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */ + if (!iface) return NULL; + assert(iface->lpVtbl == (IDirect3DViewportVtbl *)&d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); +} + void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) { viewport->IDirect3DViewport3_iface.lpVtbl = &d3d_viewport_vtbl;

1 0