- wine-devel - winehq.org

Re: [PATCH] ddraw: Fix its vs it's typos
by Marvin 01 Aug '16

01 Aug '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=24668 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: [PATCH 2/2] kernel32/tests/thread: Add tests for fiber-local storage.
by Marvin 01 Aug '16

01 Aug '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=24663 Your paranoid android. === w1064 (32 bit thread) === thread.c:1086: Test failed: got 0 with 5 (expected FALSE with ERROR_GEN_FAILURE)

1 0

Re: [PATCH 1/2] kernel32/tests/loader: Add tests for fiber-local storage.
by Marvin 01 Aug '16

01 Aug '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=24662 Your paranoid android. === w1064 (32 bit loader) === loader.c:2979: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2980: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2979: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2980: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2979: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2980: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2987: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2988: Test failed: Test 3: Wrong callback count: 0 loader.c:2987: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2988: Test failed: Test 4: Wrong callback count: 0 === wvistau64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w2008s64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w7pro64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w864 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w1064 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784

1 0

Wine's forked version of fontforge
by Jens Reyer 01 Aug '16

01 Aug '16

Hi, in Debian we're currently moving to enable the maintainer mode to e.g. rebuild Wine's TrueType fonts. AJ already warned us that this is risky: On 04/01/2016 04:54 AM, wine-bugs(a)winehq.org wrote: > https://bugs.winehq.org/show_bug.cgi?id=40391 > > --- Comment #3 from Alexandre Julliard <julliard(a)winehq.org> --- > There is definitely a risk too, particularly for fonts. They are supposed to be > built with our forked version of fontforge > (https://source.winehq.org/git/fontforge.git), that contains a couple of fixes > compared to the upstream version. I really appreciate that warning, thanks again! See a "short" explanation at the end of the mail, why we want to do this anyway. I'd like to figure out how to improve the resulting situation by getting the Wine changes to fontforge applied upstream (and/or in Debian). With "upstream" I mean github.com/fontforge. I will contact them in a later step. Wine and Debian are both using the quite old fontforge version 20120731-b, the patches apply cleanly in Debian. But upstream is actively developing and in Debian someone is working on packaging a recent version (not sure with what outcome, e.g. afaik there is at least one upstream regression blocking an update). Are there any plans in Wine to update to a newer version? Wine's fontforge has 4 changes. I recreated them based on AJ's merge for 20120731-b and by myself for 20160404 to get a *rough* picture of their current state (not tested and I'm absolutely no expert in this): 1. Various hacks to avoid putting timestamps in generated files (AJ). No relevant changes upstream, but there is some work going to allow one to specify the timestamp in order to get the build deterministic/reproducible. Would this make this patch obsolete? I don't know why upstream wants timestamps at all, nor what problems these cause for Wine. Is this Wine specific, or would it make sense to drop timestamping upstream, too? 2. - Avoid outputting trailing spaces in sfd files (AJ). About a third seems to be applied in 20160404. I assume the rest would still be relevant if Wine updated its fontforge version. Is this patch only relevant for creating fonts/glyphs, but not for building the TrueType fonts? Looks like a good candidate for forwarding to upstream. 3. Enable the width of individual bitmap strikes to be altered (Huw Davies). Since the import of upstream version 20120731-b this patch only has a third of its original size. Are the remaining Wine changes still necessary, or are they cruft? If still needed, I guess they should be pushed upstream. In 20160404 not much seems to have changed, but the containing file bitmapview.c was moved ("splitting ui code from fontforge/ to fontforgeexe/"). Same as above: is this only needed when creating fonts? Looks like a candidate for upstream. 4. Don't save the selected state. (Huw Davies) I found no relevant changes upstream. No idea about this. Why are we doing this? ---------------------- The Debian Free Software Guidelines [DFSG] (which are the fundamental basis for the Debian project) mandate that binaries must be accompanied by their source (which is usually ensured by building from source), and that you must be able to modify and redistribute the package with only the software available in Debian. The reasons for these are e.g. philosophical (empowering the user), QA (rebuilding if there was an issue in the build tools), reproducibility (recreate byte-by-byte-identically, e.g. to rule out attacks at a build machine or do QA) or security (a build from correct source code may be manipulated by specific compilers). The TrueType fonts are pre-built with a forked fontforge, which isn't (and very unlikely will ever be) in Debian. To package the pre-built fonts imo we would have to remove Wine from official Debian (main), and move it to the non/semi-official contrib section. For the same reason (AFAIK, I'm not the author of these changes) we're also regenerating opengl files, request code and unicode. This problem was ignored/missed in the past for the Debian Wine packages, yet this is no argument against fixing them now. We definitely don't want Wine removed from Debian, instead keep it in and get it there as good as possible. btw, we're also adding a patch (based on wine staging) to append '(Debian)' to the version string now. btw2, can you recommend some alternative free fonts to install (either as partial replacement or as extension to the Wine fonts)? Greets, and thanks in advance jre [DFSG] https://www.debian.org/doc/debian-policy/ch-archive.html#s-dfsg, see also the following chapter "The main archive area".

2 3

Re: [2/3] wininet: Start the first chunk as soon as we have some data.
by Jacek Caban 01 Aug '16

01 Aug '16

Hi Hans, On 19.07.2016 11:27, Hans Leidekker wrote: > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > dlls/wininet/http.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c > index 2c62d97..c4cf66b 100644 > --- a/dlls/wininet/http.c > +++ b/dlls/wininet/http.c > @@ -2921,6 +2921,7 @@ static DWORD set_content_length(http_request_t *request) > !strcmpiW(encoding, szChunked)) > { > chunked_stream_t *chunked_stream; > + DWORD res; > > chunked_stream = heap_alloc(sizeof(*chunked_stream)); > if(!chunked_stream) > @@ -2935,6 +2936,12 @@ static DWORD set_content_length(http_request_t *request) > memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size); > chunked_stream->buf_size = request->read_size; > request->read_size = request->read_pos = 0; > + > + res = start_next_chunk(chunked_stream, request); > + if (res != ERROR_SUCCESS) { > + heap_free(chunked_stream); > + return res; > + } It seems to me that you're fixing a problem is a wrong place. start_next_chunk should be called by HTTP_ReceiveRequestData via refill_read_buffer anyway. I'd suggest to investigate why it doesn't work in your case. Also, see the attached test. We shouldn't need any chunk to complete requests. It's an existing problem in current Wine, which may be unrelated to your problem, but having such blocking calls here is not a step in the right direction. Thanks, Jacek

