- wine-devel - winehq.org

Ubuntu 12.10 - anyone?
by Daniel Jelinski 19 Nov '12

19 Nov '12

Hello, Is it possible to compile 32bit wine in 64bit ubuntu 12.10? I heard there were problems in 12.04 - were they resolved? Regards, Daniel

7 11

Re: [PATCH] regedit: fixed a fclose(stdin) issue (Coverity)
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 9:28 PM, Marcus Meissner <meissner(a)suse.de> wrote: > Hi, > > If we have multiple filenames on the commandline, and the second one is -, > we would fclose(stdin) as realname is not NULL. > > (And also double free realname.) > > So set it back to NULL after free and in the stdin case. > > Ciao, Marcus > --- > programs/regedit/regedit.c | 1 + > 1 Datei geändert, 1 Zeile hinzugefügt(+) > > diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c > index acff701..b6f74ee 100644 > --- a/programs/regedit/regedit.c > +++ b/programs/regedit/regedit.c > @@ -143,6 +143,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) > if (strcmp(filename, "-") == 0) > { > reg_file = stdin; > + realname = NULL; > } > else > { realname is set to NULL at the start of every iteration, so this is not useful. Frédéric

1 0

Re: cmd: Fix possible NULL pointer access in heap_strdupW
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 10:52 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > we already do that (ieframe,vbscript,wininet,.. are good examples), but not consistent all over the place > --- > programs/cmd/wcmd.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h > index 3cc4c0b..303d260 100644 > --- a/programs/cmd/wcmd.h > +++ b/programs/cmd/wcmd.h > @@ -142,7 +142,8 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) > > size = (strlenW(str)+1)*sizeof(WCHAR); > ret = heap_alloc(size); > - memcpy(ret, str, size); > + if(ret) > + memcpy(ret, str, size); > } > > return ret; > -- > 1.8.0 heap_alloc is cmd was made infallible, so this isn't necessary (c6d24089dbc284f0fef5e1ce37b75ac04c6ebd94) Frédéric

1 0

Re: [PATCH 1/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida (try 3).
by Alexandre Julliard 18 Nov '12

18 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > - Merge tests functions. > > --- > dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 156 insertions(+) > The test fails: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 etc. -- Alexandre Julliard julliard(a)winehq.org

2 3

certificate problem accessing https://source.winehq.org ?
by Dan Kegel 17 Nov '12

17 Nov '12

$ git clone https://source.winehq.org/git/wine.git newwine-git Cloning into 'newwine-git'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://source.winehq.org/git/wine.git/info/refs Maybe that's related to the big fat red warning Chrome gives when visiting https://source.winehq.org/ Happily, just leaving off the 's' is a workaround.

2 2

Re: [PATCH 2/7] advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo (resend 3).
by Alexandre Julliard 16 Nov '12

16 Nov '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > + hfile = CreateFileW( pObjectName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, > + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); > + if (hfile == INVALID_HANDLE_VALUE) > + return FALSE; FALSE doesn't do what you want here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v3] dsound: create a primary_pwfx separately from pwfx
by Andrew Eikum 16 Nov '12

16 Nov '12

This breaks the Giants: Citizen Kabuto demo on coreaudio: http://www.fileplanet.com/55371/download/Giants:-Citizen-Kabuto-Demo I've attached a +dsound,+coreaudio,+tid log (could certainly be a winecoreaudio bug, but I don't have time to analyze right now). Also, > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 8da12e2..ff4598c 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -85,11 +174,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > + if (FAILED(hres))) { Fails to compile. Andrew

1 0

Re: [2/2] msxml3: Stub support for external entity resolver
by Marvin 16 Nov '12

