wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Eric Pouech : kernel32: Added support for extended capacities in terminfo for xterm-like terminals .
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: be69efa51d70a259b9d86ae617f6bb30a6a06691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be69efa51d70a259b9d86ae61… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:21 2011 +0100 kernel32: Added support for extended capacities in terminfo for xterm-like terminals. --- dlls/kernel32/term.c | 98 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index dd3b788..c0aacd9 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <stdlib.h> #ifdef HAVE_NCURSES_H # include <ncurses.h> #elif defined(HAVE_CURSES_H) @@ -220,47 +221,40 @@ struct dbkey_descr DWORD_PTR p3; }; -struct dbkey_pair +struct dbkey_init { - const char* string; - unsigned string_len; + const char* string_normal; + const char* string_xterm; struct dbkey_descr descr; }; -static struct dbkey_pair TERM_dbkey_init[] = { - {"kcud1", {dbk_complex, 0x50, 0x28, 0}}, - {"kcuu1", {dbk_complex, 0x48, 0x26, 0}}, - {"kcub1", {dbk_complex, 0x4b, 0x25, 0}}, - {"kcuf1", {dbk_complex, 0x4d, 0x27, 0}}, - {"khome", {dbk_complex, 0x47, 0x24, 0}}, - {"kbs", {dbk_simple, 0x7f, 0x00, 0}}, - {"kf1", {dbk_complex, 0x3b, 0x70, 0}}, - {"kf2", {dbk_complex, 0x3c, 0x71, 0}}, - {"kf3", {dbk_complex, 0x3d, 0x72, 0}}, - {"kf4", {dbk_complex, 0x3e, 0x73, 0}}, - {"kf5", {dbk_complex, 0x3f, 0x74, 0}}, - {"kf6", {dbk_complex, 0x40, 0x75, 0}}, - {"kf7", {dbk_complex, 0x41, 0x76, 0}}, - {"kf8", {dbk_complex, 0x42, 0x77, 0}}, - {"kf9", {dbk_complex, 0x43, 0x78, 0}}, - {"kf10", {dbk_complex, 0x44, 0x79, 0}}, - {"kf11", {dbk_complex, 0xd9, 0x7a, 0}}, - {"kf12", {dbk_complex, 0xda, 0x7b, 0}}, - {"kdch1", {dbk_complex, 0x53, 0x2e, 0}}, - {"kich1", {dbk_complex, 0x52, 0x2d, 0}}, - {"knp", {dbk_complex, 0x51, 0x22, 0}}, - {"kpp", {dbk_complex, 0x49, 0x21, 0}}, - {"kcbt", {dbk_simple, 0x09, 0x00, SHIFT_PRESSED}}, - - {"kend", {dbk_complex, 0x4f, 0x23, 0}}, - /* {"kmous", NULL, }, */ - {"kDC", {dbk_complex, 0x53, 0x2e, SHIFT_PRESSED}}, - {"kEND", {dbk_complex, 0x4f, 0x23, SHIFT_PRESSED}}, - {"kHOM", {dbk_complex, 0x47, 0x24, SHIFT_PRESSED}}, - {"kIC", {dbk_complex, 0x52, 0x2d, SHIFT_PRESSED}}, - {"kLFT", {dbk_complex, 0x4b, 0x25, SHIFT_PRESSED}}, - {"kRIT", {dbk_complex, 0x4d, 0x27, SHIFT_PRESSED}}, +static struct dbkey_init TERM_dbkey_init[] = { + {"kcud1", "kDN", {dbk_complex, 0x50, 0x28, 0}}, + {"kcuu1", "kUP", {dbk_complex, 0x48, 0x26, 0}}, + {"kcub1", "kLFT", {dbk_complex, 0x4b, 0x25, 0}}, + {"kcuf1", "kRIT", {dbk_complex, 0x4d, 0x27, 0}}, + {"khome", "kHOM", {dbk_complex, 0x47, 0x24, 0}}, + {"kbs", NULL, {dbk_simple, 0x7f, 0x00, 0}}, + {"kf1", NULL, {dbk_complex, 0x3b, 0x70, 0}}, + {"kf2", NULL, {dbk_complex, 0x3c, 0x71, 0}}, + {"kf3", NULL, {dbk_complex, 0x3d, 0x72, 0}}, + {"kf4", NULL, {dbk_complex, 0x3e, 0x73, 0}}, + {"kf5", NULL, {dbk_complex, 0x3f, 0x74, 0}}, + {"kf6", NULL, {dbk_complex, 0x40, 0x75, 0}}, + {"kf7", NULL, {dbk_complex, 0x41, 0x76, 0}}, + {"kf8", NULL, {dbk_complex, 0x42, 0x77, 0}}, + {"kf9", NULL, {dbk_complex, 0x43, 0x78, 0}}, + {"kf10", NULL, {dbk_complex, 0x44, 0x79, 0}}, + {"kf11", NULL, {dbk_complex, 0xd9, 0x7a, 0}}, + {"kf12", NULL, {dbk_complex, 0xda, 0x7b, 0}}, + {"kdch1", "kDC", {dbk_complex, 0x53, 0x2e, 0}}, + {"kich1", "kIC", {dbk_complex, 0x52, 0x2d, 0}}, + {"knp", "kNXT", {dbk_complex, 0x51, 0x22, 0}}, + {"kpp", "kPRV", {dbk_complex, 0x49, 0x21, 0}}, + {"kcbt", NULL, {dbk_simple, 0x09, 0x00, SHIFT_PRESSED}}, + {"kend", "kEND", {dbk_complex, 0x4f, 0x23, 0}}, + /* {"kmous", NULL, }, */ /* Still some keys to manage: KEY_DL KEY_IL KEY_EIC KEY_CLEAR KEY_EOS KEY_EOL KEY_SF KEY_SR KEY_STAB KEY_CTAB @@ -279,13 +273,20 @@ static struct dbkey_pair TERM_dbkey_init[] = { */ }; +struct dbkey_pair +{ + const char* string; + unsigned string_len; + struct dbkey_descr descr; +}; + static struct dbkey_pair* TERM_dbkey; static unsigned TERM_dbkey_size; static unsigned TERM_dbkey_index; static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) { - if (!string) return FALSE; + if (!string || string == (const char*)-1) return TRUE; if (!TERM_dbkey) { TERM_dbkey_size = 32; @@ -310,11 +311,30 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) static BOOL TERM_BuildKeyDB(void) { - unsigned i; + unsigned i, len; + struct dbkey_descr descr; + char tmp[64]; + for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) { - if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string), &TERM_dbkey_init[i].descr)) + if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; + if (TERM_dbkey_init[i].string_xterm) + { + descr = TERM_dbkey_init[i].descr; + strcpy(tmp, TERM_dbkey_init[i].string_xterm); + len = strlen(tmp); + tmp[len + 1] = '\0'; +#define X(v, f) do { tmp[len] = v; descr.p3 = (f); if (!TERM_AddKeyDescr(tigetstr(tmp), &descr)) return FALSE; } while (0) + X('\0', SHIFT_PRESSED); + X('3', LEFT_ALT_PRESSED); + X('4', SHIFT_PRESSED | LEFT_ALT_PRESSED); + X('5', LEFT_CTRL_PRESSED); + X('6', LEFT_CTRL_PRESSED|SHIFT_PRESSED); + X('7', LEFT_CTRL_PRESSED|LEFT_ALT_PRESSED); + X('8', LEFT_CTRL_PRESSED|LEFT_ALT_PRESSED|SHIFT_PRESSED); +#undef X + } } return TRUE; }