2 2

Re: [4/6] msvcirt: Implement istream::operator>> for integers.
by Piotr Caban 01 Aug '16

01 Aug '16

Hi, On 08/01/16 12:40, Iván Matellanes wrote: > Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> > --- > dlls/msvcirt/msvcirt.c | 90 ++++++++++++++++++++++++++---- > dlls/msvcirt/tests/msvcirt.c | 128 ++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 205 insertions(+), 13 deletions(-) It causes following compilation warnings: ../../../../wine_src/dlls/msvcirt/tests/msvcirt.c:4891:5: warning: this decimal constant is unsigned only in ISO C90 int n, int_out[] = {123456789, 0, 1, -500, 0x8000, 2147483646, 2147483647, -2147483647, -2147483648, -1}; ^ ../../../../wine_src/dlls/msvcirt/tests/msvcirt.c:4893:5: warning: this decimal constant is unsigned only in ISO C90 LONG l, long_out[] = {2147483647l, -2147483648l};

1 0

Re: [PATCH 1/2] msvcp140: Add MSVC 2015 C++ support DLL (try 2)
by Alexandre Julliard 01 Aug '16

01 Aug '16

Daniel Lehman <dlehman(a)esri.com> writes: > +@ extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_num_put_wchar_vtable > +@ extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_get_char_vtable > +@ stub ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ > +@ stub ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ These should be extern, not stub. There are several more similar cases. Please check other msvcp versions to see where we are using commented out extern declarations. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] Fix some its vs it's typos
by Marvin 31 Jul '16

31 Jul '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=24626 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: comctl32/tests: Avoid using memset() on RECTs.
by Nikolay Sivov 30 Jul '16

30 Jul '16

On 30.07.2016 22:55, Michael Stefaniuc wrote: > - memset(&r1, 0, sizeof r1); > - r1.left = LVIR_ICON; > + SetRect(&r1, LVIR_ICON, 0, 0, 0); I don't like this, I think it's better to use SetRect() when actual coordinates are used, and LVIR_* has special meaning.

2 2

Re: [PATCH 1/4] mpr: Implement local name automatic redirection for disks.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Pierre Schweitzer <pierre(a)reactos.org> writes: > +done: > + if (redirect) > + ctxt->resource->lpLocalName = NULL; It looks quite suspicious to modify that input parameter and restore it at the end. You should probably use a copy instead. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 08/10] gdi32: Where possible directly access the DC instead of using GetCurrentObject().
by Alexandre Julliard 29 Jul '16

29 Jul '16

Huw Davies <huw(a)codeweavers.com> writes: > @@ -1039,7 +1039,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) > } > release_dc_ptr( dc ); > /* font metrics depend on the graphics mode */ > - if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); > + if (ret) SelectObject(dc->hSelf, dc->hFont); The bug was already present, but we shouldn't be accessing the dc after release. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: comctl32: Avoid using memset on RECTs.
by Nikolay Sivov 29 Jul '16

29 Jul '16

On 29.07.2016 13:24, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/comctl32/status.c | 4 ++-- > dlls/comctl32/tab.c | 7 ++----- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c > index 738c33b..08ca158 100644 > --- a/dlls/comctl32/status.c > +++ b/dlls/comctl32/status.c > @@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) > * textHeight pixels large */ > HDC hdc = GetDC(infoPtr->Self); > RECT r; > - memset (&r, 0, sizeof (r)); > - r.bottom = max(infoPtr->minHeight, tm.tmHeight); > + > + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); > if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) > { > height = r.bottom - r.top; > diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c > index 0ed9152..62e34f9 100644 > --- a/dlls/comctl32/tab.c > +++ b/dlls/comctl32/tab.c > @@ -373,12 +373,9 @@ static BOOL TAB_InternalGetItemRect( > TRACE("Not Visible\n"); > /* need to initialize these to empty rects */ > if (itemRect) > - { > - memset(itemRect,0,sizeof(RECT)); > - itemRect->bottom = infoPtr->tabHeight; > - } > + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); > if (selectedRect) > - memset(selectedRect,0,sizeof(RECT)); > + SetRectEmpty(selectedRect); > return FALSE; > } > > You probably can remove null rect checks as well.

2 1

Re: [PATCH] msxml3: Implement IXMLParser GetParserState
by Nikolay Sivov 29 Jul '16

29 Jul '16

On 29.07.2016 12:43, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/msxml3/tests/xmlparser.c | 3 +++ > dlls/msxml3/xmlparser.c | 6 ++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c > index 51f2a27..32514e3 100644 > --- a/dlls/msxml3/tests/xmlparser.c > +++ b/dlls/msxml3/tests/xmlparser.c > @@ -144,6 +144,9 @@ static void create_test(void) > hr = IXMLParser_SetFlags(parser, 0); > ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); > > + hr = IXMLParser_GetParserState(parser); > + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); > + > IXMLParser_Release(parser); > } > > diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c > index ca40b22..6fcdb82 100644 > --- a/dlls/msxml3/xmlparser.c > +++ b/dlls/msxml3/xmlparser.c > @@ -51,6 +51,7 @@ typedef struct _xmlparser > LONG ref; > > int flags; > + XML_PARSER_STATE state; > } xmlparser; > > static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface ) > @@ -345,9 +346,9 @@ static HRESULT WINAPI xmlparser_GetParserState(IXMLParser *iface) > { > xmlparser *This = impl_from_IXMLParser( iface ); > > - FIXME("(%p)\n", This); > + TRACE("(%p)\n", This); > > - return E_NOTIMPL; > + return This->state; > } > > static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface) > @@ -447,6 +448,7 @@ HRESULT XMLParser_create(void **ppObj) > This->nodefactory = NULL; > This->input = NULL; > This->flags = 0; > + This->state = XMLPARSER_IDLE; > This->ref = 1; > > *ppObj = &This->IXMLParser_iface; > Do you have SDK headers for that interface? Having HRESULT for a state looks a bit weird.

2 1

Re: [PATCH 2/6] d3d9/tests: Add visual tests for locking vertexbuffers
by Patrick Rudolph 29 Jul '16

29 Jul '16