16 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=22981 Your paranoid android. === WXPPROSP3 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === WVISTAADM (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W2K8SE (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PRO (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PROX64 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === TEST64_W7SP1 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PROX64 (64 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === TEST64_W7SP1 (64 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000

1 0

Re: msi: Fix a couple of leaks (coverity)
by Hans Leidekker 16 Nov '12

16 Nov '12

On Fri, 2012-11-16 at 11:50 +0100, Frédéric Delanoy wrote: > diff --git a/dlls/msi/files.c b/dlls/msi/files.c > index 11913ef..98d7513 100644 > --- a/dlls/msi/files.c > +++ b/dlls/msi/files.c > @@ -336,6 +336,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) > if (rc != ERROR_SUCCESS) > { > ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); > + msi_free(mi); > return ERROR_FUNCTION_FAILED; This is a loop, so you should instead call msi_free_media_info to also free any strings allocated in a previous call to msi_load_media_info.

1 0

Re: [PATCH 2/4] kernel32: Partial implement CreateHardLinkTransactedA/W
by Alexandre Julliard 16 Nov '12

16 Nov '12

Detlef Riekenberg <wine.dev(a)web.de> writes: > transaction is ignored for now I don't think that's a good idea, particularly not for DeleteFile. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] amstream: Initialize correctly AM_MEDIA_TYPE struct.
by Michael Stefaniuc 16 Nov '12

16 Nov '12

Hello Christian, On 11/15/2012 09:43 AM, Christian Costa wrote: > Fixes bug 32185. > --- > dlls/amstream/mediastreamfilter.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c > index 9b2bd8e..d5388e5 100644 > --- a/dlls/amstream/mediastreamfilter.c > +++ b/dlls/amstream/mediastreamfilter.c > @@ -132,6 +132,8 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA > MSPID purpose_id; > int i; > > + ZeroMemory(amt, sizeof(*amt)); > + this looks "odd". There is no check if amt is NULL, at least that's what caught my attention. So I've looked around and stumbled upon the AM_MEDIA_TYPE structure documentation http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%… "pUnk Not used. Set to NULL." Setting that to NULL in amstream's BasePinImp_GetMediaType() fixes the crash for me. But who's responsibility is to set / check that? That function or the caller aka test_media_streams() ? bye michael

2 1

Re: [PATCH 1/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida (try 2).
by Alexandre Julliard 15 Nov '12

15 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > @@ -3038,6 +3203,7 @@ START_TEST(usp10) > test_ScriptPlace(hdc); > > test_ScriptGetFontProperties(hdc); > + test_ScriptGetFontProperties2(hdc); There's no need to have two separate tests functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: advapi32: fix a too small buffer in CredUnmarshalCredentialW [try2]
by Hans Leidekker 15 Nov '12

15 Nov '12

On Wed, 2012-11-14 at 16:28 +0100, Stefan Leichter wrote: > @@ -2053,6 +2053,8 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) > char c0, c1, c2, c3; > const WCHAR *p = cred; > > + TRACE("%s\n", debugstr_wn(cred,len)); This string is already traced in CredUnmarshalCredentialW. > @@ -2134,6 +2136,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO > case UsernameTargetCredential: > { > USERNAME_TARGET_CREDENTIAL_INFO *target; > + ULONGLONG size = 0; > > if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) > { You should also perform a sanity check on 'size' to avoid overflow in calculations that follow.

2 3

Re: wined3d: Use backup swapchain DC for devices created with desktop window. (try 2)
by Stefan Dösinger 14 Nov '12

14 Nov '12

Am Montag, 3. September 2012, 04:06:01 schrieb Adam Jakubek: > Previous version failed on test bots. > Added test case skipping when no device can be created with normal > (non-desktop) window. I skimmed bug #18490, and I'm wondering about two things: Does the app create a D3DDEVTYPE_REF or D3DDEVTYPE_NULLREF device? Once the device is created, what does it to with it? A +d3d log would provide some answers. This is some guesswork: I don't think the game creates a _REF device because REF devices require the user to install the reference rasterizer dll, as Matteo already mentioned. If it's a NULLREF device I wonder what the game is able to do with it. The bug report has a link which promises some clues, but the link is dead. Stefan

3 2

Re: fix a too small buffer in CredUnmarshalCredentialW
by Hans Leidekker 14 Nov '12

14 Nov '12

On Wed, 2012-11-14 at 09:48 +0100, Stefan Leichter wrote: > + char buffer[6]; > + unsigned int buflen, *size = (unsigned int*) buffer; > > - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) > + if (len < 9 || !cred_decode( cred + 3, 6, buffer ) || !*size || *size % sizeof(WCHAR)) You're still truncating the decoded size. You should instead make 'size' a ULONGLONG and initialize it to 0. Is this little-endian ARM?

2 1

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

gdiplus image blitting performance status
by Dmitry Timoshkov 13 Nov '12

13 Nov '12

Hi all, I've written a simple test application to measure gdiplus performace. Although currently it tests only GdipDrawImage() it could be easily extended to test anything else if desired. I'm attaching the test source with results running 32-bit test binary with gdiplus=b and gdiplus=n (taken from win7). As could be observed, currently built-in gdiplus performs up to 17 times worse even in identity case in comparison with native gdiplus. With a scale/rotate graphics transform the results are up to 20 times slower. Considerig that built-n gdiplus status regarding support for various complex things is pretty good, perhaps it's time to spend some time optimizing its performans. -- Dmitry.

2 3

Re: [PATCH 7/9] ieframe: Forward more DocHost::Exec calls to embedders
by Marvin 12 Nov '12

12 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=22897 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3428: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040810F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2596: Test failed: expected GetOverridesKeyPath webbrowser.c:2601: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2602: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3015: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21

4 3

Re: wine.inf: Set the FontSmoothingGamma value.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Hans Leidekker <hans(a)codeweavers.com> writes: > Fixes a crash in the .NET 4 runtime which queries this value via > SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST). It shouldn't need the registry key to behave sanely. Does b5d96da32f help? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [advapi32/tests] fix possible NULL pointer dereference
by Alexandre Julliard 12 Nov '12

12 Nov '12

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > fixes the crash > http://test.winehq.org/data/1262f07609e6722a841f511445f145d941848800/linux_… > sle85276/advapi32:cred.html That's not supposed to happen, please fix the code instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour (try2)
by Alexandre Julliard 12 Nov '12

12 Nov '12

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -23,6 +23,8 @@ > /* @makedep: wine_test.ttf */ > wine_test.ttf RCDATA wine_test.ttf > > - > /* @makedep: vertical.ttf */ > vertical.ttf RCDATA vertical.ttf > + > +/* @makedep: test_ttf.ttf */ > +test_ttf.ttf RCDATA test_ttf.ttf Please choose a more meaningful name for that file, particularly since there's already a wine_test.ttf. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mciavi: Fix player deadlock when starting to play.
by Andrew Eikum 12 Nov '12

12 Nov '12

Seems reasonable to me. Thanks for working on this old code. On Thu, Nov 08, 2012 at 10:51:08AM +0100, Joerg-Cyril.Hoehle(a)t-systems.com wrote: >

1 0

Re: [PATCH 9/9] ieframe: Added IWebBrowser2::Refresh tests
by Marvin 12 Nov '12

12 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=22898 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3455: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040816F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2602: Test failed: expected GetOverridesKeyPath webbrowser.c:2607: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2608: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3040: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21 === TEST64_W7SP1 (64 bit webbrowser) === Timeout

1 0

Re: user32: Initialize string buffer
by Nikolay Sivov 12 Nov '12

12 Nov '12

On 11/12/2012 11:33, Alistair Leslie-Hughes wrote: > Hi, > > Should fix http://bugs.winehq.org/show_bug.cgi?id=28797 > > > Changelog: > user32: Initialize string buffer I think it could be GetWindowText problem actually, if it succeeded and left buffer uninitialized that could be a real bug here, so needs tests. > > > Best Regards > Alistair Leslie-Hughes > >

2 1

Re: [PATCH] includes: always add __force_align_arg_pointer__ for i386
by Dmitry Timoshkov 12 Nov '12

12 Nov '12

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > Fixes flstudio installer on my system, which breaks otherwise in strcasestr_sse42_nonascii > due to stack being misaligned. That's a compiler bug: http://bugs.winehq.org/show_bug.cgi?id=22316 -- Dmitry.

2 1

Question on debugging wineboot..
by Roger Cruz 12 Nov '12

12 Nov '12

What is the proper way to debug wineboot and services.exe in order to find out what is causing the error outputted by wineserver below? err:wineboot:start_services_process Couldn't start services.exe: error 1359 wine: failed to update /winearm/winehome with /winearm/bin/../share/wine/wine.inf: No such file or directory My problem is that doing: gdb /winearm/bin/wine C:\\windows\\system32\\wineboot.exe --init will yield the code flow to start_wineboot() again because peb->ProcessParameters->ImagePathName.Buffer is NULL if (peb->ProcessParameters->ImagePathName.Buffer) { strcpyW( main_exe_name, peb->ProcessParameters->ImagePathName.Buffer ); } else { <deleted code> start_wineboot( boot_events ); } So it looks like running GDB on wineboot by itself is not good enough because something from the original process is missing, causing it to think it needs to start wineboot again. The reason I had to start it under its own GDB process is because the original GDB process will not follow the fork() in start_wineboot. How do you guys debug all the processes being fork'ed off when GDB can't follow to the child process? Thanks in advance Roger R. Cruz

1 0

Re: [PATCH] tools/widl/header.c: Add a way to declare interface data members.
by Michael Stefaniuc 12 Nov '12

12 Nov '12

You can't do that as the COM standard specifies also the ABI. A COM interface is a pointer to a virtual table; it is *not* a struct. That's just an implementation detail in C. On 11/10/2012 08:48 PM, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> > > --- > tools/widl/header.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 2f275c7..965dcbc 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1159,6 +1159,17 @@ static void write_com_interface_start(FILE *header, const type_t *iface) > fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); > } > > +static void write_interface_data_macro(FILE *header, const type_t *iface) > +{ > + > + if (type_iface_get_inherit(iface)) > + write_interface_data_macro(header, type_iface_get_inherit(iface)); > + > + fprintf(header, "#ifdef %s_IFACE_DATA\n", iface->name); > + fprintf(header, " %s_IFACE_DATA\n", iface->name); > + fprintf(header, "#endif /* defined %s */\n", iface->name); > +} > + > static void write_com_interface_end(FILE *header, type_t *iface) > { > int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); > @@ -1214,6 +1225,9 @@ static void write_com_interface_end(FILE *header, type_t *iface) > fprintf(header, "} %sVtbl;\n", iface->name); > fprintf(header, "interface %s {\n", iface->name); > fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); > + > + write_interface_data_macro(header, iface); > + > fprintf(header, "};\n"); > fprintf(header, "\n"); > fprintf(header, "#ifdef COBJMACROS\n"); bye michael

