wine-devel December 2012

wine-devel@winehq.org

73 participants
137 discussions

Re: [PATCH 1/2] kernel32: refine conditional variable test
by Marvin 29 Dec '12

29 Dec '12

1 0

Re: [PATCH] gdi32: Ensure a fixed-pitch full-width character has double width of a half-width character.
by Alexandre Julliard 28 Dec '12

28 Dec '12

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > --- > dlls/gdi32/freetype.c | 20 +++++++++-- > dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 102 insertions(+), 3 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok font.c:3755: Test failed: expected 19, got 0 (charset 128) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/9] server: Use the same object type for both ends of a named pipe. (try 2)
by Alexandre Julliard 28 Dec '12

28 Dec '12

Adam Martinson <adam.r.martinson(a)gmail.com> writes: > From 8eb230b505ddd986b689caf96510fbe016d721a7 Mon Sep 17 00:00:00 2001 > From: Adam Martinson <adam.r.martinson(a)gmail.com> > Date: Thu, 20 Dec 2012 19:55:13 -0600 > Subject: [PATCH 3/9] server: Use the same object type for both ends of a named pipe. > > Makes either end of a named pipe is readable after the other has been closed. > (If the pipe has not been disconnected) This is still changing way too many things at once. Also, using an array for pipe ends doesn't make much sense, just use two variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] advapi32: do not use invalid pSD value (Coverity)
by Marvin 28 Dec '12

28 Dec '12

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 http://testbot.winehq.org/JobDetails.pl?Key=23641 Your paranoid android. === WNT4WSSP6 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 87 === W2KPROSP4 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === WXPPROSP3 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === W2K3R2SESP2 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0

1 0

Re: [9/9] server: Add support for named pipe message mode.
by Daniel Jelinski 27 Dec '12

27 Dec '12

Hello, FWIW, Adam Martinson's named pipe series looks good to me. I tested it with MS SQL Server, which uses message mode pipes, and did not run into any problems. In current git I can't connect to server using named pipes, because as soon as SetNamedPipeHandleState returns false, client application aborts. (However, just changing SNPHS to return true is enough to get it working). I don't think patches 3 and 9 of this series can be split much more, except maybe for moving asserts into a separate file. Yes, reviewing them may cause headaches. The series is supposed to fix bugs 17273 (patch 8/9) and 17195 (patch 9/9). AFAICT the author is willing to make any adjustments necessary to get the patches merged. Patches 1-5 should not cause any problems if applied without the following. Patches 6-8 may cause regressions if applied without patch 9. Regards, Daniel

1 0

Re: netstat: Initial implementation
by Alexandre Julliard 27 Dec '12

27 Dec '12

André Hentschel <nerv(a)dawncrow.de> writes: > + __ms_va_start(parms, format); > + len = vsprintfW(output_bufW, format, parms); > + __ms_va_end(parms); You can't mix vsprintfW and ms_va_list. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory.
by Vincent Povirk 27 Dec '12

27 Dec '12