Am Thu, 28 Jul 2016 14:04:56 +0200 schrieb Henri Verbeet <hverbeet(a)gmail.com>: > On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > > + static const struct > > + { > > + const char *flags_s; > > + unsigned int flags; > > + DWORD usage; > > + BOOL unsyncronized; > > + BOOL todo; > > + BOOL broken; > > + } > > + /* Nvidia ignores D3DLOCK_NOOVERWRITE on non dynamic buffers, > > + * while AMD always accepts D3DLOCK_NOOVERWRITE on all > > buffers. */ > > + tests[] = > > + { > > + {"0", 0, 0, FALSE, FALSE, FALSE}, > > + {"0", 0, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, > > D3DUSAGE_DYNAMIC, TRUE, FALSE, FALSE}, > > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, 0, FALSE, FALSE, > > FALSE}, > > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, > > FALSE, FALSE, FALSE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, > > D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, 0, FALSE, > > FALSE, TRUE}, > > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, > > D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > > + }; > [...] > > + todo_wine_if (tests[i].todo) > > + { > > + ok(tests[i].unsyncronized == unsyncronized || > > broken(tests[i].broken), > > + "Expected buffer mapped %s. Flags = %s. Usage > > = %#x.\n", > > + tests[i].unsyncronized ? "unsyncronized" : > > "syncronized", tests[i].flags_s, tests[i].usage); > > + } > I assume the broken() is for the testbot, but the way this is written, > half the cases aren't really tested on Windows. Also, what makes these > fail on the testbot? > I can replace some of the broken test results with another flag for AMD behaviour. AMD allows D3DLOCK_NOOVERWRITE for non dynamic buffers on d3d9, too. I guess the WARP driver filters D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD calls. > > + timestamp1 = GetTickCount(); > > + > > + hr = IDirect3DDevice9_BeginScene(device); > > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > > + hr = IDirect3DDevice9_DrawPrimitive(device, > > D3DPT_TRIANGLESTRIP, 0, tri); > > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > > + hr = IDirect3DDevice9_EndScene(device); > > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > > + > > + /* dummy read to wait for GPU being done */ > > + color = getPixelColor(device, 160, 360); > > + > > + timestamp2 = GetTickCount(); > > + > > + /* Adjust buffer size for 1 second draw call duration */ > > + size = (size * 1000UL) / (timestamp2 - timestamp1 + 1); > Does this work reliably? GetTickCount() has very limited resolution, I > think there's a real chance that the draw will take only a fraction of > GetTickCount()'s resolution. Yes it does. I first thought about using timestamp queries, but those aren't supported on ddraw and d3d8 and are broken on my AMD test system, so I'm using GetTickCount instead. It allows to test to pass on fast systems (Intel Core i5 + HD6870) and slow systems (Intel Atom + Nvidia ION). The buffersize can't be hardcoded as the Windows driver nukes the display driver whenever a draw call takes more than a few seconds, which is the case when using huge buffers to make them pass on fast systems. Regards, Patrick

2 1

Re: wined3d: Add Nvidia GT 740M to the GPU list
by Henri Verbeet 29 Jul '16

29 Jul '16

On 28 July 2016 at 22:42, Jeremy Audiger <audiger(a)live.fr> wrote: > @@ -2158,6 +2160,7 @@ cards_nvidia_mesa[] = > {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, > {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, > /* Fermi */ > {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, > {"NVD7", CARD_NVIDIA_GEFORCE_820M}, The patch seems fine, but could you please add "NV108" above "NVF1" instead of below "NVE4"?

1 0

Re: [PATCH 2/2] DInput : Use vendor and product ids to generate product GUID like it's done on Windows
by Bruno Jesus 28 Jul '16

28 Jul '16

On Sat, Jul 23, 2016 at 8:01 AM, Corentin Rossignon <corossig(a)gmail.com> wrote: > Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> > --- > dlls/dinput/joystick_linux.c | 34 +++++++++++++++++++++++++++++++--- > dlls/dinput/joystick_linuxinput.c | 27 +++++++++++++++++++++++++-- > 2 files changed, 56 insertions(+), 5 deletions(-) Formatting problem: bruno@Note:~/programs/wine$ git apply dinput2 dinput2:31: trailing whitespace. /* dinput2:35: trailing whitespace. * Data4 seems to be a constant. dinput2:104: trailing whitespace. /* dinput2:108: trailing whitespace. * Data4 seems to be a constant. warning: 4 lines add whitespace errors. > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 90b7280..f8499ca 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -77,6 +77,7 @@ struct JoyDev > { > char device[MAX_PATH]; > char name[MAX_PATH]; > + GUID guid_product; > > BYTE axis_count; > BYTE button_count; > @@ -122,6 +123,21 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 > {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} > }; > > + > +/* > + * Construct the GUID in the same way of Windows doing this. > + * Data1 is concatenation of productid and vendorid. > + * Data2 and Data3 are NULL. > + * Data4 seems to be a constant. > + */ > +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { > + 0x000000000, > + 0x0000, > + 0x0000, > + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} > +}; > + > + Please remove all double blank lines in your changes in order to be more compatible with the surrounding code style.

3 4

Re: [PATCH 1/6] wined3d/resource: Add flag WINED3D_MAP_WRITEONLY
by Patrick Rudolph 28 Jul '16

28 Jul '16

Am Thu, 28 Jul 2016 14:04:48 +0200 schrieb Henri Verbeet <hverbeet(a)gmail.com>: > On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > > #define WINED3D_MAP_READONLY > > 0x0010 +#define > > WINED3D_MAP_WRITEONLY 0x0020 > But now the API is weird. What happens when both READONLY and > WRITEONLY are set? I think the d3d11 model makes more sense. Yes you are right. The patch is required to fix some of the d3d11 TODOs introduced in my tests, but you can ignore it for now. I'll add additional tests for it.

1 0

Re: wine-devel Digest, Vol 132, Issue 55
by Anton Baskanov 28 Jul '16

28 Jul '16

On Wed, Jul 27, 2016 at 11:07 PM, <wine-devel-request(a)winehq.org> wrote: > ---------- Forwarded message ---------- > From: Nikolay Sivov <bunglehead(a)gmail.com> > To: wine-devel(a)winehq.org > Cc: > Date: Wed, 27 Jul 2016 17:39:26 +0300 > Subject: Re: [PATCH 1/6] amstream: Fix AMAudioData::QueryInterface. > On 27.07.2016 15:51, Anton Baskanov wrote: > > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > --- > > dlls/amstream/audiodata.c | 1 - > > dlls/amstream/tests/Makefile.in | 3 +- > > dlls/amstream/tests/audiodata.c | 67 > +++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 69 insertions(+), 2 deletions(-) > > create mode 100755 dlls/amstream/tests/audiodata.c > > Hi, Anton. > > Please keep tests in existing amstream.c file. > > + > > +static void test_query_interface(void) > > +{ > > + IUnknown *unknown = create_audio_data(); > > + IMemoryData *memory_data = NULL; > > + IAudioData *audio_data = NULL; > > + > > + HRESULT result = S_OK; > > result initialization is not needed; > > > + > > + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void > **)&memory_data); > > + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); > > + if (S_OK == result) > > + { > > + IMemoryData_Release(memory_data); > > + } > > If it always fails, there's no reason add conditional Release. > > > + > > + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void > **)&audio_data); > > + ok(S_OK == result, "got 0x%08x\n", result); > > + if (S_OK == result) > > + { > > + IAudioData_Release(audio_data); > > + } > > + > > + IUnknown_Release(unknown); > > +} > > Could you check if you can query IMemoryData from IAudioData? It seems > really weird if parent interface is not supported at all. > Hi, Nikolay. Thanks for the review! I've checked QueryInterface from IAudioData, and it also fails with IID_IMemoryData. I've fixed the issues and sent the updated patches.

