November 2011 - Wine-commits

Stefan Dösinger : d3d8/tests: Port the double unlock test to d3d8.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: ecb403ee2a1d559ffcd8c90f4680e816cd6cd44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb403ee2a1d559ffcd8c90f4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 12:53:29 2011 +0200 d3d8/tests: Port the double unlock test to d3d8. --- dlls/d3d8/tests/surface.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index c3890d6..f544201 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -1,5 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet + * Copyright 2011 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -411,6 +412,77 @@ static void test_surface_format_null(IDirect3DDevice8 *device) IDirect3DTexture8_Release(texture); } +static void test_surface_double_unlock(IDirect3DDevice8 *device) +{ + static struct + { + D3DPOOL pool; + const char *name; + } + pools[] = + { + { D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT" }, + { D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM" }, + }; + IDirect3DSurface8 *surface; + unsigned int i; + HRESULT hr; + D3DLOCKED_RECT lr; + IDirect3D8 *d3d; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "IDirect3DDevice8_GetDirect3D failed, hr = 0x%08x\n", hr); + + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) + { + switch (pools[i].pool) + { + case D3DPOOL_DEFAULT: + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_RENDERTARGET, + D3DRTYPE_SURFACE, D3DFMT_X8R8G8B8); + if (FAILED(hr)) + { + skip("D3DFMT_X8R8G8B8 render targets not supported, skipping double unlock DEFAULT pool test\n"); + continue; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 64, 64, D3DFMT_X8R8G8B8, + D3DMULTISAMPLE_NONE, TRUE, &surface); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateRenderTarget failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + break; + + case D3DPOOL_SYSTEMMEM: + hr = IDirect3DDevice8_CreateImageSurface(device, 64, 64, D3DFMT_X8R8G8B8, &surface); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateImageSurface failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + break; + + default: + break; + } + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Unlock without lock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + hr = IDirect3DSurface8_LockRect(surface, &lr, NULL, 0); + ok(SUCCEEDED(hr), "IDirect3DSurface8_LockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed, hr = 0x%08x, pool %s\n", + hr, pools[i].name); + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Double unlock returned 0x%08x, expected 0x%08x, pool %s\n", + hr, D3DERR_INVALIDCALL, pools[i].name); + + IDirect3DSurface8_Release(surface); + } + + IDirect3D8_Release(d3d); +} + START_TEST(surface) { HMODULE d3d8_handle; @@ -433,6 +505,7 @@ START_TEST(surface) test_private_data(device_ptr); test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); + test_surface_double_unlock(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Stefan Dösinger : d3d8/tests: Port the block lock test to d3d8.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: a3ca9a8bff1dc7ddda03aa83e1a18d28ee665c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ca9a8bff1dc7ddda03aa83e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 12:57:52 2011 +0200 d3d8/tests: Port the block lock test to d3d8. --- dlls/d3d8/tests/surface.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index f544201..837e2d4 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -483,6 +483,146 @@ static void test_surface_double_unlock(IDirect3DDevice8 *device) IDirect3D8_Release(d3d); } +static void test_surface_lockrect_blocks(IDirect3DDevice8 *device) +{ + IDirect3DTexture8 *texture; + IDirect3DSurface8 *surface; + IDirect3D8 *d3d; + D3DLOCKED_RECT locked_rect; + unsigned int i, j; + HRESULT hr; + RECT rect; + + const struct + { + D3DFORMAT fmt; + const char *name; + unsigned int block_width; + unsigned int block_height; + BOOL broken; + } + formats[] = + { + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, FALSE}, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, FALSE}, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, FALSE}, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, FALSE}, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, FALSE}, + /* ATI2N has 2x2 blocks on all AMD cards and Geforce 7 cards, + * which doesn't match the format spec. On newer Nvidia cards + * it has the correct 4x4 block size */ + {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, TRUE}, + /* YUY2 and UYVY are not supported in d3d8, there is no way + * to use them with this API considering their restrictions */ + }; + const struct + { + D3DPOOL pool; + const char *name; + /* Don't check the return value, Nvidia returns D3DERR_INVALIDCALL for some formats + * and E_INVALIDARG/DDERR_INVALIDPARAMS for others. */ + BOOL success; + } + pools[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", TRUE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM",TRUE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + }; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "IDirect3DDevice8_GetDirect3D failed (%08x)\n", hr); + + for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) { + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_DYNAMIC, + D3DRTYPE_TEXTURE, formats[i].fmt); + if (FAILED(hr)) + { + skip("Format %s not supported, skipping lockrect offset test\n", formats[i].name); + continue; + } + + for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++) + { + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, + pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0, + formats[i].fmt, pools[j].pool, &texture); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateTexture failed (%08x)\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "IDirect3DTexture8_GetSurfaceLevel failed (%08x)\n", hr); + IDirect3DTexture8_Release(texture); + + if (formats[i].block_width > 1) + { + SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed (%08x)\n", hr); + } + } + + if (formats[i].block_height > 1) + { + SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed (%08x)\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(formats[i].broken), + "Partial block lock %s, expected %s, format %s, pool %s.\n", + SUCCEEDED(hr) ? "succeeded" : "failed", + pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed (%08x)\n", hr); + } + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &rect, 0); + ok(hr == D3D_OK, "Full block lock returned %08x, expected %08x, format %s, pool %s\n", + hr, D3D_OK, formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "IDirect3DSurface8_UnlockRect failed (%08x)\n", hr); + } + + IDirect3DSurface8_Release(surface); + } + } + IDirect3D8_Release(d3d); +} + START_TEST(surface) { HMODULE d3d8_handle; @@ -506,6 +646,7 @@ START_TEST(surface) test_surface_dimensions(device_ptr); test_surface_format_null(device_ptr); test_surface_double_unlock(device_ptr); + test_surface_lockrect_blocks(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Frédéric Delanoy : cmd: Avoid comparison between signed and unsigned values.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 6221e300bcd1b1e457e90bdf34c1870d449a9300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6221e300bcd1b1e457e90bdf3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 7 10:52:22 2011 +0100 cmd: Avoid comparison between signed and unsigned values. --- programs/cmd/batch.c | 4 ++-- programs/cmd/builtins.c | 8 ++++---- programs/cmd/directory.c | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index acab893..7edb8df 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -186,12 +186,12 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) { * NULL on error or EOF */ -WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h) +WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) { DWORD charsRead; BOOL status; LARGE_INTEGER filepos; - int i; + DWORD i; /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 22e0342..5272bfc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1323,9 +1323,9 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, * Simple on-line help. Help text is stored in the resource file. */ -void WCMD_give_help (const WCHAR *command) { - - int i; +void WCMD_give_help (const WCHAR *command) +{ + size_t i; command = WCMD_skip_leading_spaces((WCHAR*) command); if (strlenW(command) == 0) { @@ -1630,7 +1630,7 @@ void WCMD_move (void) if (GetFileAttributesW(dest) != INVALID_FILE_ATTRIBUTES) { BOOL force = FALSE; WCHAR copycmd[MAXSTRING]; - int len; + DWORD len; /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ if (strstrW (quals, parmNoY)) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 3c6bd06..3634ded 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -627,10 +627,10 @@ static void WCMD_dir_trailer(WCHAR drive) { * */ -void WCMD_directory (WCHAR *cmd) { - +void WCMD_directory (WCHAR *cmd) +{ WCHAR path[MAX_PATH], cwd[MAX_PATH]; - int status; + DWORD status; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; WCHAR *p; WCHAR string[MAXSTRING]; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 962fd52..205d31c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -101,7 +101,7 @@ static inline BOOL WCMD_is_console_handle(HANDLE h) { return (((DWORD_PTR)h) & 3) == 3; } -WCHAR *WCMD_fgets (WCHAR *buf, int n, HANDLE stream); +WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 40ed145..b529672 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -123,8 +123,8 @@ static char *get_file_buffer(void) * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format */ -static void WCMD_output_asis_len(const WCHAR *message, int len, HANDLE device) { - +static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) +{ DWORD nOut= 0; DWORD res = 0; @@ -169,7 +169,7 @@ void WCMD_output (const WCHAR *format, ...) { va_list ap; WCHAR string[1024]; - int ret; + DWORD ret; va_start(ap,format); ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); @@ -191,7 +191,7 @@ void WCMD_output_stderr (const WCHAR *format, ...) { va_list ap; WCHAR string[1024]; - int ret; + DWORD ret; va_start(ap,format); ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap);

1 0

Bernhard Loos : mountmgr, ntoskrnl: METHOD_BUFFERED uses irp->AssociatedIrp .SystemBuffer for both input and output.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: a1377319bc6b4b7c7841c5410d252f48bba28c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1377319bc6b4b7c7841c5410… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Nov 1 13:03:12 2011 +0100 mountmgr, ntoskrnl: METHOD_BUFFERED uses irp->AssociatedIrp.SystemBuffer for both input and output. --- dlls/mountmgr.sys/device.c | 8 ++++---- dlls/mountmgr.sys/mountmgr.c | 41 +++++++++++++++++++++++++---------------- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index a3aa81c..3f393e7 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -890,7 +890,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) info.TracksPerCylinder = 255; info.SectorsPerTrack = 63; info.BytesPerSector = 512; - memcpy( irp->MdlAddress->StartVa, &info, len ); + memcpy( irp->AssociatedIrp.SystemBuffer, &info, len ); irp->IoStatus.Information = len; irp->IoStatus.u.Status = STATUS_SUCCESS; break; @@ -910,7 +910,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) info.DiskSize.QuadPart = info.Geometry.Cylinders.QuadPart * info.Geometry.TracksPerCylinder * info.Geometry.SectorsPerTrack * info.Geometry.BytesPerSector; info.Data[0] = 0; - memcpy( irp->MdlAddress->StartVa, &info, len ); + memcpy( irp->AssociatedIrp.SystemBuffer, &info, len ); irp->IoStatus.Information = len; irp->IoStatus.u.Status = STATUS_SUCCESS; break; @@ -919,7 +919,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { DWORD len = min( sizeof(dev->devnum), irpsp->Parameters.DeviceIoControl.OutputBufferLength ); - memcpy( irp->MdlAddress->StartVa, &dev->devnum, len ); + memcpy( irp->AssociatedIrp.SystemBuffer, &dev->devnum, len ); irp->IoStatus.Information = len; irp->IoStatus.u.Status = STATUS_SUCCESS; break; @@ -932,7 +932,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) DWORD len = min( 32, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); FIXME( "returning zero-filled buffer for IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS\n" ); - memset( irp->MdlAddress->StartVa, 0, len ); + memset( irp->AssociatedIrp.SystemBuffer, 0, len ); irp->IoStatus.Information = len; irp->IoStatus.u.Status = STATUS_SUCCESS; break; diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 4e9900f..afb9d92 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -153,12 +153,12 @@ static BOOL matching_mount_point( const struct mount_point *mount, const MOUNTMG } /* implementation of IOCTL_MOUNTMGR_QUERY_POINTS */ -static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, - void *out_buff, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +static NTSTATUS query_mount_points( void *buff, SIZE_T insize, + SIZE_T outsize, IO_STATUS_BLOCK *iosb ) { UINT count, pos, size; - const MOUNTMGR_MOUNT_POINT *input = in_buff; - MOUNTMGR_MOUNT_POINTS *info = out_buff; + MOUNTMGR_MOUNT_POINT *input = buff; + MOUNTMGR_MOUNT_POINTS *info; struct mount_point *mount; /* sanity checks */ @@ -185,11 +185,18 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, if (size > outsize) { + info = buff; if (size >= sizeof(info->Size)) info->Size = size; iosb->Information = sizeof(info->Size); return STATUS_MORE_ENTRIES; } + input = HeapAlloc( GetProcessHeap(), 0, insize ); + if (!input) + return STATUS_NO_MEMORY; + memcpy( input, buff, insize ); + info = buff; + info->NumberOfMountPoints = count; count = 0; LIST_FOR_EACH_ENTRY( mount, &mount_points_list, struct mount_point, entry ) @@ -198,23 +205,24 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, info->MountPoints[count].DeviceNameOffset = pos; info->MountPoints[count].DeviceNameLength = mount->name.Length; - memcpy( (char *)out_buff + pos, mount->name.Buffer, mount->name.Length ); + memcpy( (char *)buff + pos, mount->name.Buffer, mount->name.Length ); pos += mount->name.Length; info->MountPoints[count].SymbolicLinkNameOffset = pos; info->MountPoints[count].SymbolicLinkNameLength = mount->link.Length; - memcpy( (char *)out_buff + pos, mount->link.Buffer, mount->link.Length ); + memcpy( (char *)buff + pos, mount->link.Buffer, mount->link.Length ); pos += mount->link.Length; info->MountPoints[count].UniqueIdOffset = pos; info->MountPoints[count].UniqueIdLength = mount->id_len; - memcpy( (char *)out_buff + pos, mount->id, mount->id_len ); + memcpy( (char *)buff + pos, mount->id, mount->id_len ); pos += mount->id_len; pos = (pos + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); count++; } info->Size = pos; iosb->Information = pos; + HeapFree( GetProcessHeap(), 0, input ); return STATUS_SUCCESS; } @@ -271,11 +279,11 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) } /* implementation of IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE */ -static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, - void *out_buff, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, + SIZE_T outsize, IO_STATUS_BLOCK *iosb ) { - const struct mountmgr_unix_drive *input = in_buff; - struct mountmgr_unix_drive *output = out_buff; + const struct mountmgr_unix_drive *input = buff; + struct mountmgr_unix_drive *output = NULL; char *device, *mount_point; int letter = tolowerW( input->letter ); NTSTATUS status; @@ -302,6 +310,9 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, if (device) size += strlen(device) + 1; if (mount_point) size += strlen(mount_point) + 1; + input = NULL; + output = buff; + if (size > outsize) { iosb->Information = 0; @@ -364,9 +375,8 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_MOUNTMGR_QUERY_POINTS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) return STATUS_INVALID_PARAMETER; - irp->IoStatus.u.Status = query_mount_points( irpsp->Parameters.DeviceIoControl.Type3InputBuffer, + irp->IoStatus.u.Status = query_mount_points( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, - irp->MdlAddress->StartVa, irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; @@ -374,15 +384,14 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) return STATUS_INVALID_PARAMETER; irp->IoStatus.Information = 0; - irp->IoStatus.u.Status = define_unix_drive( irpsp->Parameters.DeviceIoControl.Type3InputBuffer, + irp->IoStatus.u.Status = define_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength ); break; case IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) return STATUS_INVALID_PARAMETER; - irp->IoStatus.u.Status = query_unix_drive( irpsp->Parameters.DeviceIoControl.Type3InputBuffer, + irp->IoStatus.u.Status = query_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, - irp->MdlAddress->StartVa, irpsp->Parameters.DeviceIoControl.OutputBufferLength, &irp->IoStatus ); break; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9c7916e..b00c070 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winternl.h" #include "excpt.h" +#include "winioctl.h" #include "ddk/ntddk.h" #include "wine/unicode.h" #include "wine/server.h" @@ -151,7 +152,13 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, memset( &mdl, 0x77, sizeof(mdl) ); irp.RequestorMode = UserMode; - irp.AssociatedIrp.SystemBuffer = in_buff; + if ((code & 3) == METHOD_BUFFERED) + { + irp.AssociatedIrp.SystemBuffer = HeapAlloc( GetProcessHeap(), 0, max( in_size, *out_size ) ); + if (!irp.AssociatedIrp.SystemBuffer) + return STATUS_NO_MEMORY; + memcpy( irp.AssociatedIrp.SystemBuffer, in_buff, in_size ); + } irp.UserBuffer = out_buff; irp.MdlAddress = &mdl; irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp; @@ -186,6 +193,11 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, GetCurrentThreadId(), dispatch, device, &irp, status ); *out_size = (irp.IoStatus.u.Status >= 0) ? irp.IoStatus.Information : 0; + if ((code & 3) == METHOD_BUFFERED) + { + memcpy( out_buff, irp.AssociatedIrp.SystemBuffer, *out_size ); + HeapFree( GetProcessHeap(), 0, irp.AssociatedIrp.SystemBuffer ); + } return irp.IoStatus.u.Status; }

1 0

Bernhard Loos : mountmgr: Also call IoCompleteRequest in case of an error.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 79b93fff0b7f55e574aee636a92d7bbd8c8037ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b93fff0b7f55e574aee636a… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Nov 1 13:03:22 2011 +0100 mountmgr: Also call IoCompleteRequest in case of an error. --- dlls/mountmgr.sys/mountmgr.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index afb9d92..5cf1017 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -374,7 +374,10 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { case IOCTL_MOUNTMGR_QUERY_POINTS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.u.Status = query_mount_points( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength, @@ -382,14 +385,20 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; case IOCTL_MOUNTMGR_DEFINE_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.Information = 0; irp->IoStatus.u.Status = define_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength ); break; case IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.u.Status = query_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

Octavian Voicu : ddraw/tests: Fix a couple of copy-paste typos in test messages.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 0134df19730c068ee9dfc2c9f452a5e3547d7064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0134df19730c068ee9dfc2c9f… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Nov 8 00:27:04 2011 +0200 ddraw/tests: Fix a couple of copy-paste typos in test messages. --- dlls/ddraw/tests/visual.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 8593aef..1bac70c 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1493,13 +1493,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1614,13 +1614,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1736,13 +1736,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1862,13 +1862,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -2000,13 +2000,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -2090,7 +2090,7 @@ static void D3D1_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DViewport_SetBackground failed: %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { D3DRECT rect; @@ -2112,7 +2112,7 @@ static void D3D1_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DViewport_Clear failed: %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5);

1 0

Henri Verbeet : wined3d: Get rid of holdbitmap from wineD3DSurface_DIB.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 896aaa67ca28d2a40ce21a92f14776f80f29de89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896aaa67ca28d2a40ce21a92f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:58 2011 +0100 wined3d: Get rid of holdbitmap from wineD3DSurface_DIB. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/surface.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05a0ad8..b271f5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5220,10 +5220,7 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, /* Reallocate proper memory for the front and back buffer and adjust their sizes */ if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4529ad0..7af21b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -97,10 +97,7 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC. */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; @@ -511,7 +508,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) /* Now allocate a DC. */ surface->hDC = CreateCompatibleDC(0); - surface->dib.holdbitmap = SelectObject(surface->hDC, surface->dib.DIBsection); + SelectObject(surface->hDC, surface->dib.DIBsection); TRACE("Using wined3d palette %p.\n", surface->palette); SelectPalette(surface->hDC, surface->palette ? surface->palette->hpal : 0, FALSE); @@ -3139,9 +3136,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e3fef1..e81ff88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - HGDIOBJ holdbitmap; BOOL client_memory; } wineD3DSurface_DIB;

