October 2011 - Wine-commits

Thomas Faber : kernel32/tests: Fix MSVC build in console.c.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: fc2dcd04ab34f56701b144762b1a9f673a81d895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2dcd04ab34f56701b144762… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 23:10:08 2011 +0200 kernel32/tests: Fix MSVC build in console.c. --- dlls/kernel32/tests/console.c | 316 ++++++++++++++++++++-------------------- 1 files changed, 158 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc2dcd04ab34f56701b14…

1 0

Francois Gouget : kernel32/tests: Test K32GetProcessImageFileNameA() and improve the QueryFullProcessImageNameA() tests.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 80ba9f35979a8042197c26019f84dad6074172e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ba9f35979a8042197c26019… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 4 05:11:40 2011 +0200 kernel32/tests: Test K32GetProcessImageFileNameA() and improve the QueryFullProcessImageNameA() tests. --- dlls/kernel32/tests/process.c | 64 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 61e3069..dfb2d2a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -62,6 +62,7 @@ static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); +static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); /* ############################### */ static char base[MAX_PATH]; @@ -204,6 +205,7 @@ static int init(void) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); + pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); return 1; } @@ -1638,21 +1640,70 @@ static void test_GetProcessVersion(void) CloseHandle(pi.hThread); } -static void test_ProcessNameA(void) +static void test_GetProcessImageFileNameA(void) +{ + DWORD rc; + CHAR process[MAX_PATH]; + static const char harddisk[] = "\\Device\\HarddiskVolume"; + + if (!pK32GetProcessImageFileNameA) + { + win_skip("K32GetProcessImageFileNameA is unavailable\n"); + return; + } + + /* callers must guess the buffer size */ + SetLastError(0xdeadbeef); + rc = pK32GetProcessImageFileNameA(GetCurrentProcess(), NULL, 0); + ok(!rc && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "K32GetProcessImageFileNameA(no buffer): returned %u, le=%u\n", rc, GetLastError()); + + *process = '\0'; + rc = pK32GetProcessImageFileNameA(GetCurrentProcess(), process, sizeof(process)); + expect_eq_d(rc, lstrlenA(process)); + if (strncmp(process, harddisk, lstrlenA(harddisk))) + { + todo_wine win_skip("%s is probably on a network share, skipping tests\n", process); + return; + } + + if (!pQueryFullProcessImageNameA) + win_skip("QueryFullProcessImageNameA unavailable (added in Windows Vista)\n"); + else + { + CHAR image[MAX_PATH]; + DWORD length; + + length = sizeof(image); + expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), PROCESS_NAME_NATIVE, image, &length)); + expect_eq_d(length, lstrlenA(image)); + ok(lstrcmpi(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); + } +} + +static void test_QueryFullProcessImageNameA(void) { #define INIT_STR "Just some words" DWORD length, size; - CHAR buf[1024]; + CHAR buf[MAX_PATH], module[MAX_PATH]; if (!pQueryFullProcessImageNameA) { win_skip("QueryFullProcessImageNameA unavailable (added in Windows Vista)\n"); return; } + + *module = '\0'; + SetLastError(0); /* old Windows don't reset it on success */ + size = GetModuleFileNameA(NULL, module, sizeof(module)); + ok(size && GetLastError() != ERROR_INSUFFICIENT_BUFFER, "GetModuleFileName failed: %u le=%u\n", size, GetLastError()); + /* get the buffer length without \0 terminator */ - length = 1024; + length = sizeof(buf); expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &length)); expect_eq_d(length, lstrlenA(buf)); + ok((buf[0] == '\\' && buf[1] == '\\') || + lstrcmpi(buf, module) == 0, "expected %s to match %s\n", buf, module); /* when the buffer is too small * - function fail with error ERROR_INSUFFICIENT_BUFFER @@ -1685,7 +1736,7 @@ static void test_ProcessNameA(void) expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); } -static void test_ProcessName(void) +static void test_QueryFullProcessImageNameW(void) { HANDLE hSelf; WCHAR module_name[1024]; @@ -1888,8 +1939,9 @@ START_TEST(process) test_ExitCode(); test_OpenProcess(); test_GetProcessVersion(); - test_ProcessNameA(); - test_ProcessName(); + test_GetProcessImageFileNameA(); + test_QueryFullProcessImageNameA(); + test_QueryFullProcessImageNameW(); test_Handles(); test_SystemInfo(); test_RegistryQuota();

1 0

Francois Gouget : kernel32/tests: Better check the NT path returned by QueryFullProcessImageName().
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 1d1ebefff185c3f35c99c0384a9c18f35548ef25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1ebefff185c3f35c99c0384… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 3 23:55:09 2011 +0200 kernel32/tests: Better check the NT path returned by QueryFullProcessImageName(). --- dlls/kernel32/tests/process.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index dfb2d2a..65c2836 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1739,10 +1739,10 @@ static void test_QueryFullProcessImageNameA(void) static void test_QueryFullProcessImageNameW(void) { HANDLE hSelf; - WCHAR module_name[1024]; + WCHAR module_name[1024], device[1024]; WCHAR deviceW[] = {'\\','D', 'e','v','i','c','e',0}; WCHAR buf[1024]; - DWORD size; + DWORD size, len; if (!pQueryFullProcessImageNameW) { @@ -1787,13 +1787,6 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(0, size); expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); - /* native path */ - size = sizeof(buf) / sizeof(buf[0]); - 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"); - /* Buffer too small */ size = lstrlenW(module_name)/2; SetLastError(0xdeadbeef); @@ -1803,6 +1796,33 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); expect_eq_ws_i(module_name, buf); /* buffer not changed */ + + /* native path */ + size = sizeof(buf) / sizeof(buf[0]); + 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"); + + module_name[2] = '\0'; + *device = '\0'; + size = QueryDosDeviceW(module_name, device, sizeof(device)); + ok(size, "QueryDosDeviceW failed: le=%u\n", GetLastError()); + len = lstrlenW(device); + ok(size >= len+2, "expected %d to be greater than %d+2 = strlen(%s)\n", size, len, wine_dbgstr_w(device)); + + if (size >= lstrlenW(buf)) + { + ok(0, "expected %s\\ to match the start of %s\n", wine_dbgstr_w(device), wine_dbgstr_w(buf)); + } + else + { + todo_wine 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)); + } + CloseHandle(hSelf); }

