November 2012 - Wine-devel - list.winehq.org

Implementation of PNG 'Get Count' and indexed reads...
by Max TenEyck Woodbury 14 Nov '12

14 Nov '12

These are currently returning 'not implemented'. Would it make sense to have 'GetCount' always return '1' and have the indexed read simply read in the whole thing?

2 6

Re: [PATCH] netapi32/tests: Fix workstation test failures on XP
by Saulius Krasuckas 14 Nov '12

14 Nov '12

* On Tue, 13 Nov 2012, Detlef Riekenberg wrote: > The workstation service might not running > > http://test.winehq.org/data/b5d96da32f955357b7d9341ee9fca68108078dce/xp_s2-… Indeed it isn't. I've disabled serveral services on this box. > --- a/dlls/netapi32/tests/wksta.c > +++ b/dlls/netapi32/tests/wksta.c > @@ -79,12 +79,17 @@ static void run_wkstausergetinfo_tests(void) > LPWKSTA_USER_INFO_1 ui1 = NULL; > LPWKSTA_USER_INFO_1101 ui1101 = NULL; > DWORD dwSize; > + NET_API_STATUS rc; > > /* Level 0 */ > - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, > - "NetWkstaUserGetInfo is unsuccessful\n"); > + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); > + if (rc == NERR_WkstaNotStarted) > + { > + skip("Workstation service not running\n"); > + return; > + } > + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); No to blame you, this is just generic inquiry for developers. Won't it be better to check service status directly in such case? S.

1 0

Re: [PATCH 1/2] user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. (try 3)
by Marvin 13 Nov '12

13 Nov '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=22927 Your paranoid android. === WXPPROSP3 (32 bit win) === win.c:881: Test failed: wrong dwStyle: 84cb0000 != 94cb0000 for 000E0138 in hook HCBT_ACTIVATE

2 1

Re: [PATCH 2/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Nikolay Sivov 13 Nov '12

13 Nov '12

On 11/13/2012 18:20, Qian Hong wrote: > Thanks Aric! > > --- > dlls/usp10/usp10.c | 133 +++++++++++++++++++++++++++++++++++++++++-- > dlls/usp10/usp10_internal.h | 1 + > 2 files changed, 128 insertions(+), 6 deletions(-) I think it's better to avoid macros if possible. > + if (!sc->sfnt) > + { > + if (GetTextMetricsW(hdc, &tmW)) > + sc->sfp.wgBlank = tmW.tmBreakChar; > + else > + { > + ERR("Get wgBlank failed, fallback to Numeric_space.\n"); > + sc->sfp.wgBlank = Numeric_space; > + } If it's a normal fallback case it's not an error I guess. > +{ > +#define Zero_width_space 0x200b /* Zero Width Space */ > +#define Invalid_char3 0xf71b /* Unknow, found by black box testing */ > +#define NON_EXIST_INDEX 0xffff /* Default non exist char index */ > + WCHAR invalid_chars[3] = {Numeric_space, Zero_width_space, Invalid_char3}; I don't see why this can't be hardcoded without macros and one line comment about meaning of this. > +#define Kashida_char 0x0640 /* Kashida */ > + WCHAR kashida_chars[] = {Kashida_char}; Same here, also naming is a bit strange. I think it's enough to name it 'kashida' and make it 'static const WCHAR'.

2 1

Re: [PATCH 2/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > +static inline void set_cache_invalid_char(const HDC hdc, ScriptCache *sc) > +{ > +#define Zero_width_space 0x200b /* Zero Width Space */ > +#define Invalid_char3 0xf71b /* Unknow, found by black box testing */ > +#define NON_EXIST_INDEX 0xffff /* Default non exist char index */ > + WCHAR invalid_chars[3] = {Numeric_space, Zero_width_space, Invalid_char3}; There's no reason to add #defines for that kind of thing, just put the values in the string directly. -- Alexandre Julliard julliard(a)winehq.org

2 1

Missing dependencies on static libraries
by Francois Gouget 13 Nov '12

13 Nov '12

strmbase is a static library which is used by amstream, qcap, quartz and others. This means functions defined in strmbase end up being included in amstream.dll.so and other places. However modifying the strmbase code does not result in a relink of the dlls that depend on it. Note that this is true even if running make from the top-level directory. That makes it very painful to work with it. Note that the same issue could happen with other static libraries like dxguid, uuid, etc, though those don't contain code and have little reason to change so that that's probably why the problem did not surface until now. How should we fix this? Having amstream recusively run make in strmbase would break parallel builds (the top-level Makefile enforces ordering by having __builddeps__ depend on dlls/strmbase). Would somthing like the patch below be acceptable? Should it be generalized to all the dependencies on uuid, dxguid, etc? commit 0a6764918f743912a1f76ca004ec6d9f0d679b2a Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 19:45:21 2012 +0100 strmbase: Relink the dlls that depend on the strmbase static library when it changes. diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 35cfae1..5e96f1a 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -12,4 +12,8 @@ IDL_R_SRCS = amstream_classes.idl RC_SRCS = version.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 3abc295..5f4078d 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -11,4 +11,8 @@ C_SRCS = \ RC_SRCS = version.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 24be02e..2cbcfe6 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -36,4 +36,9 @@ IDL_TLB_SRCS = control_tlb.idl EXTRA_OBJS = dlldata.o +$(MODULE).so: $(top_builddir)/dlls/dxguid/libdxguid.a \ + $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index f6695be..cbf1986 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -12,4 +12,8 @@ C_SRCS = \ RC_SRCS = \ rsrc.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 52ee03b..762f837 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -12,4 +12,8 @@ C_SRCS = \ RC_SRCS = \ rsrc.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Utilisateur" (nom commun) : Mot utilisé par les informaticiens en lieu et place d'"idiot".

2 3

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour (try3)
by Dmitry Timoshkov 13 Nov '12

13 Nov '12

Piotr Caban <piotr(a)codeweavers.com> wrote: > create mode 100644 dlls/gdi32/tests/test_empty_contour.sfd > create mode 100644 dlls/gdi32/tests/test_empty_contour.ttf Is it possible to add the desired glyph to an already existing test font? -- Dmitry.

3 2

Re: [PATCH 3/6] dsound: create a primary_pwfx separately from pwfx
by Andrew Eikum 13 Nov '12

13 Nov '12

Patches 1 and 2 in this series look fine. I have a series of patches similar to this one in my dsound multichannel branch. This patch seems to do too much at once. When I did this cleanup, I split it up into four patches: 1) Allocate the device format in the Device struct 2) Load the default format from the IAC, not hard-coded in dsound 3) Put SetFormat() calls into their own WFX that we don't really care about 4) Always use WAVE_FORMAT_EXTENSIBLE for the device format Much more bisect-able that way. I've attached a tarball here. It's not submission-quality yet (I haven't reviewed it lately; it might not even work), but it should show you what I had in mind for this kind of cleanup. I can bump those up in priority, but I don't think this blocks patches 4-6 in this series anyway. Andrew