1 0

Re: [PATCH 2/2 v4] ucrtbase: Add _get_narrow_winmain_command_line tests
by Dmitry Timoshkov 28 Jul '16

28 Jul '16

Piotr Caban <piotr(a)codeweavers.com> wrote: > + sprintf(cmd, "\"\"%c\"\"\"%s\" \t \"misc\" cmd", name[0], name+1); > + memset(&startup, 0, sizeof(startup)); > + startup.cb = sizeof(startup); > + CreateProcessA(path, cmd, NULL, NULL, TRUE, > + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, > + NULL, NULL, &startup, &proc); > + winetest_wait_child_process(proc.hProcess); Thanks for adding the tests. It shouldn't be too hard to also test other white space characters, at least testing '\r' and '\n' would be nice to have. -- Dmitry.

2 10

Re: [PATCH 1/2] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 28 Jul '16

28 Jul '16

On 07/27/16 21:49, Daniel Lehman wrote: > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z Could you please add -arch specifiers to stub entries? Thanks, Piotr

1 0

Re: avifil32: Use debugstr_a() and debugstr_w() in TRACE() messages.
by Nikolay Sivov 28 Jul '16

28 Jul '16

I see it's Rejected on the patch list, it's indeed wrong, because you're tracing output parameters.

2 1

Re: [PATCH 2/6] d3d9/tests: Add visual tests for locking vertexbuffers
by Henri Verbeet 28 Jul '16

28 Jul '16

On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > + static const struct > + { > + const char *flags_s; > + unsigned int flags; > + DWORD usage; > + BOOL unsyncronized; > + BOOL todo; > + BOOL broken; > + } > + /* Nvidia ignores D3DLOCK_NOOVERWRITE on non dynamic buffers, > + * while AMD always accepts D3DLOCK_NOOVERWRITE on all buffers. */ > + tests[] = > + { > + {"0", 0, 0, FALSE, FALSE, FALSE}, > + {"0", 0, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, D3DUSAGE_DYNAMIC, TRUE, FALSE, FALSE}, > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, 0, FALSE, FALSE, FALSE}, > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > + }; [...] > + todo_wine_if (tests[i].todo) > + { > + ok(tests[i].unsyncronized == unsyncronized || broken(tests[i].broken), > + "Expected buffer mapped %s. Flags = %s. Usage = %#x.\n", > + tests[i].unsyncronized ? "unsyncronized" : "syncronized", tests[i].flags_s, tests[i].usage); > + } I assume the broken() is for the testbot, but the way this is written, half the cases aren't really tested on Windows. Also, what makes these fail on the testbot? > + timestamp1 = GetTickCount(); > + > + hr = IDirect3DDevice9_BeginScene(device); > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri); > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > + hr = IDirect3DDevice9_EndScene(device); > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > + > + /* dummy read to wait for GPU being done */ > + color = getPixelColor(device, 160, 360); > + > + timestamp2 = GetTickCount(); > + > + /* Adjust buffer size for 1 second draw call duration */ > + size = (size * 1000UL) / (timestamp2 - timestamp1 + 1); Does this work reliably? GetTickCount() has very limited resolution, I think there's a real chance that the draw will take only a fraction of GetTickCount()'s resolution.

1 0

Re: [PATCH 1/6] wined3d/resource: Add flag WINED3D_MAP_WRITEONLY
by Henri Verbeet 28 Jul '16

28 Jul '16

On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > #define WINED3D_MAP_READONLY 0x0010 > +#define WINED3D_MAP_WRITEONLY 0x0020 But now the API is weird. What happens when both READONLY and WRITEONLY are set? I think the d3d11 model makes more sense.

1 0

Re: [PATCH 3/4] mpr: Implement WNetCancelConnection2W().
by Nikolay Sivov 28 Jul '16

28 Jul '16

On 27.07.2016 16:16, Pierre Schweitzer wrote: > > DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) > { > - FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); I think it's better to keep this as TRACE, also maybe change lpName -> name, dwFlags -> flags, fForce -> force. Flags are unused, so maybe some fixme message for them is appropriate. > + DWORD ret = WN_NO_NETWORK; > + DWORD index; > > - return WN_SUCCESS; > + if (providerTable != NULL) > + { > + for (index = 0; index < providerTable->numProviders; index++) > + { > + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & > + WNNC_CON_GETCONNECTIONS) Shouldn't this be WNNC_CON_CANCELCONNECTION? > + { > + if (providerTable->table[index].cancelConnection) > + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); > + else > + ret = WN_NO_NETWORK; > + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) > + break; > + } According to docs, WN_OPEN_FILES happens when force == FALSE, does it make sense to handle it only in this case? Of course we have no easy way to test any of that. > + } > + } > + return ret; > }

1 0

Re: [PATCH 2/2] msvcp140: add sprintf
by Nikolay Sivov 28 Jul '16