1 0

Francois Gouget : kernel32: Fix the NT path returned by QueryFullProcessImageName().
by Alexandre Julliard 04 Oct '11

04 Oct '11

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 04 Oct '11

04 Oct '11

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

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawPalette for application provided interfaces .
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: a8616b7fcb75e694b45c15c48a4d9550c8aca9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8616b7fcb75e694b45c15c48… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:08 2011 -0500 ddraw: Use unsafe_impl_from_IDirectDrawPalette for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/palette.c | 7 +++++++ dlls/ddraw/surface.c | 2 +- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0572172..7898d28 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -369,6 +369,8 @@ struct IDirectDrawPaletteImpl IUnknown *ifaceToRelease; }; +IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN; + HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index b68cf82..ff78411 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -258,6 +258,13 @@ static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = IDirectDrawPaletteImpl_SetEntries }; +IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &ddraw_palette_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, lpVtbl); +} + HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4cd1452..7c70f0f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4288,7 +4288,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); IDirectDrawPalette *oldPal; IDirectDrawSurfaceImpl *surf; - IDirectDrawPaletteImpl *PalImpl = (IDirectDrawPaletteImpl *)Pal; + IDirectDrawPaletteImpl *PalImpl = unsafe_impl_from_IDirectDrawPalette(Pal); HRESULT hr; TRACE("iface %p, palette %p.\n", iface, Pal);

1 0

Ričardas Barkauskas : ddraw: COM cleanup for the IDirectDrawPalette interface.
by Alexandre Julliard 04 Oct '11

04 Oct '11

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/tests: IDirect3DViewport3, IDirect3DViewport2 and IDirect3DViewport use same implementation.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: f0354fde023e68f7f66ffa6381ad572af6b5ccd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0354fde023e68f7f66ffa638… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:32 2011 -0500 ddraw/tests: IDirect3DViewport3, IDirect3DViewport2 and IDirect3DViewport use same implementation. --- dlls/ddraw/tests/d3d.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 40a58e8..4cd9346 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1186,6 +1186,7 @@ static void ViewportTest(void) { HRESULT hr; LPDIRECT3DVIEWPORT2 Viewport2; + IDirect3DViewport3 *Viewport3; D3DVIEWPORT vp1_data, ret_vp1_data; D3DVIEWPORT2 vp2_data, ret_vp2_data; float infinity; @@ -1197,6 +1198,12 @@ static void ViewportTest(void) hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport2, (void**) &Viewport2); ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr); + ok(Viewport2 == (IDirect3DViewport2 *)Viewport, "IDirect3DViewport2 iface diffrent from IDirect3DViewport\n"); + + hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport3, (void**) &Viewport3); + ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr); + ok(Viewport3 == (IDirect3DViewport3 *)Viewport, "IDirect3DViewport3 iface diffrent from IDirect3DViewport\n"); + IDirect3DViewport3_Release(Viewport3); vp1_data.dwSize = sizeof(vp1_data); vp1_data.dwX = 0;

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport3 for application provided interfaces .
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: f44734b7240d7c096db9ec308092aae934f48687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44734b7240d7c096db9ec308… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:37 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport3 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f587126..a2f0007 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -469,6 +469,8 @@ struct IDirect3DViewportImpl IDirect3DMaterialImpl *background; }; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; + /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 28e1eaf..eb43aa3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -750,7 +750,7 @@ IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Viewport) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Viewport); TRACE("iface %p, viewport %p.\n", iface, Viewport); @@ -808,7 +808,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, static HRESULT WINAPI IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport) { IDirect3DDeviceImpl *device = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(viewport); TRACE("iface %p, viewport %p.\n", iface, viewport); @@ -875,7 +875,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport3; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Viewport3); struct list *entry; TRACE("iface %p, viewport %p, next %p, flags %#x.\n", @@ -1703,7 +1703,7 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Direct3DViewport3) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport3; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Direct3DViewport3); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 7dc3dd4..741090d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1115,6 +1115,13 @@ static const struct IDirect3DViewport3Vtbl d3d_viewport_vtbl = IDirect3DViewportImpl_Clear2, }; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, lpVtbl); +} + void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) { viewport->lpVtbl = &d3d_viewport_vtbl;

1 0

Ričardas Barkauskas : ddraw: Use impl_from_IDirect3DViewport3 instead of cast to IDirect3DViewportImpl* .
by Alexandre Julliard 04 Oct '11

04 Oct '11

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