1 0

Eric Pouech : kernel32: Store key len in dbkey_pair structure for efficiency reasons.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 00767952e7dbebea06c4e4e083db2ee4812d6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00767952e7dbebea06c4e4e08… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:15 2011 +0100 kernel32: Store key len in dbkey_pair structure for efficiency reasons. --- dlls/kernel32/term.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index f3dd77b..dd3b788 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -223,6 +223,7 @@ struct dbkey_descr struct dbkey_pair { const char* string; + unsigned string_len; struct dbkey_descr descr; }; @@ -300,8 +301,9 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) TERM_dbkey = new; TERM_dbkey_size *= 2; } - TERM_dbkey[TERM_dbkey_index].string = string; - TERM_dbkey[TERM_dbkey_index].descr = *descr; + TERM_dbkey[TERM_dbkey_index].string = string; + TERM_dbkey[TERM_dbkey_index].string_len = strlen(string); + TERM_dbkey[TERM_dbkey_index].descr = *descr; TERM_dbkey_index++; return TRUE; } @@ -352,7 +354,7 @@ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) { if (!memcmp(TERM_dbkey[i].string, in, len)) { - if (len < strlen(TERM_dbkey[i].string)) return 0; + if (len < TERM_dbkey[i].string_len) return 0; if (found) return 0; found = &TERM_dbkey[i].descr; }

1 0

Hans Leidekker : kernel32/tests: Add a test for ioctl 0x560000.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 541c116368a95674976b9417c695d2b4c99ab9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=541c116368a95674976b9417c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 11:32:04 2011 +0100 kernel32/tests: Add a test for ioctl 0x560000. --- dlls/kernel32/tests/volume.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 482ff16..f632eb0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -509,6 +509,32 @@ static void test_enum_vols(void) pFindVolumeClose( hFind ); } +static void test_ioctl_560000(void) +{ + BOOL ret; + DWORD size; + HANDLE handle; + static DWORD data[16]; + + handle = CreateFileA( "\\\\.\\c:", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) + { + win_skip("can't open c: drive %u\n", GetLastError()); + return; + } + size = 0; + ret = DeviceIoControl( handle, 0x560000, &data, sizeof(data), &data, sizeof(data), &size, NULL ); + if (!ret && GetLastError() == ERROR_INVALID_FUNCTION) + { + win_skip("ioctl 0x560000 not supported\n"); + CloseHandle( handle ); + return; + } + ok(ret, "DeviceIoControl failed %u\n", GetLastError()); + ok(size == 32, "expected 32, got %u\n", size); + CloseHandle( handle ); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -529,4 +555,5 @@ START_TEST(volume) test_GetLogicalDriveStringsW(); test_GetVolumeInformationA(); test_enum_vols(); + test_ioctl_560000(); }