3 6

How to tell Mac from Linux wine within a Wine app? (steam hardware survey)
by Scott Ritchie 10 Nov '12

10 Nov '12

Is there an easy way for the steam hardware survey to tell whether it's running under Mac or Linux Wine? I remember discussing this issue with an engineer from Valve after asking they make the % of Wine users public again.

3 3

Re: [PATCH] tools/widl/header.c: Add a way to declare interface data members.
by Nikolay Sivov 10 Nov '12

10 Nov '12

On 11/10/2012 22:48, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> > > --- > tools/widl/header.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 2f275c7..965dcbc 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1159,6 +1159,17 @@ static void write_com_interface_start(FILE *header, const type_t *iface) > fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); > } > > +static void write_interface_data_macro(FILE *header, const type_t *iface) > +{ > + > + if (type_iface_get_inherit(iface)) > + write_interface_data_macro(header, type_iface_get_inherit(iface)); > + > + fprintf(header, "#ifdef %s_IFACE_DATA\n", iface->name); > + fprintf(header, " %s_IFACE_DATA\n", iface->name); > + fprintf(header, "#endif /* defined %s */\n", iface->name); > +} > + > static void write_com_interface_end(FILE *header, type_t *iface) > { > int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); > @@ -1214,6 +1225,9 @@ static void write_com_interface_end(FILE *header, type_t *iface) > fprintf(header, "} %sVtbl;\n", iface->name); > fprintf(header, "interface %s {\n", iface->name); > fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); > + > + write_interface_data_macro(header, iface); > + > fprintf(header, "};\n"); > fprintf(header, "\n"); > fprintf(header, "#ifdef COBJMACROS\n"); What is this?