28 Jul '16

> +#if _MSVCP_VER >= 140 > +int __cdecl sprintf(char *buf, const char *fmt, ...) > +{ > + int ret; > + __ms_va_list valist; > + __ms_va_start(valist, fmt); > + ret = __stdio_common_vsprintf(2, buf, -1, fmt, NULL, valist); > + __ms_va_end(valist); > + return ret; > +} > +#endif Are we missing patch 1/2 that adds msvcp140? Also won't it work the same if you forward it to MSVCRT_sprintf? If _common_ functions should actually be used, options should use existing private defines.

1 0

Re: [PATCH 3/3] ntdll: For Mac 64-bit, poke NtCurrentTeb()->ThreadLocalStoragePointer to the corresponding offset from %gs.
by Sebastian Lackner 28 Jul '16

28 Jul '16

On 27.07.2016 17:42, Ken Thomases wrote: > 64-bit Windows apps have hard-coded accesses to %gs:0x58 baked into them. They > need to find the ThreadLocalStoragePointer there. > > Technically, the gsbase register and the memory it points to belong to the > pthread implementation on macOS. It's used for the pthread TLS implementation. > Slot 11 (offset 0x58) is currently used for the implementation of the ttyname() > system library function. We do not anticipate that Wine or any of the system > libraries or frameworks it uses will call ttyname(). Furthermore, Apple has > made it so that future releases of macOS will no longer use that slot. So, we > hijack it for our purposes. > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/ntdll/loader.c | 11 +++++++- > dlls/ntdll/signal_x86_64.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 72 insertions(+), 1 deletion(-) I'm not sure if I correctly understand the purpose of this patch. If you have to set %gs:0x58 to some specific value, why not just use an assembly instruction for that?

3 7

Re: [PATCH 2/6] d3drm: Implement IDirect3DRM*::CreateViewport. (v2 resend)
by Stefan Dösinger 27 Jul '16

27 Jul '16

On 2016-07-19 19:08, Aaryaman Vasishta wrote: > + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) > + return hr; > + > + if (FAILED(hr = IDirect3DRMFrame_QueryInterface(camera, &IID_IDirect3DRMFrame3, (void **)&camera3))) > + { > + IDirect3DRMDevice3_Release(device3); > + return hr; > + } > + IDirect3DRMDevice_Release(device); > + IDirect3DRMFrame_Release(camera); This releases references you don't own. Same in the V2 -> V3 thunk. > + if (!device || !camera) > + return D3DRMERR_BADOBJECT; > + if (!viewport) > + return D3DRMERR_BADVALUE; These checks are redundant, Init() does that as well. > + ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); > + > + device_ref = get_refcount((IUnknown *)device1); > + frame_ref = get_refcount((IUnknown *)frame); The get_refcount here seems redundant because you've just shown that it is back to where it used to be.

2 2

Re: [PATCH 1/6] d3drm: Implement IDirect3DRMViewport*::Init. (v7)
by Stefan Dösinger 27 Jul '16

27 Jul '16

On 2016-07-19 19:08, Aaryaman Vasishta wrote: > + memset(&mat, 0, sizeof(mat)); > + mat.dwSize = sizeof(mat); > + mat.diffuse.r = RGBA_GETRED(color) / 255.0f; > + mat.diffuse.g = RGBA_GETGREEN(color) / 255.0f; > + mat.diffuse.b = RGBA_GETBLUE(color) / 255.0f; > + mat.diffuse.a = RGBA_GETALPHA(color) / 255.0f; Doing this here seems questionable. What happens if the camera's background is changed after the viewport is created? You'll probably want to update the material property in viewport::clear(), or maybe in camera::SetSceneBackground. > + if (material) > + IDirect3DMaterial_Release(material); This will destroy the material, viewport::SetBackground doesn't addref it. > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); The first and third test are identical. > + IDirect3DRMDevice3_Release(device3); > + IDirect3DRMDevice_Release(device1); > + ref4 = get_refcount((IUnknown *)d3drm1); > + todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); The ref4 > inital_ref1 check isn't all too surprising because frame3 still holds a reference to its d3drm parent. Though it seems the leaked reference added by the second Viewport::Init call gets released somewhere. The test doesn't exactly show where. It is possible that releasing the device frees it, or releasing the frame does it.

3 3

Re: [PATCH 3/6] d3drm: Implement IDirect3DRMViewport::GetDirect3DViewport. (resend)
by Stefan Dösinger 27 Jul '16

27 Jul '16

