January 2016 - Wine-devel - list.winehq.org

Re: [1/3] scrrun: Implement filesys_DriveExists. (resend)
by Alexandre Julliard 28 Jan '16

28 Jan '16

Joachim Priesner <joachim.priesner(a)web.de> writes: > - return E_NOTIMPL; > + if (!pfExists) return E_POINTER; > + *pfExists = VARIANT_FALSE; > + len = SysStringLen(DriveSpec); > + if (len >= 1 && DriveSpec[0] >= 'A' && DriveSpec[0] <= 'Z' > + && (len < 2 || DriveSpec[1] == ':') > + && (len < 3 || DriveSpec[2] == '\\')) { Surely lower-case drives should work too. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] shell32: Set the stream and storage attributes where needed.
by Marvin 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20039 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

2 1

Re: ndis.sys: add NdisAllocateSpinLock stub
by Alexandre Julliard 28 Jan '16

28 Jan '16

Austin English <austinenglish(a)gmail.com> writes: > From 5450fedec076c6d2f2c10c2e5cfa8f79578803a0 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 5 Jan 2016 17:24:12 -0600 > Subject: [PATCH] ndis.sys: add NdisAllocateSpinLock stub > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/ndis.sys/main.c | 5 +++++ > include/ddk/ndis.h | 7 +++++++ > 2 files changed, 12 insertions(+) You forgot the spec file. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/7] wined3d: Validate stream_idx in wined3d_device_set_stream_source_freq().
by Henri Verbeet 28 Jan '16

28 Jan '16

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1412,6 +1412,12 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic > return WINED3DERR_INVALIDCALL; > } > > + if (stream_idx >= MAX_STREAMS) > + { > + FIXME("Stream index %u out of range.\n", stream_idx); > + return WINED3DERR_INVALIDCALL; > + } This would have to be a WARN instead of a FIXME, but in general we don't do this in wined3d unless we have to.

1 0

Re: [PATCH 2/7] d3d9/tests: Add test for invalid render states.
by Henri Verbeet 28 Jan '16

28 Jan '16

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > A similar test crashes in d3d8. > --- > dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > This probably just corrupts memory on Windows, if e.g. SetTextureStageState() is any indication.

1 0

Re: [PATCH 1/7] wined3d: Validate render state in wined3d_device_set_render_state().
by Henri Verbeet 28 Jan '16

28 Jan '16

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (state > WINEHIGHEST_RENDER_STATE) > + { > + WARN("Unhandled render state %#x.\n", state); > + return; > + } It may make sense to do this for wined3d_device_get_render_state() as well.

1 0

Re: [PATCH v2] ntoskrnl.exe: Implement IoGetDeviceProperty for DevicePropertyPhysicalDeviceObjectName
by Alexandre Julliard 28 Jan '16

28 Jan '16

Aric Stewart <aric(a)codeweavers.com> writes: > + switch (device_property) > + { > + case DevicePropertyPhysicalDeviceObjectName: > + { > + OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, buffer_length + (sizeof(OBJECT_NAME_INFORMATION))); > + > + status = NtQueryObject(device->Reserved, ObjectNameInformation, name, buffer_length + sizeof(OBJECT_NAME_INFORMATION), result_length); > + if (status == STATUS_SUCCESS) > + memcpy(property_buffer, name->Name.Buffer, name->Name.Length); > + HeapFree(GetProcessHeap(), 0, name); > + break; result_length is not handled correctly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] d3dx9: Signature isn't part of the DDS header
by Matteo Bruni 28 Jan '16

28 Jan '16