1 0

Re: ole32: Fix outstanding memory leak (coverity)
by Frédéric Delanoy 10 Nov '12

10 Nov '12

On Sat, Nov 10, 2012 at 3:57 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > --- > dlls/ole32/storage32.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 8498eaf..4099df6 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -9067,17 +9067,16 @@ static HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DW > else > { > STATSTG stat; > - LPOLESTR wstrProgID; > + LPOLESTR wstrProgID = NULL; > > /* Get the OleType from the registry */ > REFCLSID clsid = &(stat.clsid); > IStorage_Stat(pStorage, &stat, STATFLAG_NONAME); > hRes = ProgIDFromCLSID(clsid, &wstrProgID); > if(hRes == S_OK) > - { > *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE); > + if(wstrProgID) > CoTaskMemFree(wstrProgID); > - } CoTaskMemFree is no-op when given NULL argument so "if(wstrProgID)" is not necessary (since you initialize it to NULL) Frédéric

1 0

Re: [PATCH 1/2] msvcp90: Free memory allocated by _get_current_locale function
by Marvin 09 Nov '12

09 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=22858 Your paranoid android. === WVISTAADM (32 bit misc) === misc: unhandled exception c0000005 at 77496739 === W2K8SE (32 bit misc) === misc: unhandled exception c0000005 at 778A59C3 === W7PRO (32 bit misc) === misc: unhandled exception c0000005 at 772D1FFE === W7PROX64 (32 bit misc) === misc: unhandled exception c0000005 at 77DFE23E === TEST64_W7SP1 (32 bit misc) === misc: unhandled exception c0000005 at 7758E39E === W7PROX64 (64 bit misc) === Timeout === TEST64_W7SP1 (64 bit misc) === Timeout