You have some lines > 120 characters in here. Otherwise looks good to me. On 2016-07-19 19:08, Aaryaman Vasishta wrote: > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/tests/d3drm.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++- > dlls/d3drm/viewport.c | 18 ++++++++++--- > 2 files changed, 80 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 17cf2dd..fc0b6b4 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1474,12 +1474,13 @@ static void test_Viewport(void) > IDirect3DRMFrame3 *frame3; > IDirect3DRMViewport *viewport; > IDirect3DRMViewport2 *viewport2; > + IDirect3DViewport *d3d_viewport; > IDirect3DRMObject *obj, *obj2; > GUID driver; > HWND window; > RECT rc; > DWORD size, data, ref1, ref2, ref3, ref4; > - DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2; > + DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; > CHAR cname[64] = {0}; > > window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > @@ -1641,13 +1642,47 @@ static void test_Viewport(void) > > hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > IDirect3DRMViewport_Release(viewport); > + > hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > IDirect3DRMViewport2_Release(viewport2); > > hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); > ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > > hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); > ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); > @@ -1713,6 +1748,9 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)d3drm3); > ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); > > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + > /* Test all failures together */ > hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > @@ -1740,6 +1778,18 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)frame); > ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); > > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + > hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > > @@ -1768,6 +1818,9 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)d3drm3); > ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); > > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > + > hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom); > @@ -1788,6 +1841,18 @@ static void test_Viewport(void) > ref4 = get_refcount((IUnknown *)frame3); > ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); > > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + viewport_ref = get_refcount((IUnknown *)d3d_viewport); > + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + ref4 = get_refcount((IUnknown *)d3d_viewport); > + ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref); > + IDirect3DViewport_Release(d3d_viewport); > + > hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); > ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); > > diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c > index 730a1f5..09b0e83 100644 > --- a/dlls/d3drm/viewport.c > +++ b/dlls/d3drm/viewport.c > @@ -826,17 +826,27 @@ static D3DRMPROJECTIONTYPE WINAPI d3drm_viewport1_GetProjection(IDirect3DRMViewp > static HRESULT WINAPI d3drm_viewport2_GetDirect3DViewport(IDirect3DRMViewport2 *iface, > IDirect3DViewport **viewport) > { > - FIXME("iface %p, viewport %p stub!\n", iface, viewport); > + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport2(iface); > > - return E_NOTIMPL; > + TRACE("iface %p, viewport %p.\n", iface, viewport); > + > + if (!viewport_object->d3d_viewport) > + return D3DRMERR_BADOBJECT; > + > + *viewport = viewport_object->d3d_viewport; > + IDirect3DViewport_AddRef(*viewport); > + > + return D3DRM_OK; > } > > static HRESULT WINAPI d3drm_viewport1_GetDirect3DViewport(IDirect3DRMViewport *iface, > IDirect3DViewport **viewport) > { > - FIXME("iface %p, viewport %p stub!\n", iface, viewport); > + struct d3drm_viewport *viewport_object = impl_from_IDirect3DRMViewport(iface); > > - return E_NOTIMPL; > + TRACE("iface %p, viewport %p.\n", iface, viewport); > + > + return d3drm_viewport2_GetDirect3DViewport(&viewport_object->IDirect3DRMViewport2_iface, viewport); > } > > static HRESULT WINAPI d3drm_viewport2_TransformVectors(IDirect3DRMViewport2 *iface, >

1 1

Re: [PATCH 1/3] ntdll: For Mac 64-bit, poke the TEB address to %gs:0x30 and re-enable the inlining of NtCurrentTeb().
by Sebastian Lackner 27 Jul '16

27 Jul '16

On 27.07.2016 17:42, Ken Thomases wrote: > 64-bit Windows apps have hard-coded accesses to %gs:0x30 baked into them. They > need to find the TEB self pointer there. > > Technically, the gsbase register and the memory it points to belong to the > pthread implementation on macOS. It's used for the pthread TLS implementation. > However, study of the sources and experimentation reveal that TLS slot 6 > (offset 0x30) is not currently used. Furthermore, Apple has promised to not > use that slot in the future. So, we hijack it for our purposes. > > This removes the implementation of NtCurrentTeb() based on pthread_key_create() > and pthread_set/getspecific(). > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/ntdll/ntdll.spec | 2 +- > dlls/ntdll/signal_x86_64.c | 34 +++------------------------------- > include/winnt.h | 2 +- > 3 files changed, 5 insertions(+), 33 deletions(-) Nice to hear that Apple agreed to keep that slot reserved. Would it make sense to keep the NtCurrentTeb export neverthless, for compatibility with libraries compiled against old Wine?

2 3

Re: [v2 PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line
by Dmitry Timoshkov 27 Jul '16

27 Jul '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +char* CDECL _get_narrow_winmain_command_line(void) > +{ > + static char *narrow_command_line; > + char *s; > + > + if (narrow_command_line) > + return narrow_command_line; > + > + s = GetCommandLineA(); > + if (*s == '"') > + { > + /* skip all leading quotes */ > + while (*++s == '"') > + ; > + /* skip everything up to next quote */ > + while (*s && *s++ != '"') > + ; > + } > + else > + { > + while (*s && *s != ' ' && *s != '\t') > + { > + /* allow embedded quoted blocks */ > + if (*s == '"') > + { > + s++; > + while (*s && *s++ != '"') > + ; > + } > + else > + s++; > + } > + } > + while (*s == ' ' || *s == '\t') > + s++; > + > + return narrow_command_line = s; > +} Once again: Where did you get an idea of such an implementation? Is this copied from some place or based on some other implementation? Why for instance simple 'return GetCommandLineA()' is not enough as an initial implementation? -- Dmitry.

2 4

Re: [PATCH 1/6] amstream: Fix AMAudioData::QueryInterface.
by Nikolay Sivov 27 Jul '16

27 Jul '16

On 27.07.2016 15:51, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > --- > dlls/amstream/audiodata.c | 1 - > dlls/amstream/tests/Makefile.in | 3 +- > dlls/amstream/tests/audiodata.c | 67 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 69 insertions(+), 2 deletions(-) > create mode 100755 dlls/amstream/tests/audiodata.c Hi, Anton. Please keep tests in existing amstream.c file. + > +static void test_query_interface(void) > +{ > + IUnknown *unknown = create_audio_data(); > + IMemoryData *memory_data = NULL; > + IAudioData *audio_data = NULL; > + > + HRESULT result = S_OK; result initialization is not needed; > + > + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void **)&memory_data); > + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); > + if (S_OK == result) > + { > + IMemoryData_Release(memory_data); > + } If it always fails, there's no reason add conditional Release. > + > + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); > + ok(S_OK == result, "got 0x%08x\n", result); > + if (S_OK == result) > + { > + IAudioData_Release(audio_data); > + } > + > + IUnknown_Release(unknown); > +} Could you check if you can query IMemoryData from IAudioData? It seems really weird if parent interface is not supported at all.

1 0

RE: MPR patches
by Hugh McMaster 27 Jul '16

27 Jul '16

On Wednesday, 27 July 2016, Pierre Schweitzer wrote: > Regarding 1. & 3. should I perform a resend with that changed, or should > I change it in the next patch I submit? > > For 2., this is done on purpose. Real implementation will come in a > later patch (already ready and tested here :-)). Personally, I'd submit your real implementation of WNetCancelConnection2W as patch 1 of 2. Then submit your implementation patch using the WCHAR * style as the second patch. But if you decide to keep to your original order, please change the style before sending. You should also rebase your patches on the latest git. Your current patch has an offset of -87 lines. As for your security certificate, although it doesn't prevent the patch from applying, it would be better removed, if possible. Le 27/07/2016 à 13:40, Hugh McMaster a écrit : > On Wednesday, 27 July 2016 6:40 AM, Pierre Schweitzer wrote: > >> Is there any reason why the MPR patches are left abandoned? There are >> others awaiting in my queue... > >> + PWSTR name = strdupAtoW(lpName); >> + if (!name) >> + return ERROR_NOT_CONNECTED; > > 1. New code should use the WCHAR * style. > > 2. All three functions call WNetCancelConnection2W, but that function is a stub: > > DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) > { > FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); > > return WN_SUCCESS; > } > > 3. Your mail has a StartCom Secure Digital Certificate attached. This has been mangled, as can be seen at the bottom of your patch: http://source.winehq.org/patches/data/124723