I'm pretty sure CreateBitmapFromMemory copies the data rather than referencing existing data. On Thu, Dec 27, 2012 at 3:29 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/windowscodecs/bitmap.c | 31 +++++++++++++++++++++---------- > dlls/windowscodecs/imgfactory.c | 18 +++++++++++------- > dlls/windowscodecs/tests/bitmap.c | 5 ----- > dlls/windowscodecs/wincodecs_private.h | 1 + > 4 files changed, 33 insertions(+), 22 deletions(-) > > diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c > index 520fdef..4d48651 100644 > --- a/dlls/windowscodecs/bitmap.c > +++ b/dlls/windowscodecs/bitmap.c > @@ -40,6 +40,7 @@ typedef struct BitmapImpl { > int palette_set; > LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ > BYTE *data; > + BOOL owndata; > UINT width, height; > UINT stride; > UINT bpp; > @@ -260,7 +261,8 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) > if (This->palette) IWICPalette_Release(This->palette); > This->cs.DebugInfo->Spare[0] = 0; > DeleteCriticalSection(&This->cs); > - HeapFree(GetProcessHeap(), 0, This->data); > + if (This->owndata) > + HeapFree(GetProcessHeap(), 0, This->data); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -447,28 +449,37 @@ static const IWICBitmapVtbl BitmapImpl_Vtbl = { > }; > > HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) > { > HRESULT hr; > BitmapImpl *This; > - UINT bpp, stride, datasize; > - BYTE *data; > + UINT bpp; > > hr = get_pixelformat_bpp(pixelFormat, &bpp); > if (FAILED(hr)) return hr; > > - stride = (((bpp*uiWidth)+31)/32)*4; > - datasize = stride * uiHeight; > + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; > + if (!datasize) datasize = stride * uiHeight; > + > + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; > + if (stride < (((bpp*uiWidth)+31)/32)*4) return E_INVALIDARG; > > This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); > - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > - if (!This || !data) > + if (!This) return E_OUTOFMEMORY; > + if (!data) > { > - HeapFree(GetProcessHeap(), 0, This); > - HeapFree(GetProcessHeap(), 0, data); > - return E_OUTOFMEMORY; > + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > + if (!data) > + { > + HeapFree(GetProcessHeap(), 0, This); > + return E_OUTOFMEMORY; > + } > + This->owndata = TRUE; > } > + else > + This->owndata = FALSE; > > This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; > This->ref = 1; > diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c > index 54b390b..1d05ef5 100644 > --- a/dlls/windowscodecs/imgfactory.c > +++ b/dlls/windowscodecs/imgfactory.c > @@ -1,5 +1,6 @@ > /* > * Copyright 2009 Vincent Povirk for CodeWeavers > + * Copyright 2012 Dmitry Timoshkov > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -459,7 +460,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, > { > TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, > debugstr_guid(pixelFormat), option, ppIBitmap); > - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); > + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, > @@ -506,7 +507,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto > } > > if (SUCCEEDED(hr)) > - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); > + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); > > if (SUCCEEDED(hr)) > { > @@ -576,12 +577,15 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentF > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, > - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, > - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) > + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, > + UINT size, BYTE *buffer, IWICBitmap **bitmap) > { > - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, > - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); > - return E_NOTIMPL; > + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, > + debugstr_guid(format), stride, size, buffer, bitmap); > + > + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; > + > + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, > diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c > index cec714b..3cdbffd 100644 > --- a/dlls/windowscodecs/tests/bitmap.c > +++ b/dlls/windowscodecs/tests/bitmap.c > @@ -436,27 +436,22 @@ static void test_CreateBitmapFromMemory(void) > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, 0, NULL, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 6, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 12, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 9, sizeof(data3x3) - 1, data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h > index 6857176..508bb2c 100644 > --- a/dlls/windowscodecs/wincodecs_private.h > +++ b/dlls/windowscodecs/wincodecs_private.h > @@ -45,6 +45,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* > extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; > extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; > -- > 1.8.0.2 > > >

2 3

Re: netstat: Initial implementation
by Alexandre Julliard 27 Dec '12

27 Dec '12

André Hentschel <nerv(a)dawncrow.de> writes: > +STRINGTABLE > +{ > + IDS_TCP_UNKNOWN, "???" > + IDS_TCP_CLOSED, "CLOSED" > + IDS_TCP_LISTENING, "LISTENING" > + IDS_TCP_SYN_SENT, "SYN_SENT" > + IDS_TCP_SYN_RCVD, "SYN_RCVD" > + IDS_TCP_ESTABLISHED, "ESTABLISHED" > + IDS_TCP_FIN_WAIT1, "FIN_WAIT1" > + IDS_TCP_FIN_WAIT2, "FIN_WAIT2" > + IDS_TCP_CLOSE_WAIT, "CLOSE_WAIT" > + IDS_TCP_CLOSING, "CLOSING" > + IDS_TCP_LAST_ACK, "LAST_ACK" > + IDS_TCP_TIME_WAIT, "TIME_WAIT" > + IDS_TCP_DELETE_TCB, "DELETE_TCB" It's not useful to put these in resources, we don't want to have to translate them. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: msvcrt: Return error in stat function when path is specified with trailing slash character
by Marvin 27 Dec '12

27 Dec '12

1 0

Re: [PATCH] loader: Build with -fno-builtin.
by Austin English 26 Dec '12

26 Dec '12

On Mon, Dec 24, 2012 at 10:38 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > This prevents Clang from optimizing wld_memset() into a memset(3) call. > --- > loader/Makefile.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/loader/Makefile.in b/loader/Makefile.in > index 41d69c7..ece07c3 100644 > --- a/loader/Makefile.in > +++ b/loader/Makefile.in > @@ -1,4 +1,5 @@ > DEFS = -D__WINESRC__ $(EXTRADEFS) > +MODCFLAGS = -fno-builtin > > C_SRCS = \ > main.c \ > -- > 1.7.12.4 I can confirm it works. -- -Austin

1 0

Jump to page:

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-devel December 2012