1 0

The EFF is asking for our help explaining why APIs should not be copyrightable
by Scott Ritchie 09 Nov '12

09 Nov '12

https://www.eff.org/deeplinks/2012/11/no-copyrights-apis-help-us-make-case There are court cases pending that are very, very relevant to what we do here. It would help the EFF very much if a few engineers could send them a short email statement explaining how Wine's reimplementation of the API is good for interoperability and competition. Thanks, Scott Ritchie

2 1

[PATCH 1/2] winmm/tests: Add more mmioSeek tests.
by Joerg-Cyril.Hoehle＠t-systems.com 09 Nov '12

09 Nov '12

Sagawa San, it's nice to see somebody contribute to winmm! + return; +} That return is line noise. + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + if (hmmio == NULL) { + win_skip("mmioOpen error %u\n", mmio.wErrorRet); + return; + } AFAIK mmioOpen has always been present, so there's no reason for a win_skip. An error should be flagged in all cases, Wine or native. Furthermore, the early return prevents execution of the other groups of tests. Hence I suggest: + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio) { mmioSeek ... mmioClose } However, the 2nd and 3rd mmioOpen may fail if the test file could not be created, so you may want a different treatment there. Perhaps add a boolean result to create_test_file? >[PATCH 2/2] winmm: Fix SEEK_END direction of mmio files without buffering. It's always good in a patch submission to mention what bug it fixes. Does yours fix bug 19566? I seem to remember that there was an entry in bugzilla about MMIO and seeking... Oh yes, you may look at bug 28982, perhaps your patch fixes that too. Regards, Jörg Höhle

2 2

Re: [PATCH 1/2] gdi32: Ignore contours containing one point in get_glyph_outline function
by Piotr Caban 09 Nov '12

09 Nov '12

Please ignore this patches for now, the tests are broken.

1 0

Re: [PATCH 1/2] user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Christian Costa <titan.costa(a)gmail.com> writes: > + SetLastError(0xdeadbeef); > + n = MapWindowPoints(wnd, NULL, NULL, 0); > + err = GetLastError(); > + ok(n == ((window_rect.top << 16) | window_rect.left), "Got %x (%d, %d), expected %x (%d, %d)\n", > + n, (n << 16) >> 16, n >> 16, window_rect.left, window_rect.top, (window_rect.top << 16) | window_rect.left); > + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); > + > + SetLastError(0xdeadbeef); > + n = MapWindowPoints(NULL, wnd, NULL, 0); > + err = GetLastError(); > + ok(n == ((-window_rect.top << 16) | (-window_rect.left & 0xffff)), "Got %x (%d, %d), expected %x (%d, %d)\n", > + n, (n << 16) >> 16, n >> 16, (-window_rect.top << 16) | (-window_rect.left & 0xffff), -window_rect.left, -window_rect.top); > + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); Testing last error on success is not useful. Also please use MAKELONG and related macros instead of doing it by hand. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour
by Marvin 09 Nov '12