1 0

Henri Verbeet : wined3d: Get rid of client_memory from wineD3DSurface_DIB.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: d6b432b06893888c530c7ad9c28527595c146f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b432b06893888c530c7ad9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:59 2011 +0100 wined3d: Get rid of client_memory from wineD3DSurface_DIB. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/swapchain.c | 8 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7af21b4..5d32512 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4800,14 +4800,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) back->pbo = tmp_pbo; } - /* client_memory should not be different, but just in case */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* Flip the opengl texture */ { GLuint tmp; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d7be5b..a02a189 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -787,14 +787,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const ERR("GDI Surface %p has heap memory allocated.\n", back); } - /* Client_memory should not be different, but just in case. */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* FPS support */ if (TRACE_ON(fps)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e81ff88..d573d9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - BOOL client_memory; } wineD3DSurface_DIB; struct wined3d_renderbuffer_entry

1 0

Henri Verbeet : wined3d: Get rid of the wineD3DSurface_DIB typedef.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 1e1c442aca52d001f27b7a5455abb9322a876933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1c442aca52d001f27b7a545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:20:00 2011 +0100 wined3d: Get rid of the wineD3DSurface_DIB typedef. --- dlls/wined3d/wined3d_private.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d573d9f..b5b335f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1942,14 +1942,12 @@ void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty void volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; -/***************************************************************************** - * Structure for DIB Surfaces (GetDC and GDI surfaces) - */ -typedef struct wineD3DSurface_DIB { +struct wined3d_surface_dib +{ HBITMAP DIBsection; - void* bitmap_data; + void *bitmap_data; UINT bitmap_size; -} wineD3DSurface_DIB; +}; struct wined3d_renderbuffer_entry { @@ -2035,7 +2033,7 @@ struct wined3d_surface #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ - wineD3DSurface_DIB dib; + struct wined3d_surface_dib dib; HDC hDC; /* Color keys for DDraw */

1 0

Henri Verbeet : wined3d: Get rid of the SAVEDSTATES typedef.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 4c727ed0a1464a2200fb1746e0f564916edbc572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c727ed0a1464a2200fb1746e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:20:01 2011 +0100 wined3d: Get rid of the SAVEDSTATES typedef. --- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/wined3d_private.h | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f9a2812..e122165 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -241,7 +241,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, DWORD ps_consts) +static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, DWORD vs_consts, DWORD ps_consts) { unsigned int i; @@ -274,7 +274,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * vs_consts); } -static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD num_constants) +static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants) { DWORD texture_mask = 0; WORD sampler_mask = 0; @@ -300,7 +300,7 @@ static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD nu memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * num_constants); } -static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const DWORD num_constants) +static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants) { DWORD texture_mask = 0; WORD sampler_mask = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5b335f..14fbd2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2205,10 +2205,8 @@ struct wined3d_vertex_declaration BOOL half_float_conv_needed; }; -/* Internal state Block for Begin/End/Capture/Create/Apply info */ -/* Note: Very long winded but gl Lists are not flexible enough */ -/* to resolve everything we need, so doing it manually for now */ -typedef struct SAVEDSTATES { +struct wined3d_saved_states +{ DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; WORD streamSource; /* MAX_STREAMS, 16 */ WORD streamFreq; /* MAX_STREAMS, 16 */ @@ -2232,7 +2230,7 @@ typedef struct SAVEDSTATES { DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD padding : 4; -} SAVEDSTATES; +}; struct StageState { DWORD stage; @@ -2298,7 +2296,7 @@ struct wined3d_stateblock WINED3DSTATEBLOCKTYPE blockType; /* Array indicating whether things have been set or changed */ - SAVEDSTATES changed; + struct wined3d_saved_states changed; struct wined3d_state state; /* Contained state management */

1 0