3 3

Any advice please... Console input issue
by Ann and Jason Edmeades 13 Nov '12

13 Nov '12

Hello, I've been looking at a patch which sorts out NUL and CON handling in a part of the command shell, and have stumbled upon a problem I am not sure how to fix because I really dont understand the underlying console handling, and would appreciate someone pointing me in a direction. For simplicity sake I've cut this down to a tiny test program, which works on windows and fails on wine which does the following: Opens the device ("\\.\CON") with CreateFile with GENERIC_READ rights (which internally opens a CONIN$ device with the same access rights) Reads from the device with ReadFile - Because its a console device, this drops through to ReadConsoleW, which creates a CONOUT$ and then waits on a keystroke - Once the key is pressed (WCEL_Get) the key is 'inserted' into the input buffer by calling WriteConsoleInputW The issue is that WriteConsoleInputW requires GENERIC_WRITE access, but the CON device (\\.\CON) was opened as GENERIC_READ (and in fact fails if I try to open it with GENERIC_WRITE). CreateFile("CONIN$"...) will let me open in GENERIC_READ/GENERIC_WRITE mode and the program works on both windows and wine, but if you open CONIN$ GENERIC_READ only then it fails on wine and works on windows, with the same issue. Now on windows, this works... the question is how to make it work on wine... My gut feeling, with nothing backing this at all, is that WCEL_Get should not use WriteConsoleInputW to inject the values into the input buffer, instead making the server call directly, but passing through to the server call something to indicate that it is ok to add the data to the buffer, but I'm fast getting out of my depth! Thanks for any help! I'll file a bug with my analysis and testcase, but would rather fix the thing! Jason

2 3

Re: [PATCH] wininet: handle failing create_netconn_socket (Coverity)
by Alexandre Julliard 13 Nov '12

13 Nov '12

Marcus Meissner <marcus(a)jet.franken.de> writes: > A failing here will free the netconn structure and we should > not use it afterwards. It probably shouldn't free it, this can break in other places too. -- Alexandre Julliard julliard(a)winehq.org

1 0