09 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=22852 Your paranoid android. === WVISTAADM (32 bit font) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Add data members to interface data structures?
by Max TenEyck Woodbury 09 Nov '12

09 Nov '12

Would a patch that allows data members to be hacked into interface data structures be acceptable? Specifically, this would add sequences that follow this template: #ifdef <iface>_IFACE_DATA <iface>_IFACE_DATA #endif /* <iface>_IFACE_DATA defined */ for each inherited interface, in order.

1 0

Re: [PATCH 1/3] dmloader: COM cleanup of IDirectMusicLoader object.
by Nikolay Sivov 09 Nov '12

09 Nov '12

On 11/6/2012 20:47, Christian Costa wrote: > --- > dlls/dmloader/dmloader_private.h | 16 +++--- > dlls/dmloader/loader.c | 107 +++++++++++++++++++++++--------------- > 2 files changed, 73 insertions(+), 50 deletions(-) > > diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h > index 47a794c..913f3a6 100644 > --- a/dlls/dmloader/dmloader_private.h > +++ b/dlls/dmloader/dmloader_private.h > @@ -91,14 +91,14 @@ typedef struct _WINE_LOADER_OPTION { > * IDirectMusicLoaderImpl implementation structure > */ > struct IDirectMusicLoaderImpl { > - /* VTABLEs */ > - const IDirectMusicLoader8Vtbl *LoaderVtbl; > - /* reference counter */ > - LONG dwRef; > - /* simple cache (linked list) */ > - struct list *pObjects; > - /* settings for certain object classes */ > - struct list *pClassSettings; > + /* VTABLEs */ > + IDirectMusicLoader8 IDirectMusicLoader8_iface; > + /* reference counter */ > + LONG dwRef; > + /* simple cache (linked list) */ > + struct list *pObjects; > + /* settings for certain object classes */ > + struct list *pClassSettings; > }; Please remove useless comments like VTABLES and reference counter and strip names from prefix, e.g. dwRef->ref. > > /* contained object entry */ > diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c > index cfb3de9..54108c7 100644 > --- a/dlls/dmloader/loader.c > +++ b/dlls/dmloader/loader.c > @@ -21,6 +21,11 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(dmloader); > > +static inline IDirectMusicLoaderImpl* impl_from_IDirectMusicLoader8(IDirectMusicLoader8 *iface) > +{ > + return CONTAINING_RECORD(iface, IDirectMusicLoaderImpl, IDirectMusicLoader8_iface); > +} > + > static HRESULT DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface); > static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); > static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); > @@ -69,8 +74,9 @@ static BOOL DMUSIC_IsValidLoadableClass (REFCLSID pClassID) { > */ > /* IUnknown/IDirectMusicLoader(8) part: */ > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface (LPDIRECTMUSICLOADER8 iface, REFIID riid, LPVOID *ppobj) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface(LPDIRECTMUSICLOADER8 iface, REFIID riid, LPVOID *ppobj) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > > TRACE("(%p, %s, %p)\n",This, debugstr_dmguid(riid), ppobj); > if (IsEqualIID (riid, &IID_IUnknown) || > @@ -85,15 +91,17 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface ( > return E_NOINTERFACE; > } > > -static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > TRACE("(%p): AddRef from %d\n", This, This->dwRef); > return InterlockedIncrement (&This->dwRef); > } What I also meant is these names are redundant, something like directmusicloader_AddRef() is enough, of course you could use mixed casing in names if you want, there's no strict guidelines for that afaik. > > -static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > - > +static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > + > DWORD dwRef = InterlockedDecrement (&This->dwRef); > TRACE("(%p): ReleaseRef to %d\n", This, This->dwRef); > if (dwRef == 0) { > @@ -107,8 +115,9 @@ static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTM > return dwRef; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID* ppv) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject(LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID* ppv) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > HRESULT result = S_OK; > HRESULT ret = S_OK; /* used at the end of function, to determine whether everything went OK */ > > @@ -361,8 +370,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject(LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > LPSTREAM pStream; > LPDIRECTMUSICOBJECT pObject; > DMUS_OBJECTDESC Desc; > @@ -483,9 +493,10 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIR > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirectory (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzPath, BOOL fClear) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirectory(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzPath, BOOL fClear) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > WCHAR wszCurrentPath[MAX_PATH]; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzPath), fClear); > FIXME(": fClear ignored\n"); > DMUSIC_GetLoaderSettings (iface, rguidClass, wszCurrentPath, NULL); > @@ -496,14 +507,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirecto > return DMUSIC_SetLoaderSettings (iface, rguidClass, pwzPath, NULL); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzFileExtension, WCHAR* pwzScanFileName) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzFileExtension, WCHAR* pwzScanFileName) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > static const WCHAR wszAny[] = {'*',0}; > WIN32_FIND_DATAW FileData; > HANDLE hSearch; > WCHAR wszSearchString[MAX_PATH]; > WCHAR *p; > HRESULT result; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %p, %p)\n", This, debugstr_dmguid(rguidClass), pwzFileExtension, pwzScanFileName); > if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || !DMUSIC_IsValidLoadableClass(rguidClass)) { > ERR(": rguidClass invalid CLSID\n"); > @@ -550,13 +562,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (L > } while (1); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject (LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject(LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC Desc; > HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry = NULL; > > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %p)\n", This, pObject); > > /* get descriptor */ > @@ -630,13 +643,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject (LPD > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject(LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC Desc; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry = NULL; > HRESULT result = S_FALSE; > > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %p)\n", This, pObject); > > if(!pObject) return E_POINTER; > @@ -695,10 +709,11 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (L > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidClass)); > > LIST_FOR_EACH (pEntry, This->pObjects) { > @@ -714,8 +729,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache (LPDI > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, BOOL fEnable) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, BOOL fEnable) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > BOOL bCurrent; > TRACE("(%p, %s, %d)\n", This, debugstr_dmguid(rguidClass), fEnable); > DMUSIC_GetLoaderSettings (iface, rguidClass, NULL, &bCurrent); > @@ -725,11 +741,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache (LPD > return DMUSIC_SetLoaderSettings (iface, rguidClass, NULL, &fEnable); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DWORD dwCount = 0; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); > > DM_STRUCT_INIT(pDesc); > @@ -755,13 +772,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDI > return S_FALSE; > } > > -static void WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CollectGarbage (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static void WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CollectGarbage(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > FIXME("(%p): stub\n", This); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByUnknown (LPDIRECTMUSICLOADER8 iface, IUnknown* pObject) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByUnknown(LPDIRECTMUSICLOADER8 iface, IUnknown* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > HRESULT result; > LPDIRECTMUSICOBJECT pObjectInterface; > > @@ -781,8 +800,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByU > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClassID, REFIID iidInterfaceID, WCHAR* pwzFilePath, void** ppObject) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClassID, REFIID iidInterfaceID, WCHAR* pwzFilePath, void** ppObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC ObjDesc; > WCHAR wszLoaderSearchPath[MAX_PATH]; > > @@ -859,7 +879,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > *ppobj = NULL; > return E_OUTOFMEMORY; > } > - obj->LoaderVtbl = &DirectMusicLoader_Loader_Vtbl; > + obj->IDirectMusicLoader8_iface.lpVtbl = &DirectMusicLoader_Loader_Vtbl; > obj->dwRef = 0; /* will be inited with QueryInterface */ > /* init cache/alias list */ > obj->pObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); > @@ -867,7 +887,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > /* init settings */ > obj->pClassSettings = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); > list_init (obj->pClassSettings); > - DMUSIC_InitLoaderSettings ((LPDIRECTMUSICLOADER8)obj); > + DMUSIC_InitLoaderSettings(&obj->IDirectMusicLoader8_iface); > > /* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */ > DM_STRUCT_INIT(&Desc); > @@ -875,7 +895,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > Desc.guidClass = CLSID_DirectMusicCollection; > Desc.guidObject = GUID_DefaultGMCollection; > DMUSIC_GetDefaultGMPath (Desc.wszFileName); > - IDirectMusicLoader_SetObject ((LPDIRECTMUSICLOADER8)obj, &Desc); > + IDirectMusicLoader_SetObject(&obj->IDirectMusicLoader8_iface, &Desc); > /* and now the workaroundTM for "invalid" default DLS; basically, > my tests showed that if GUID chunk is present in default DLS > collection, loader treats it as "invalid" and returns > @@ -889,12 +909,13 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > > lock_module(); > > - return IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface ((LPDIRECTMUSICLOADER8)obj, lpcGUID, ppobj); > + return IDirectMusicLoader_QueryInterface(&obj->IDirectMusicLoader8_iface, lpcGUID, ppobj); > } > > /* help function for retrieval of search path and caching option for certain class */ > -static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT DMUSIC_GetLoaderSettings(LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > TRACE(": (%p, %s, %p, %p)\n", This, debugstr_dmguid(pClassID), wszSearchPath, pbCache); > > @@ -912,8 +933,9 @@ static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl > } > > /* help function for setting search path and caching option for certain class */ > -static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT DMUSIC_SetLoaderSettings(LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > HRESULT result = S_FALSE; /* in case pClassID != GUID_DirectMusicAllTypes and not a valid CLSID */ > TRACE(": (%p, %s, %p, %p)\n", This, debugstr_dmguid(pClassID), wszSearchPath, pbCache); > @@ -935,9 +957,10 @@ static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl > return result; > } > > -static HRESULT DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > - > +static HRESULT DMUSIC_InitLoaderSettings(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > + > /* hard-coded list of classes */ > static REFCLSID classes[] = { > &CLSID_DirectMusicAudioPathConfig, > > > >

5 21

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib
by Nikolay Sivov 09 Nov '12

09 Nov '12

On 11/7/2012 11:36, Tatyana Fokina wrote: Hi, Tatyana. Some comments: > dlls/oleaut32/tests/Makefile.in | 1 + > dlls/oleaut32/tests/typelib2.c | 69 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 70 insertions(+) > create mode 100644 dlls/oleaut32/tests/typelib2.c You don't need a separate file for this, please use typelib.c > + hr = CreateTypeLib2(SYS_WIN32, jsdeb, (ICreateTypeLib2 **)&ctl2); > + if(hr != S_OK) > + { > + skip ("CreateTypeLib2 failed\n"); > + return; > + } > + > + hr = ICreateTypeLib2_CreateTypeInfo(ctl2, jsname, TKIND_DISPATCH, &cti); > + if(hr != S_OK) > + { > + skip ("ICreateTypeLib2_CreateTypeInfo failed\n"); > + return; > + } That's not what skip() is for. Also you leak on second return and you don't need a cast for ctl2. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(!hr)ITypeLib_Release(tl); Please test return value for S_OK here, again you don't need a cast here. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(!hr)ITypeLib_Release(tl); > + > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, pIndex); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on pIndex = NULL\n"); > + if(!hr)ITypeLib_Release(tl); What are you trying to do with index pointer?