1 0

Hans Leidekker : mountmgr: Add a stub implementation of ioctl 0x560000.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: d49134686190c31d5054b6778ffe7af6d3b51bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49134686190c31d5054b6778… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 11:31:46 2011 +0100 mountmgr: Add a stub implementation of ioctl 0x560000. --- dlls/mountmgr.sys/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6c182e8..e23d741 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -896,6 +896,16 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_CDROM_READ_TOC: irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; break; + case 0x560000: + { + DWORD len = min( 32, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + FIXME( "returning zero-filled buffer for ioctl 0x560000\n" ); + memset( irp->MdlAddress->StartVa, 0, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } default: FIXME( "unsupported ioctl %x\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DTexture8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8bf1940c623d7bf44020509325a601dbd9fa2ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf1940c623d7bf4402050932… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:47:39 2011 +0100 d3d8: COM cleanup for the IDirect3DTexture8 iface. --- dlls/d3d8/d3d8_private.h | 9 ++-- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 106 +++++++++++++++++++++++++++++---------------- 3 files changed, 73 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bf1940c623d7bf440205…

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DCubeTexture8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8a13f059eaa454685325047610921c6754008d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a13f059eaa45468532504761… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:46:17 2011 +0100 d3d8: COM cleanup for the IDirect3DCubeTexture8 iface. --- dlls/d3d8/cubetexture.c | 104 +++++++++++++++++++++++++++++----------------- dlls/d3d8/d3d8_private.h | 9 ++-- dlls/d3d8/device.c | 2 +- 3 files changed, 71 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a13f059eaa4546853250…

1 0

Michael Stefaniuc : d3d8: Remove the unused struct IDirect3DResource8Impl.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 75cc89857ef477e3bec9729603529ef02d2fdc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc89857ef477e3bec972960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:44:00 2011 +0100 d3d8: Remove the unused struct IDirect3DResource8Impl. The rest was removed in cdb7a94ae2dc. --- dlls/d3d8/d3d8_private.h | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 11ae25f..7e852ad 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -109,7 +109,6 @@ typedef struct IDirect3DCubeTexture8Impl IDirect3DCubeTexture8Impl; typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl; typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl; typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; -typedef struct IDirect3DResource8Impl IDirect3DResource8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; @@ -273,16 +272,6 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; -struct IDirect3DResource8Impl -{ - /* IUnknown fields */ - const IDirect3DResource8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DResource *wineD3DResource; -}; - /* ---------------------- */ /* IDirect3DVertexBuffer8 */ /* ---------------------- */

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DSwapChain8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 8ec3238b5ee6e937da22c0069f86d7fc233b2839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec3238b5ee6e937da22c0069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:40:25 2011 +0100 d3d8: COM cleanup for the IDirect3DSwapChain8 iface. --- dlls/d3d8/d3d8_private.h | 8 ++++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/swapchain.c | 33 +++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index d8f79f0..11ae25f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -230,14 +230,14 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, struct IDirect3DSwapChain8Impl { /* IUnknown fields */ - const IDirect3DSwapChain8Vtbl *lpVtbl; - LONG ref; + IDirect3DSwapChain8 IDirect3DSwapChain8_iface; + LONG ref; /* IDirect3DSwapChain8 fields */ - IWineD3DSwapChain *wineD3DSwapChain; + IWineD3DSwapChain *wineD3DSwapChain; /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DDevice8 *parentDevice; }; HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl *device, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6f6622a..0cd56e5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(IDirect3DDe } TRACE("Created swapchain %p.\n", object); - *swapchain = (IDirect3DSwapChain8 *)object; + *swapchain = &object->IDirect3DSwapChain8_iface; return D3D_OK; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 4875d3a..d6b7a28 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -23,10 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DSwapChain IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN8 iface, REFIID riid, LPVOID* ppobj) +static inline IDirect3DSwapChain8Impl *impl_from_IDirect3DSwapChain8(IDirect3DSwapChain8 *iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + return CONTAINING_RECORD(iface, IDirect3DSwapChain8Impl, IDirect3DSwapChain8_iface); +} + +static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(IDirect3DSwapChain8 *iface, + REFIID riid, void **ppobj) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -42,8 +47,9 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -51,8 +57,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { return ref; } -static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -68,9 +75,11 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) return ref; } -/* IDirect3DSwapChain8 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; +static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(IDirect3DSwapChain8 *iface, + const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, + const RGNDATA *pDirtyRegion) +{ + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); HRESULT hr; TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", @@ -86,7 +95,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8 **ppBackBuffer) { - IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); IWineD3DSurface *mySurface = NULL; HRESULT hr; @@ -123,7 +132,7 @@ HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl HRESULT hr; swapchain->ref = 1; - swapchain->lpVtbl = &Direct3DSwapChain8_Vtbl; + swapchain->IDirect3DSwapChain8_iface.lpVtbl = &Direct3DSwapChain8_Vtbl; wined3d_parameters.BackBufferWidth = present_parameters->BackBufferWidth; wined3d_parameters.BackBufferHeight = present_parameters->BackBufferHeight;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVolume8 iface.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 05b6032fb655f6b9e57f2cdab862935c05a1a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b6032fb655f6b9e57f2cdab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:37:33 2011 +0100 d3d8: COM cleanup for the IDirect3DVolume8 iface. --- dlls/d3d8/d3d8_private.h | 11 +++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 69 +++++++++++++++++++++++++++++---------------- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 372d51c..d8f79f0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -204,18 +204,17 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte */ struct IDirect3DVolume8Impl { - /* IUnknown fields */ - const IDirect3DVolume8Vtbl *lpVtbl; - LONG ref; + IDirect3DVolume8 IDirect3DVolume8_iface; + LONG ref; /* IDirect3DVolume8 fields */ - IWineD3DVolume *wineD3DVolume; + IWineD3DVolume *wineD3DVolume; /* The volume container */ - IUnknown *container; + IUnknown *container; /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IUnknown *forwardReference; }; HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b5c5da3..6f6622a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2873,7 +2873,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent *volume = object->wineD3DVolume; IWineD3DVolume_AddRef(*volume); - IDirect3DVolume8_Release((IDirect3DVolume8 *)object); + IDirect3DVolume8_Release(&object->IDirect3DVolume8_iface); object->container = superior; object->forwardReference = superior; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 75fb07c..3fd67da 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -23,9 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -/* IDirect3DVolume8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVolume8Impl, IDirect3DVolume8_iface); +} + +static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -41,8 +47,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 ifac return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -67,8 +74,9 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { } } -static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); @@ -93,10 +101,10 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { } } -/* IDirect3DVolume8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, + IDirect3DDevice8 **device) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); IDirect3DResource8 *resource; HRESULT hr; @@ -114,8 +122,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, ID return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + const void *pData, DWORD SizeOfData, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", @@ -128,8 +138,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, + void *pData, DWORD *pSizeOfData) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", @@ -142,8 +154,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(IDirect3DVolume8 *iface, REFGUID refguid) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); @@ -155,8 +168,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 ifa return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(IDirect3DVolume8 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", @@ -171,8 +186,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, return res; } -static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *pDesc) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); WINED3DVOLUME_DESC wined3ddesc; TRACE("iface %p, desc %p.\n", iface, pDesc); @@ -193,8 +209,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV return D3D_OK; } -static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, + D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", @@ -208,8 +226,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DL return hr; } -static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { - IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; +static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(IDirect3DVolume8 *iface) +{ + IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -253,7 +272,7 @@ HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, { HRESULT hr; - volume->lpVtbl = &Direct3DVolume8_Vtbl; + volume->IDirect3DVolume8_iface.lpVtbl = &Direct3DVolume8_Vtbl; volume->ref = 1; hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage,

1 0

Jacek Caban : mshtml: Added support for recursive script runners.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: c8a953c5d0f7b559235805ff6ecf89fa785671a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a953c5d0f7b559235805ff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 31 00:32:30 2011 +0100 mshtml: Added support for recursive script runners. --- dlls/mshtml/mshtml_private.h | 10 -- dlls/mshtml/mutation.c | 343 +++++++++++++++++++-------------------- dlls/mshtml/tests/exectest.html | 2 +- 3 files changed, 171 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a953c5d0f7b55923580…

1 0

← Newer
1
2
3
4
5
6
7
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011