2 1

MPR patches
by Pierre Schweitzer 27 Jul '16

27 Jul '16

Hi, Is there any reason why the MPR patches are left abandoned? There are others awaiting in my queue... Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 2

Re: [PATCH] ucrtbase: Expose the fabsf function on arm
by Piotr Caban 27 Jul '16

27 Jul '16

Hi Martin, On 07/26/16 12:19, Martin Storsjo wrote: > It isn't available in the x86 or x64 versions of ucrtbase.dll > or api-ms-win-crt-math-l1-1-0.dll, but exists (and gets used by > MSVC 2015) on arm. > --- > dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 1 + > dlls/ucrtbase/ucrtbase.spec | 1 + > 2 files changed, 2 insertions(+) you forgot to sign-off your patch. Except of that it looks good for me. Thanks, Piotr

1 0

Re: [PATCH 2/3 v2] kernel32/tests/loader: Add tests for fiber-local storage.
by Alexandre Julliard 27 Jul '16

27 Jul '16

John Sheu <sheu(a)google.com> writes: > Signed-off-by: John Sheu <sheu(a)google.com> > --- > dlls/kernel32/tests/loader.c | 118 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 116 insertions(+), 2 deletions(-) Could you please rebase it against recent changes, and resend with a fixed sequence number so that it can run through the testbot? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] d3d11/tests: Add visual tests for locking vertexbuffers
by Marvin 26 Jul '16

26 Jul '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=24541 Your paranoid android. === wvistau64 (32 bit d3d11) === d3d11: unhandled exception 0000087c at 75A2E743 === w2008s64 (32 bit d3d11) === d3d11: unhandled exception 0000087c at 7680E743 === w7u (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w7pro64 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w8 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w864 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === w1064 (32 bit d3d11) === d3d11: unhandled exception c0000005 at 004022D6 === wvistau64 (64 bit d3d11) === d3d11: unhandled exception 0000087c at 000000007765674D === w2008s64 (64 bit d3d11) === d3d11: unhandled exception 0000087c at 0000000076EA674D === w7pro64 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C === w864 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C === w1064 (64 bit d3d11) === d3d11: unhandled exception c0000005 at 000000000040217C

1 0

Re: [PATCH 5/6] d3d10core/tests: Add visual tests for locking vertexbuffers
by Marvin 26 Jul '16

26 Jul '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=24540 Your paranoid android. === wvistau64 (32 bit device) === device: unhandled exception 00000879 at 75A2E743 === w2008s64 (32 bit device) === device: unhandled exception 00000879 at 7680E743 === w7u (32 bit device) === device: unhandled exception c0000005 at 00406895 === w7pro64 (32 bit device) === device: unhandled exception c0000005 at 00406895 === w8 (32 bit device) === device: unhandled exception c0000005 at 00406895 === w864 (32 bit device) === device: unhandled exception c0000005 at 00406895 === w1064 (32 bit device) === device: unhandled exception c0000005 at 00406895 === wvistau64 (64 bit device) === device: unhandled exception 00000879 at 000000007765674D === w2008s64 (64 bit device) === device: unhandled exception 00000879 at 0000000076EA674D === w7pro64 (64 bit device) === device: unhandled exception c0000005 at 0000000000405C40 === w864 (64 bit device) === device: unhandled exception c0000005 at 0000000000405C40 === w1064 (64 bit device) === device: unhandled exception c0000005 at 0000000000405C40

1 0

Re: [PATCH 4/6] ddraw/tests: Add visual tests for locking vertexbuffers
by Marvin 26 Jul '16

26 Jul '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=24539 Your paranoid android. === w8 (32 bit visual) === visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000. === w864 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000. === w1064 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000.

1 0

Re: [PATCH] msxml2: Share source with msxml3
by Alexandre Julliard 26 Jul '16

26 Jul '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/msxml2/Makefile.in | 49 ++++++++++++++++++++++++++++++++++++-- > dlls/msxml2/main.c | 63 ------------------------------------------------- > dlls/msxml2/msxml2.spec | 2 +- > 3 files changed, 48 insertions(+), 66 deletions(-) > delete mode 100644 dlls/msxml2/main.c Is there a real need for this? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 3/8] wined3d: Implement SM5 deriv_rtx_coarse instruction.
by Matteo Bruni 26 Jul '16

26 Jul '16

2016-07-22 12:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) > + { > + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); > + return; > + } What about using the generic dFdx()/dFdy() builtins (maybe with a WARN) for the coarse and fine variants when ARB_derivative_control isn't supported? I don't know that it's particularly relevant in practice, it just seems something we don't need to strictly depend on.

2 1

Re: [PATCH 3/8] wined3d: Implement SM5 deriv_rtx_coarse instruction.
by Henri Verbeet 26 Jul '16

26 Jul '16

On 22 July 2016 at 12:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) > +{ > + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; > + struct wined3d_string_buffer *buffer = ins->ctx->buffer; > + struct glsl_src_param src_param; > + const char *instruction; > + DWORD write_mask; > + > + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) > + { > + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); > + return; > + } > + > + switch (ins->handler_idx) > + { > + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; > + default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; > + } > + > + write_mask = shader_glsl_append_dst(buffer, ins); > + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); > + shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); > +} It doesn't matter that much, but is there any reason shader_glsl_map2gl() can't handle these?

2 1

Re: d3dx9_36: Fix a typo in TRACE() message.
by Matteo Bruni 25 Jul '16

25 Jul '16

2016-07-25 10:24 GMT+02:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > > + TRACE("pout %p, pv %p, pviewport %p, pprojection %p, pview %p, pworld %p\n", pout, pv, pviewport, pprojection, pview, pworld); While you're there, can you please clean up the function? Like dropping all the 'p' prefixes from the function arguments and using the current d3d style for the function body. Also the TRACE line seems a bit too long.

1 0

Re: include: Fix prototypes of D3DXFillXXXTextureTx for d3dx9.
by Matteo Bruni 25 Jul '16

25 Jul '16