2016-01-27 10:29 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/surface.c | 78 ++++++++++++++++++++++++++----------------------- > 1 file changed, 41 insertions(+), 37 deletions(-) > > diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c > index 4fa2a76..a7bf9b7 100644 > --- a/dlls/d3dx9_36/surface.c > +++ b/dlls/d3dx9_36/surface.c > @@ -125,7 +125,6 @@ struct dds_pixel_format > > struct dds_header > { > - DWORD signature; > DWORD size; > DWORD flags; > DWORD height; > @@ -142,6 +141,12 @@ struct dds_header > DWORD reserved2; > }; > > +struct DDS Probably better to pick a lowercase struct name. > +{ > + DWORD signature; > + struct dds_header header; > +}; > + > static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) > { > unsigned int i; > @@ -355,7 +360,7 @@ static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, U > } > > file_size *= faces; > - file_size += sizeof(struct dds_header); > + file_size += sizeof(struct DDS); > return file_size; > } > > @@ -379,37 +384,37 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG > { > UINT faces = 1; > UINT expected_length; > - const struct dds_header *header = buffer; > + const struct DDS *dds = buffer; I'd keep the *header variable, initializing it to &dds->header... > > - if (length < sizeof(*header) || !info) > + if (length < sizeof(*dds) || !info) > return D3DXERR_INVALIDDATA; > > - if (header->pixel_format.size != sizeof(header->pixel_format)) > + if (dds->header.pixel_format.size != sizeof(dds->header.pixel_format)) > return D3DXERR_INVALIDDATA; ... so that you can leave this and the other similar lines below unchanged. > > - info->Width = header->width; > - info->Height = header->height; > + info->Width = dds->header.width; > + info->Height = dds->header.height; > info->Depth = 1; > - info->MipLevels = header->miplevels ? header->miplevels : 1; > + info->MipLevels = dds->header.miplevels ? dds->header.miplevels : 1; > > - info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); > + info->Format = dds_pixel_format_to_d3dformat(&dds->header.pixel_format); > if (info->Format == D3DFMT_UNKNOWN) > return D3DXERR_INVALIDDATA; > > TRACE("Pixel format is %#x\n", info->Format); > > - if (header->caps2 & DDS_CAPS2_VOLUME) > + if (dds->header.caps2 & DDS_CAPS2_VOLUME) > { > - info->Depth = header->depth; > + info->Depth = dds->header.depth; > info->ResourceType = D3DRTYPE_VOLUMETEXTURE; > } > - else if (header->caps2 & DDS_CAPS2_CUBEMAP) > + else if (dds->header.caps2 & DDS_CAPS2_CUBEMAP) > { > DWORD face; > faces = 0; > for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) > { > - if (header->caps2 & face) > + if (dds->header.caps2 & face) > faces++; > } > info->ResourceType = D3DRTYPE_CUBETEXTURE; > @@ -437,8 +442,8 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET > { > UINT size; > UINT src_pitch; > - const struct dds_header *header = src_data; > - const BYTE *pixels = (BYTE *)(header + 1); > + const struct DDS *dds = src_data; > + const BYTE *pixels = (BYTE *)(dds + 1); I guess you could instead make the src_data parameter BYTE * and compute "pixels" as src_data + sizeof(struct dds) (or however you want to call the new struct). It's mostly a matter of taste though so it's fine to me either way.

2 1

Re: [PATCH 4/7] ddraw/tests: Add tests for invalid render states.
by Marvin 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20023 Your paranoid android. === build (build) === Missing build status line The build timed out

2 1

Re: [PATCH v2] winspool.drv: If the call to cupsPrintFile fails, print the cups error message.
by Huw Davies 28 Jan '16

28 Jan '16

On Wed, Jan 27, 2016 at 08:58:26AM -0600, Jeremy White wrote: > diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c > index cebf6f7..89966ce 100644 > --- a/dlls/winspool.drv/info.c > +++ b/dlls/winspool.drv/info.c > @@ -781,6 +781,7 @@ static void *cupshandle; > DO_FUNC(cupsPrintFile) > #define CUPS_OPT_FUNCS \ > DO_FUNC(cupsGetNamedDest); \ > + DO_FUNC(cupsLastErrorString); \ > DO_FUNC(cupsGetPPD3) Could we keep these in alphabetical order please? Otherwise, looks good. Huw.

1 0