2 1

Re: scrrun: Implement IDictionary get_HashVal (try 3)
by Nikolay Sivov 08 Nov '12

08 Nov '12

On 11/8/2012 12:31, Alistair Leslie-Hughes wrote: > Hi, > Thanks Piotr for your help. > > Changelog: > scrrun: Implement IDictionary get_HashVal > +static LONG create_hash_val_float(float fval) > +{ > + TRACE("val = %f\n", fval); > + > + if(isinf(fval)) > + return 0; > + > + return (*((DWORD*)&fval)) % 1201; > +} Emm, do you just mean (DWORD)fval here? If you always hash it as DWORD why not use DWORD argument? And isinf() will stay for float types in your switch(...). > - FIXME("(%p)->(%p %p)\n", This, Key, HashVal); > + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(Key), debugstr_variant(HashVal)); Tracing HashVal is not useful this way. > + case VT_R8: > + V_I4(HashVal) = create_hash_val_float(V_R8(Key)); > + break; > + case VT_I4: > + V_I4(HashVal) = create_hash_val_float(V_I4(Key)); > + break; That's confusing, I mean the way you treat integer type here.

3 2

shell32: Increase dde_connect res value
by Ken Sharp 08 Nov '12

08 Nov '12

Evening all, http://bugs.winehq.org/show_bug.cgi?id=26830 is easily solved by http://bugs.winehq.org/attachment.cgi?id=34184 but I don't know if this will break anything. I cannot find a reference as to why it needs to be set to 256, but there must be a reason for this. Anyone any ideas? Thanks, Ken

2 1

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