2016-07-21 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > -HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > -HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > -HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > +HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader); > +HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, ID3DXTextureShader *texture_shader); > +HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, ID3DXTextureShader *texture_shader); Do you know where the old prototypes came from? In all the versions of the header I have around (which go back to _30) I see the "new" prototype but it's possible that it changed even further back. It's also possible these have always been wrong, although that seems somewhat unlikely to me.

1 0

Re: [PATCH] d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface.
by Matteo Bruni 25 Jul '16

25 Jul '16

2016-07-21 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > +HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) > +{ > + struct d3dx9_texture_shader *object; > + > + TRACE("function %p, texture_shader %p.\n", function, texture_shader); > + > + if (!function || !texture_shader) > + return D3DERR_INVALIDCALL; > + > + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); > + if (!object) > + return E_OUTOFMEMORY; > + > + object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; > + object->ref = 1; > + > + *texture_shader = &object->ID3DXTextureShader_iface; > + > + return D3D_OK; > +} It would be nice to have a test for this.

1 0

Re: [PATCH] d3dx10: Add D3DXCpuOptimizations stub
by Alex Henrie 25 Jul '16

25 Jul '16

+ * Copyright (C) 2007 David Adam + * Copyright (C) 2007 Tony Wasserka Did these people actually contribute anything to this patch? +/* This guaud is the same as D3DX9 to prevent double-inclusion */ Did you mean "guard"? Also, D3DX_CPU_OPTIMIZATION was already defined in d3dx9_30_main.c. I would remove the old definition from d3dx9_30_main.c and make it include d3dx10math.h instead. -Alex

3 2

Re: [v3 PATCH] d3dx10: Add D3DXCpuOptimizations stub
by Matteo Bruni 25 Jul '16

25 Jul '16

2016-07-20 11:20 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: Hi Alistair, I'm afraid this is going to be a bit nitpicky. It also means the patch is mostly okay though. > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx10_43/d3dx10_43.spec | 2 +- > dlls/d3dx10_43/d3dx10_43_main.c | 11 +++++++-- > include/Makefile.in | 1 + > include/d3dx10.h | 1 + > include/d3dx10math.h | 49 +++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 61 insertions(+), 3 deletions(-) > create mode 100644 include/d3dx10math.h > > diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec > index ab696e8..f410be8 100644 > --- a/dlls/d3dx10_43/d3dx10_43.spec > +++ b/dlls/d3dx10_43/d3dx10_43.spec > @@ -70,7 +70,7 @@ > @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation > @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox > @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere > -@ stub D3DXCpuOptimizations(long) > +@ stdcall D3DXCpuOptimizations(long) > @ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack > @ stdcall D3DXFloat16To32Array(ptr ptr long) d3dx9_36.D3DXFloat16To32Array > @ stdcall D3DXFloat32To16Array(ptr ptr long) d3dx9_36.D3DXFloat32To16Array > diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c > index 0c1ff80..408cf22 100644 > --- a/dlls/d3dx10_43/d3dx10_43_main.c > +++ b/dlls/d3dx10_43/d3dx10_43_main.c > @@ -34,8 +34,8 @@ > #include "objbase.h" > > #include "d3d10_1.h" > -#include "d3dx10core.h" > -#include "d3dx10tex.h" > +#include "d3dx10.h" > + > > WINE_DEFAULT_DEBUG_CHANNEL(d3dx); No reason to add double whitespace lines here. > > @@ -210,3 +210,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat > > return E_NOTIMPL; > } > + > +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) > +{ > + FIXME("enable %d stub.\n", enable); Can you please use %#x when tracing BOOL arguments? > +#include "d3dx10.h" > + > +/* This guard is the same as D3DX9 to prevent double-inclusion */ > +#ifndef __D3DX9MATH_H__ > +#define __D3DX9MATH_H__ > + > +#include <math.h> > + > + > +typedef enum _D3DX_CPU_OPTIMIZATION > +{ > + D3DX_NOT_OPTIMIZED = 0, > + D3DX_3DNOW_OPTIMIZED = 1, > + D3DX_SSE2_OPTIMIZED = 2, > + D3DX_SSE_OPTIMIZED = 3 > +} D3DX_CPU_OPTIMIZATION; I would go the other way and drop all the initializers instead. It's fine either way though. Also double whitespace again. > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable); > + > +#ifdef __cplusplus > +} > +#endif > + > + > +/*#include <d3dx10math.inl> */ I don't like this. Either introduce d3dx10math.inl and make this an actual include (preferred) or just remove the line for the time being.

1 0

Re: [PATCH] ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line
by Piotr Caban 25 Jul '16

25 Jul '16

On 07/24/16 20:40, Nikolay Sivov wrote: > +/********************************************************************* > + * _get_narrow_winmain_command_line (UCRTBASE.@) > + */ > +char* CDECL _get_narrow_winmain_command_line(void) > +{ > + static char *narrow_command_line; > + char *s; > + > + if (narrow_command_line) > + return narrow_command_line; > + > + s = GetCommandLineA(); > + if (*s == '"') > + { > + s++; > + while (*s) > + if (*s++ == '"') > + break; > + } > + else > + { > + while (*s && *s != ' ' && *s != '\t') > + s++; > + } > + while (*s == ' ' || *s == '\t') > + s++; > + > + return narrow_command_line = s; > +} It will not work in following case (executable name "test ws.exe"): CMD> test" "ws.exe other args or CMD> """test ws.exe" other args Probably there's no real use case for that but it shouldn't be hard to handle this cases as well. Thanks, Piotr

2 1

Re: [v2] ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified
by Alexandre Julliard 25 Jul '16

25 Jul '16

Piotr Caban <piotr(a)codeweavers.com> writes: > v2: > - fix cmd test failure Looks like there's another one I missed: ../../../tools/runtest -q -P wine -T ../../.. -M shell32.dll -p shell32_test.exe.so shelllink && touch shelllink.ok shelllink.c:251: Test failed: case doesn't match make: *** [shelllink.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msxml2: Let msxml3 register Msxml2.DOMDocument
by Alexandre Julliard 25 Jul '16

25 Jul '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > When msxml3 is native, msxml2 forwards to msxml3 which then fails > to create an object. On Windows 8.1, Msxml2.DOMDocument > point to Msxml2.DOMDocument.3.0. That should be the case on Wine too. It sounds like there's something broken with your config. Note that mixing native and builtin is not a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

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