- wine-devel - winehq.org

Re: configure: Fix cross-compiling of 32-bit Wine for OSX.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -175,6 +175,13 @@ case $host in > AC_SUBST(TARGETFLAGS,"-marm") > ;; > i[[3456789]]86*) > + if test "$cross_compiling" = "yes"; then > + CC="$CC -m32" > + CXX="$CXX -m32" > + host_cpu="i386" > + notice_platform="32-bit " > + AC_SUBST(TARGETFLAGS,"-m32") > + fi The idea is that if you are cross-compiling, you have already specified the correct host so this shouldn't be needed. How does the OS/X cross-compiler behave? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] user32: Add initial out of window procedure slots test
by Dmitry Timoshkov 09 Mar '16

09 Mar '16

Piotr Caban <piotr(a)codeweavers.com> wrote: > +static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + if(!hwnd) { > + int *count = (int*)lparam; > + (*count)++; > + } > + return 0; > +} > + > +static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + return 0; > +} ... > + memset(&wnd_classA, 0, sizeof(wnd_classA)); > + wnd_classA.lpszClassName = "winproc_test"; > + wnd_classA.lpfnWndProc = &winproc; Should be just "winproc" instead of "&winproc" > + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&winproc2), > + "SetWindowLongPtr failed with error %d\n", GetLastError()); Same here. -- Dmitry.

2 1

Re: [PATCH 5/6] d3d10core/tests: Add test for aoffimmi modifier.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > This (and the equivalent d3d11 test) fails for me on Windows: device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (0, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (1, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (2, 1). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 0). device.c:4022: Test failed: Test 18: Got unexpected color 0x00000000 at (3, 1).

1 0

Re: [PATCH 2/6] wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 17:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, > + const int *values, unsigned int size) > +{ > + const char *fmt = "%#x"; > + char str[4][17] = {{0}}; I guess this is inspired by shader_glsl_append_imm_vec4(), but I think you can just append to the buffer here. > + if (1 > size || size > 4) I don't think "1 > size" is all that more readable than "!size". > + for (i = size - 1; i >= 0; --i) > + { > + sprintf(str[i], fmt, values[i]); > + fmt = "%#x, "; > + } If you use ", %#x" for the format you don't need the awkward reverse loop. > - if (flags != WINED3D_GLSL_SAMPLE_LOAD) > - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~WINED3D_GLSL_SAMPLE_LOAD); > + static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; > + if (flags & ~texel_fetch_flags) > + ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); The original had this as well, of course, but "Unexpected flags %#x for texelFetch.\n" may be better.

1 0

Re: [PATCH v2 2/5] dxgi: Add feature level support.
by Henri Verbeet 09 Mar '16

09 Mar '16

On 8 March 2016 at 23:19, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -214,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter > return DXGI_ERROR_UNSUPPORTED; > } > > - if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) > + if (FAILED(hr = dxgi_check_feature_level_support(adapter->parent, adapter, &feature_level, 1))) > return DXGI_ERROR_UNSUPPORTED; I don't think this does what you want it to do, > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) ... > + D3D_FEATURE_LEVEL selected_feature_level = 0; ... > + return selected_feature_level; because this doesn't match the return type.

1 0

Re: [PATCH 1/5] wmasf: add stub dll
by Austin English 09 Mar '16

09 Mar '16

On Wed, Mar 9, 2016 at 12:31 AM, Austin English <austinenglish(a)gmail.com> wrote: > This patch series is for https://bugs.winehq.org/show_bug.cgi?id=39797 > > The bug subject is wmasf, but the uploaded log shows that there are a > few more dlls requested (api-ms-wine-core-*), so I went ahead and > added stubs for those while I was at it. > > -- > -Austin Sorry for the noise, gitconfig wasn't set up on the machine the patches were generated on, I'll resend tomorrow. -- -Austin

1 0

Re: [PATCH] d3dx9: IsParameterUsed stub should return TRUE.
by Henri Verbeet 08 Mar '16

08 Mar '16

On 7 March 2016 at 22:49, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > Yes, I guess returning TRUE is usually more likely to work. Of course Is that necessarily what you want though? It might be harder to debug something being slow because it's updating unused parameters than to debug something rendering incorrectly because it's not updating them. > a proper implementation would be even better (although it may be non > obvious to find out if a parameter is used, depending on what "used" > really means - it needs tests)... You always need tests, but a reasonable guess would be whether the parameter is referenced by the technique.

3 7

Metatrader 5 uses all CPU time
by Vyacheslav Napadovsky 08 Mar '16

08 Mar '16

Hello. I'm trying to launch Metatrader 5 in ubuntu with winehq-devel=1.9.5~ubuntu14.04.1 When I log in to my demo account the wineserver and terminal.exe (Metetrader 5 itself) start consume all available CPU. And if I'm trying to "Show all symbols" in "Market overview" then Metatrader UI just hangs. Here's last 10000 lines of 1.9GB log I dumped with WINEDEBUG=fixme-all,warn+all,+relay wine terminal.exe > terminal.log 2>&1 http://sendfile.su/1211848 (can't post it with pastebin.com, because it's over 500kB). Note, I killed process at the end with `killall terminal.exe` Moreover, when terminal.exe is running (without showing all symbols), `vmstat 1` shows that user space / system space consumes 50 / 50 % of CPU. And one more notice, if I run terminal.exe in a Virtual Box and assign this VM only one CPU core, than terminal.exe works fine consuming about 7% cpu, but with 2 cores it consumes 50%/50% with wineserver. On native Windows OS terminal.exe consumes less than 4% CPU with showing all symbols (I have 4 CPU cores on my notebook). Any clues where to dig next? -- Vyacheslav Napadovsky

1 0

wine dll loader
by Vyacheslav Napadovsky 08 Mar '16

08 Mar '16

Hello. I'm developing .dll plugin for thirdparty software. In Windows 8.0 all works fine (my plugin loads and unloads correctly), but in wine, I got DLL_PROCESS_ATTACH, then 7 DLL_THREAD_ATTACH at plugin loading stage and only 1 DLL_THREAD_DETACH at plugin unloading, i.e my plugin remains active (because no DLL_PROCESS_DETACH came in). Maybe that's because I spawn new thread (CreateThread) at DLL_PROCESS_ATTACH. Please, suggest ways to debug this issue. Regards, Vyacheslav Napadovsky

3 6

Re: [PATCH] opencl/tests: Add initial tests
by Henri Verbeet 08 Mar '16

08 Mar '16

On 8 March 2016 at 13:14, Detlef Riekenberg <wine.dev(a)web.de> wrote: > + * Copyright 2013 Detlef Riekenberg Is the year correct? > +INT WINAPI clGetPlatformIDs(UINT, PVOID*, UINT*); That doesn't look right. I also don't think anything in this test is particularly Windows specific.

1 0

Re: [PATCH] opencl/tests: Add initial tests
by Marvin 08 Mar '16

08 Mar '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=21276 Your paranoid android. === build (build) === Recreation of tests/Makefile failed

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -11188,6 +11188,35 @@ static void test_quit_message(void) > ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); > } > > +static void test_notify_message(void) > +{ > + HWND hwnd; > + BOOL ret; > + > + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, > + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); > + ok(hwnd != 0, "Failed to create window\n"); > + > + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); > + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); > + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); > + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); > + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); > + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); > + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); > + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); > + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); It would be interesting to test the received message contents too, also for the case of valid data. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3] d3dx9: support setting texture through SetValue in effect.
by Matteo Bruni 07 Mar '16

07 Mar '16

2016-03-06 9:39 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2389,6 +2389,43 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) > } > } > > +static void test_effect_setvalue_object(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + D3DXHANDLE parameter; > + IDirect3DTexture9 *texture; > + IDirect3DTexture9 *texture_set; > + HRESULT hr; > + ULONG count; > + > + hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, > + sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + > + parameter = effect->lpVtbl->GetParameterByName(effect, NULL, "tex"); > + ok(parameter != NULL, "GetParameterByName failed, got %p\n", parameter); > + > + texture = NULL; > + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + hr = effect->lpVtbl->SetValue(effect, parameter, &texture, sizeof(IDirect3DTexture9 **)); That sizeof() happens to have the right value (because IDirect3DTexture9 * is also a pointer type) although it's technically incorrect. It's generally preferred to use the variable instead of the type in sizeof when possible (e.g. in this case sizeof(texture)), that would have avoided this mistake and it also helps in other cases. The other two calls to {GS}etValue below have the same issue.

1 0

[PATCH RFC] programs/winedevice.exe: allow group loading
by Aric Stewart 07 Mar '16

07 Mar '16

Here is a patch Sebastian Lackner wanted to see. This is continued work to allow group loading and working off of moving to using IoCreateDriver and such in winedevice. Still using a mailslot which I know Sebastian does not like. But it works quite well. -aric --- programs/winedevice/device.c | 190 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 170 insertions(+), 20 deletions(-)

1 0

Re: [PATCH] webservices: Fixed memory leaks in one error condition (Coverity)
by Hans Leidekker 07 Mar '16

07 Mar '16

Hi Marcus, > diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c > index 72e75c3..688bc2b 100644 > --- a/dlls/webservices/reader.c > +++ b/dlls/webservices/reader.c > @@ -928,7 +928,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > WS_XML_UTF8_TEXT *text; > unsigned int len = 0, ch, skip, quote; > const unsigned char *start; > - WS_XML_STRING *prefix, *localname; > + WS_XML_STRING *prefix, *localname = NULL; > HRESULT hr = WS_E_INVALID_FORMAT; > > if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; > @@ -948,7 +948,11 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) > { > attr->isXmlNs = 1; > - if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; > + heap_free (prefix); > + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) { > + heap_free (localname); > + goto error; > + } > attr->localName = localname; > } > else Please replace tabs with spaces and use the same formatting as surrounding code. Otherwise it looks good, thanks.

1 0

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Marvin 07 Mar '16

07 Mar '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=21242 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w864 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Marvin 07 Mar '16

07 Mar '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=21241 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

2 1

Re: make_xftmpl: Remove getopt prototype
by Alexandre Julliard 07 Mar '16

07 Mar '16

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -92,8 +92,6 @@ static const struct keyword reserved_words[] = { > {"WORD", TOKEN_WORD} > }; > > -extern int getopt(int argc, char *const *argv, const char *optstring); This was explicitly added for MSVC builds. -- Alexandre Julliard julliard(a)winehq.org

1 0

Problems about License Compatibility
by Jianqiu Zhang 07 Mar '16

07 Mar '16

Hi, I am writing packet.dll which is a dependency of windows native wpcap.dll , Source can be get from winpcap.org , When I try to impelment it in wine, I found that I need to use the Packet32.h from packet.dll , Which has a different license than wine(LGPL), And I am not familar with solving license compability, Is there anyone that know how to solve this problem? Thanks in advance I Attach the License for Packet32.h below -- snip -- /* * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) * Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the Politecnico di Torino, CACE Technologies * nor the names of its contributors may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */

3 2

Re: ntdll: add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32
by Alexandre Julliard 07 Mar '16

07 Mar '16

Louis Lenders <xerox.xerox2000x(a)gmail.com> writes: > Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com> I'll apply this one, but next time could you please put a valid email address here? Thanks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2] d3dx9: support setting texture through SetValue in effect.
by Paul Gofman 06 Mar '16

06 Mar '16

I will add a fall through message, thanks for the notice On 03/06/2016 11:29 AM, Paul Gofman wrote: > Hi Alistair, no, there is actual copy of data below there which is > required for this case either. Thanks, Paul. > > On Sun, 6 Mar 2016 at 06:16, Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com <mailto:leslie_alistair@hotmail.com>> wrote: > > Hi Paul, > I think you have missed a break in the switch or a message to > state fall through. > > > Alistair >

1 0

re: [v2] d3dx9: support setting texture through SetValue in effect.
by Alistair Leslie-Hughes 06 Mar '16

06 Mar '16

Hi Paul, I think you have missed a break in the switch or a message to state fall through. Alistair

1 0

wine 1.9.5 shared wow64 compile error
by Olivier F. R. Dierick 06 Mar '16

06 Mar '16

Hello, I've updated my git tree with 1.9.5 and now I have this error while compiling 32bit Wine with the --with-wine64 option (in a shared wow64 setup): ---begin make output--- ... rm -f fonts && ln -s ../1.9.5_wow_64/fonts fonts rm: impossible de supprimer « fonts »: est un dossier make: *** [fonts] Erreur 1 ... ---end make output--- It says fonts is a directory and can't be removed. I do out-of-tree builds. The 32bit directory doesn't exists when I run configure. After running configure, the 32bit build tree is there and contains a fonts directory with a single Makefile in it. I had no such error with Wine 1.9.4 and I don't have it when compiling stand-alone 32bit Wine or the 64bit shared wow part. I did a regression test and found this commit to be the culprit: ---begin git bisect output--- dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 is the first bad commit commit dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 29 15:06:42 2016 +0900 makefiles: Don't generate global rules in disabled directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ... ---end git bisect output--- I look forward to hearing from you soon -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 2

Wine-1.9.5 source code Cppcheck 1.69 scanning
by Игорь Чебаненко 04 Mar '16

04 Mar '16

Source code scanned with Cppcheck 1.69. Yes,I know that in this scanning report I have messages called "noise messages",but I hope,that you will see real bugs,and will ingnore this type of messages.

1 0

Re: [PATCH 07/10] d3d10_1: Implement D3D10CreateDeviceAndSwapChain1().
by Henri Verbeet 04 Mar '16

04 Mar '16

On 4 March 2016 at 11:43, Józef Kucia <jkucia(a)codeweavers.com> wrote: > It doesn't seem to be easy to declare D3D10CreateDeviceAndSwapChain1() > without using cpp_quote() because D3D10_DRIVER_TYPE is unknown to idl > (it's declared in d3d10misc.h). My knowledge about idl is limited > so maybe someone knows better. The easiest thing to do would be to use "enum D3D10_DRIVER_TYPE" instead of "D3D10_DRIVER_TYPE". I wouldn't be opposed to just using idl for d3d10misc.h either though. > +cpp_quote("HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *,") > +cpp_quote(" D3D10_DRIVER_TYPE, HMODULE, UINT, D3D10_FEATURE_LEVEL1,") > +cpp_quote(" UINT, DXGI_SWAP_CHAIN_DESC *, IDXGISwapChain **, ID3D10Device1 **);") I'd prefer this with parameter names either way.

1 0

Re: [PATCH 1/2] user32: Store pointer to timer callback in SetTimer function instead of treating it as window procedure
by Alexandre Julliard 04 Mar '16

04 Mar '16

Piotr Caban <piotr(a)codeweavers.com> writes: > I decided to leave 16-bit version of SetTimer as is for now. I haven't > seen any application running out of window procedures in this > case. This patch will change behavior of following 16-bit application: > SetTimer(hWnd, TIMER_ID, 1, tfunc); > GetMessage32(&msg, 0, 0, 0, TRUE); //get's WM_TIMER message > DispatchMessage32(&msg, TRUE); > Now this code will no longer call tfunc callback. According to my test > new behavior is correct. The more likely case is a 16-bit app retrieving a 32-bit timer and calling it through DispatchMessage16. How is this going to work with your proposed changes? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 2/2 v2] d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport
by Henri Verbeet 04 Mar '16

04 Mar '16

On 3 March 2016 at 09:10, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMOBJECTCALLBACK cb, void *ctx) > +{ > + struct destroy_callback *callback, *callback2; > + > + if (!cb) > + return D3DRMERR_BADVALUE; > + > + LIST_FOR_EACH_ENTRY_SAFE(callback, callback2, &object->destroy_callbacks, struct destroy_callback, entry) > + { > + if (callback->cb == cb && callback->ctx == ctx) > + { > + list_remove(&callback->entry); > + HeapFree(GetProcessHeap(), 0, callback); > + } > + } > + > + return D3DRM_OK; > +} I won't hold it against the patch (much), but is that correct? E.g. suppose you do something like the following: add cb1 add cb2 add cb3 add cb2 delete cb2 What would the sequence be that ends up getting called?

2 1

Re: [v3 6/7] d3dx9: implement state save and restore in effect.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- For your next submissions, can you please write a short changelog of the differences with the previous version(s) of the same patch? Ideally that goes after the '---'. > @@ -3493,18 +3501,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + unsigned int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed, hr %#x.\n", hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); This is likely correct but testing it with a technique with at least 2 passes would be nice.

1 0

Re: [v3 5/7] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 41 +++++++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 40 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index e1f01f2..6813c79 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2681,7 +2681,8 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, > + struct d3dx_state *state, int parent_index) I would have used an unsigned int here, flagging "none" with ~0u.

1 0

Re: [v3 4/7] d3dx9: implement shader constants effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + UINT nelem; "unsigned int element_count;" would be better.

1 0

Re: [v3 3/7] d3dx9: implement light and material effect states application.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > + light_tbl[] = > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; This is misindented. > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].offset) = c; It's probably a bit nicer to cast to (BYTE *) instead of (char *). > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 81a7d12..3bcba72 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2910,11 +2910,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(bval, "Got result %u, expected TRUE.\n", bval); > hr = IDirect3DDevice9_GetLight(device, 2, &light); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > @@ -2950,9 +2950,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - ok(!bval, "Got result %u, expected 0.\n", bval); > + todo_wine ok(!bval, "Got result %u, expected 0.\n", bval); It would be nice if the test also checked the material.

1 0

Re: [v3 1/7] d3dx9: add test for basic effect state management.
by Matteo Bruni 03 Mar '16

03 Mar '16

2016-03-03 13:22 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} The if is unnecessary, the effect creation should never fail (and if it failed you would have already crashed long before that).

1 0

Re: [3/5] imm32: Create default IME window when creating a new window.
by Aric Stewart 03 Mar '16

03 Mar '16

Ok I have been chatting with Alexandre and also dusting off my own memories here. The problem with hooks is that they create serious performance issues. Alexandre will likely not accept any patch that involves hooks. What is likely a better approach is to move some of this code into user32. I know that on windows there is very close integration between imm32 and user32, beyond what we have in wine. I am thinking maybe we need the default IME window creation in user32 and have it stored somewhere, like in the TEB, where it can be in existing thread data. I was brainstorming with Alexandre so that I could give you some guidance, and he said that the user_thread_info block (user32/user_private.h stored in the TEB->Win32ClientInfo) would be acceptable, but the user_thread_info is private to user32, so there would have to be a way to get that to that data so that ImmGetDefaultIMEWnd can find that window. I dont have the answers for that yet, but it is a starting point to try to figure this out. I know when I implemented the IMMThreadData stuff in imm32 it was all mostly thing I felt like really belonged in the TEB, but I was not in a place where I needed to really advocated for that change. There are other Reserved blocks in the TEB that you could argue imm32 could take over if you feel that to be better than the user_thread_info structure. Unfortunately it sounds like hooks will not be acceptable for us. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++- > dlls/imm32/tests/imm32.c | 4 ++-- > 2 files changed, 57 insertions(+), 3 deletions(-) > > > >

1 0

Re: [4/5] imm32: Move default IME window creation to WM_NCCREATE hook.
by Aric Stewart 03 Mar '16

03 Mar '16

Hooks are only installed if GetSystemMetrics(SM_DBCSENABLED) and GetSystemMetrics(SM_IMMENABLED) are both true. Your earlier patch which implement SM_IMEENABLED turns it on if GetVersion() & 0xff >= 6 or if the version is == 5 SM_DBCSENABLED, what window versions. So Any prefix with a version of lower than XP would no longer have default IME windows? For Windows XP and higher then we need SM_DBCSENABLED to be true. SM_DBCSENABLED results in the codepage having a MaxCharSize as > 1, which looks like it pretty much always true, especially for UTF8, but under which situations would that not be the case, and again we would be disabling the default IME window? I like what you are doing here, I just want to understand what situations we would be disabling ime input. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > > In other words, we no longer create it in ImmGetDefaultIMEWnd(). > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 59 ++++++++++++++++++++++++++++++++++---------------------- > 1 file changed, 36 insertions(+), 23 deletions(-) > > > >

2 1

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Aric Stewart 03 Mar '16

03 Mar '16

I worry about the 64-bit errors and even if they are false alarms we will want to be able to at least prevent/silence them. Otherwise looks good! -aric On 3/2/16 7:53 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > > >

2 1

Re: libport: Mark internal functions and data tables as hidden.
by Francois Gouget 03 Mar '16

03 Mar '16

commit 34174e2ca8cb61150d3d880400d8231a39d38307 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:36:41 2016 +0900 libport: Mark internal functions and data tables as hidden. This patch breaks the compilation on Solaris 11.11: ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_digitmap: a GOT relative relocation must reference a local symbol ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_compatmap: a GOT relative relocation must reference a local symbol Removing the DECLSPEC_HIDDEN on wine_digitmap(), wine_compatmap() but also wine_compose() and wine_decompose() fixes this. As far as I can tell the linker considers that hidden symbols are not visible outside the static library. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

2 7

Re: [PATCH] manpages: markup fixes
by Michael Stefaniuc 03 Mar '16

03 Mar '16

On 03/02/2016 02:03 PM, Eric S. Raymond wrote: > Marcus Meissner <marcus(a)jet.franken.de>: >> Supplied by Eric S. Raymond. >> >> (Did not send a specific signed-off-by, but his email and his follow up email >> seems to imply it.) > > That is correct. > > Thanks, I have marked thesse patches "promised" in my database. The patches were committed: https://source.winehq.org/git/wine.git/commitdiff/0d06ebf5fb515e19cd9ec951d… Thank you for your contribution to Wine! bye michael

2 1

Re: shell32/tests: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '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=21142 Your paranoid android. === w1064 (32 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} === w1064 (64 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832}

2 1

Re: ddraw: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '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=21137 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

2 1

Re: [resend] shell32: fix two bugs in IQueryAssocations
by Marvin 03 Mar '16

03 Mar '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=21124 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed: === w2003std (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed:

1 0

Re: [v2 1/6] d3dx9: add test for basic effect state management.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 260 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 260 insertions(+) > I think these patches are on the right path in general. There are a number of small issues though. You have a few trailing whitespaces in your patches, make sure to get rid of them. > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 1b895da..6dd3e00 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2692,6 +2692,265 @@ static void test_effect_compilation_errors(IDirect3DDevice9 *device) > effect->lpVtbl->Release(effect); > } > > +/* fxc.exe /T fx_2_0 Better if you put the effect source in a #if 0 block, as it is done elsewhere, instead of inside a comment. > +vertexshader vs_arr1[2] = > +{ > + asm > + { > + vs_1_1 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + } > +}; > + > +sampler sampler1 = > + sampler_state > + { > + MipFilter = LINEAR; > + }; > + > +float4x4 camera : VIEW = {4.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,6.0}; > +technique tech0 > +{ > + pass p0 > + { > + vertexshader = vs_arr1[1]; > + VertexShaderConstant1[3] = {2,2,2,2}; > + BlendOp = 2; > + AlphaOp[3] = 4; > + ZEnable = true; > + WorldTransform[1]={2.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,4.0}; > + ViewTransform=(camera); > + LightEnable[2] = TRUE; > + LightType[2] = POINT; > + LightPosition[2] = {4.0f, 5.0f, 6.0f}; > + Sampler[1] = sampler1; > + } > +} */ > + > +static const DWORD test_effect_states_effect_blob[] = > +{ > +0xfeff0901, 0x000002e8, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, > +0x00000001, 0x00000002, 0x00000008, 0x615f7376, 0x00317272, 0x0000000a, 0x00000004, 0x00000074, > +0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, > +0x00000001, 0x00000001, 0x00000001, 0x000000ab, 0x00000100, 0x00000044, 0x00000040, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000003, 0x00000002, 0x000000e0, 0x000000ec, 0x00000000, > +0x00000004, 0x00000004, 0x40800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x40c00000, 0x00000007, 0x656d6163, 0x00006172, 0x00000005, 0x57454956, 0x00000000, > +0x00000003, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x40000000, > +0x40000000, 0x40000000, 0x00000003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, > +0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x40800000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000001, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x40800000, > +0x40a00000, 0x40c00000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00000001, 0x00000000, 0x0000000a, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00003070, 0x00000006, 0x68636574, 0x00000030, 0x00000003, 0x00000001, 0x00000005, 0x00000004, > +0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, 0x00000060, 0x00000000, 0x00000000, > +0x00000084, 0x000000a0, 0x00000000, 0x00000000, 0x000002dc, 0x00000000, 0x00000001, 0x000002d4, > +0x00000000, 0x0000000b, 0x00000092, 0x00000000, 0x000000fc, 0x000000f8, 0x00000098, 0x00000003, > +0x00000120, 0x00000110, 0x0000004b, 0x00000000, 0x00000140, 0x0000013c, 0x0000006b, 0x00000003, > +0x00000160, 0x0000015c, 0x00000000, 0x00000000, 0x00000180, 0x0000017c, 0x0000007d, 0x00000001, > +0x000001dc, 0x0000019c, 0x0000007c, 0x00000000, 0x00000238, 0x000001f8, 0x00000091, 0x00000002, > +0x00000258, 0x00000254, 0x00000084, 0x00000002, 0x00000278, 0x00000274, 0x00000088, 0x00000002, > +0x000002a0, 0x00000294, 0x000000b2, 0x00000001, 0x000002c0, 0x000002bc, 0x00000002, 0x00000003, > +0x00000001, 0x0000002c, 0xfffe0101, 0x00000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, > +0x3f800000, 0x00000001, 0xc00f0000, 0xa0e40000, 0x0000ffff, 0x00000002, 0x0000002c, 0xfffe0200, > +0x05000051, 0xa00f0000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x02000001, 0xc00f0000, > +0xa0e40000, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x0000000a, 0x00000001, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000006, 0x00000000, > +0x0000016c, 0x46580200, 0x0030fffe, 0x42415443, 0x0000001c, 0x0000008b, 0x46580200, 0x00000001, > +0x0000001c, 0x20000100, 0x00000088, 0x00000030, 0x00000002, 0x00000004, 0x00000038, 0x00000048, > +0x656d6163, 0xab006172, 0x00030003, 0x00040004, 0x00000001, 0x00000000, 0x40800000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40c00000, 0x4d007874, 0x6f726369, > +0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, > +0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, 0x0024fffe, 0x434c5846, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000004, > +0x00000000, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000004, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000008, 0x00000000, 0x00000004, > +0x00000008, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x0000000c, 0x00000000, 0x00000004, > +0x0000000c, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, > +0x00000001, 0x0000000b, 0x615f7376, 0x5b317272, 0x00005d31, > +}; Can you please indent the effect blob data? > + > +static DWORD test_effect_states_vshader_buf[sizeof(test_effect_states_effect_blob) / sizeof(DWORD)]; It seems better to dynamically allocate the buffer instead. Something like: - call GetFunction() with a NULL data pointer to get the size - HeapAlloc() the buffer with the received size - call GetFunction() again, passing it the allocated buffer - do your checks - HeapFree() the buffer > + > +static void test_effect_states(IDirect3DDevice9 *device) > +{ > + D3DMATRIX test_mat = > + {{{ > + -1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f > + }}}; > + D3DMATRIX test_mat_camera = > + {{{ > + 4.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 6.0f > + }}}; > + D3DMATRIX test_mat_world1 = > + {{{ > + 2.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 4.0f > + }}}; > + D3DMATRIX mat; > + HRESULT hr; > + ID3DXEffect *effect; > + UINT npasses; > + DWORD value; > + IDirect3DVertexShader9 *vshader; > + UINT byte_code_size; > + BOOL bval; > + D3DLIGHT9 light; > + float float_data[4]; > + > + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + /* 1. State affected in passes saved/restored even if no pass > + was performed. States not present in passes are not saved & > + restored */ That type of "n." notation isn't found elsewhere and I don't think it's particularly useful here either. > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(npasses == 1, "Expected 1 pass, got %u\n", npasses); > + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 3); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 2); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 1, "Got result %u, expected %u.\n", value, 1); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > + ok(value == 2, "Got result %u, expected %u.\n", value, 2); > + > + /* 2. Test states application in BeginPass. No states are restored > + on EndPass. */ > + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_MIPFILTER, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.", bval); > + > + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); Any reason you're not checking the entire matrix this time only? > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_camera.m, sizeof(mat)), "View matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(vshader != NULL, "Got NULL vshader.\n"); > + if (vshader) > + { > + byte_code_size = sizeof(test_effect_states_vshader_buf); > + hr = IDirect3DVertexShader9_GetFunction(vshader, test_effect_states_vshader_buf,&byte_code_size); Whitespace after comma. > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); > + ok(test_effect_states_vshader_buf[0] == 0xfffe0200, "Incorrect shader selected: %#x.\n", test_effect_states_vshader_buf[0]); Here you could memcmp the entire shader with the one from the effect blob. > + IDirect3DVertexShader9_Release(vshader); > + } > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(bval,"Got result %u, expected TRUE.\n", bval); > + hr = IDirect3DDevice9_GetLight(device, 2, &light); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > + "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 3, float_data, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(float_data[0] == 2.0f && float_data[1] == 2.0f && float_data[2] == 2.0f && float_data[3] == 2.0f, > + "Got unexpected vertex shader floats: (%f %f %f %f).\n", > + float_data[0], float_data[1], float_data[2], float_data[3]); > + > + hr = effect->lpVtbl->EndPass(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value,"Got result %u, expected TRUE.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.\n", bval); > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} > + > START_TEST(effect) > { > HWND wnd; > @@ -2730,6 +2989,7 @@ START_TEST(effect) > test_effect_parameter_value(device); > test_effect_variable_names(device); > test_effect_compilation_errors(device); > + test_effect_states(device); > > count = IDirect3DDevice9_Release(device); > ok(count == 0, "The device was not properly freed: refcount %u\n", count); > -- > 2.5.0

2 2

Re: [PATCH v2] winejoystick.drv: Gracefully handle polling an unplugged device
by Ken Thomases 02 Mar '16

02 Mar '16

On Mar 2, 2016, at 1:46 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > > v2: Use a Helper function instead of duplicated code I should have caught this the first time, but: > +static LRESULT driver_getElementValue(IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef *pValueRef) > +{ > + IOReturn ret; > + ret = IOHIDDeviceGetValue(device, element, pValueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } > + return JOYERR_NOERROR; > +} It's a bit strange to use an "if" based on ret and then a "switch" based on it, too. You could just use the switch, right? -Ken

2 1

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Aric Stewart 02 Mar '16

02 Mar '16

I am curious. Are the test failures here because of the 32bit vs 64bi? It seems strange. We are going to want to find a way that these done introduce more failures into our winetest runs. -aric On 3/2/16 7:53 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > > >

1 0

Re: [PATCH] winejoystick.drv: Gracefully handle polling an unplugged device
by Ken Thomases 02 Mar '16

02 Mar '16

On Mar 2, 2016, at 11:28 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > > dlls/winejoystick.drv/joystick_osx.c | 40 +++++++++++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 3 deletions(-) > - IOHIDDeviceGetValue(device, button, &valueRef); > + ret = IOHIDDeviceGetValue(device, button, &valueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } The above sort of change is repeated three times. Seems like a case for a helper function. -Ken

1 0

Re: [v2 6/6] d3dx9: implement state save and restore in effect.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 66 ++++++++++++++++++++++++++++++++------------ > dlls/d3dx9_36/tests/effect.c | 8 +++--- > 2 files changed, 53 insertions(+), 21 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 8a359d0..a7611fe 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -162,6 +162,8 @@ struct d3dx_technique > > struct d3dx_parameter *annotations; > struct d3dx_pass *passes; > + > + struct IDirect3DStateBlock9 *saved_state; > }; > > struct param_table > @@ -642,6 +644,12 @@ static void free_technique(struct d3dx_technique *technique) > if (!technique) > return; > > + if (technique->saved_state) > + { > + IDirect3DStateBlock9_Release(technique->saved_state); > + technique->saved_state = NULL; > + } > + What happens if the effect is released while inside a Begin() / End() pair? Is the state restored or not? > if (technique->annotations) > { > for (i = 0; i < technique->annotation_count; ++i) > @@ -3467,8 +3475,8 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL > > static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); > > @@ -3477,18 +3485,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed: %#x.\n",hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); > + hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state); > + if (FAILED(hr)) > + ERR("EndStateBlock failed: %#x.\n",hr); > + } > + hr = IDirect3DStateBlock9_Capture(technique->saved_state); > + if (FAILED(hr)) > + ERR("StateBlock Capture failed: %#x.\n",hr); > } > > *passes = technique->pass_count; > - This->started = TRUE; > - This->flags = flags; > + effect->started = TRUE; > + effect->flags = flags; > > return D3D_OK; > } > @@ -3518,17 +3542,15 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > > static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - > - FIXME("(%p)->(): stub\n", This); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); Implementing CommitChanges should be a separate patch. Also please turn the FIXME into a TRACE instead of dropping it entirely. > > - if (!This->active_pass) > + if (!effect->active_pass) > { > WARN("Called without an active pass.\n"); > return D3D_OK; > } > - > - return E_NOTIMPL; > + /* TODO: apply only changed states */ > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > @@ -3550,23 +3572,33 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > > static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p.\n", iface); > > - if (!This->started) > + if (!effect->started) > return D3D_OK; > > - if (This->manager || This->flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State restoring disabled.\n"); > } > else > { > - FIXME("State restoring not supported, yet!\n"); > + HRESULT hr; > + > + if (technique && technique->saved_state) > + { > + hr = IDirect3DStateBlock9_Apply(technique->saved_state); > + if (FAILED(hr)) > + ERR("State block apply failed: %#x.\n",hr); > + } > + else > + ERR("No saved state."); Missing '\n'. > } > > - This->started = FALSE; > + effect->started = FALSE; > > return D3D_OK; > } > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index a052bce..3d0e01c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2850,7 +2850,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 1, "Got result %u, expected %u.\n", value, 1); > + ok(value == 1, "Got result %u, expected %u.\n", value, 1); > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > ok(value == 2, "Got result %u, expected %u.\n", value, 2); > > @@ -2862,7 +2862,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(!bval,"Got result %u, expected 0.", bval); > > @@ -2940,12 +2940,12 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > + ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

2 1

Re: [v2 5/6] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 37 +++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index decc048..8a359d0 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2676,7 +2676,7 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, int parent_index) > { > IDirect3DDevice9 *device = effect->device; > struct d3dx_parameter *param; > @@ -2696,9 +2696,42 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_FVF: > TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURE: > + { > + UINT sampler; Technically this would be a texture unit (or texture stage) more than a sampler index. > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s: sampler %u value %p.\n", state_table[state->operation].name, sampler, *(IDirect3DBaseTexture9 **)param_value); > + return IDirect3DDevice9_SetTexture(device, sampler, *(IDirect3DBaseTexture9 **)param_value); > + } > case SC_TEXTURESTAGE: > TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_SETSAMPLER: > + { > + struct d3dx_sampler *sampler; > + HRESULT ret, hr; > + int i; > + > + sampler = (struct d3dx_sampler *)param_value; > + TRACE("%s: sampler %u applying %u states.\n", state_table[state->operation].name, state->index, sampler->state_count); > + ret = D3D_OK; > + for (i = 0; i < sampler->state_count; i++) > + { > + hr = d3dx9_apply_state(effect, pass, &sampler->states[i], state->index); > + if (FAILED(hr)) > + ret = hr; > + } > + return ret; > + } > + case SC_SAMPLERSTATE: > + { > + UINT sampler; > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s sampler %u:%u.\n", state_table[state->operation].name, sampler, *(DWORD *)param_value); Please use the same trace style you're using for the other states. > + return IDirect3DDevice9_SetSamplerState(device, sampler, state_table[state->operation].op, *(DWORD *)param_value); > + } > case SC_VERTEXSHADER: > TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > @@ -2772,7 +2805,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > { > HRESULT hr; > > - hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + hr = d3dx9_apply_state(effect, pass, &pass->states[i], -1); > if (FAILED(hr)) > { > WARN("Error applying state: %#x.\n", hr); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 3184f26..a052bce 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2929,7 +2929,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > + ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > > hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > -- > 2.5.0

1 0

Re: [v2 3/6] d3dx9: implement light and material effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 139 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/effect.c | 8 +-- > 2 files changed, 143 insertions(+), 4 deletions(-) > More nitpicks on this one... > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 7ccdb36..16110c5 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2514,6 +2514,114 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct > return E_NOTIMPL; > } > > +static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) > +{ > + static const struct > + { > + int off; I'd prefer "unsigned int offset;". > + const char *name; > + } light_tbl[] = I think the wined3d style is to put the closing '}' on its own line. > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].off) = c; > + break; > + } > + case LT_POSITION: > + case LT_DIRECTION: > + { > + D3DVECTOR v = *(D3DVECTOR *)value; > + > + TRACE("%s (%f %f %f).\n", light_tbl[op].name, v.x, v.y, v.z); > + *(D3DVECTOR *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + case LT_RANGE: > + case LT_FALLOFF: > + case LT_ATTENUATION0: > + case LT_ATTENUATION1: > + case LT_ATTENUATION2: > + case LT_THETA: > + case LT_PHI: > + { > + float v = *(float *)value; > + TRACE("%s %f.\n", light_tbl[op].name, v); > + *(float *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + default: > + FIXME("Unknown light parameter %u.\n",op); > + break; > + } > +} > + > +static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *material, void *value) > +{ > + static const struct > + { > + int off; > + const char *name; > + } material_tbl[] = Same as above. > + { > + {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"}, > + {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"}, > + {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"} > + }; > + > + if (op < 0 || op > MT_POWER) > + { > + FIXME("Unknown material parameter %u.\n",op); > + return; > + } > + > + switch (op) > + { > + case MT_POWER: > + { > + float v = *(float *)value; > + > + TRACE("%s %f.\n", material_tbl[op].name, v); > + material->Power = v; > + break; > + } > + default: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", material_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)material + material_tbl[op].off) = c; > + break; > + } > + } > +} I probably prefer if you write this in the same fashion as with the light parameter above (explicit cases for the 4 color values, error message in the default case of the switch). Actually the error message should probably be a WARN() instead since I don't think values different from the ones you're handling are ever legitimate so there is nothing to fix for us (but the value comes from the application so it's not an ERR). > + > static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > { > IDirect3DDevice9 *device = effect->device; > @@ -2554,6 +2662,37 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_TRANSFORM: > TRACE("%s %u.\n", state_table[state->operation].name, state->index); > return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_LIGHTENABLE: > + TRACE("%s index %u %u.\n", state_table[state->operation].name, state->index, *(BOOL *)param_value); > + return IDirect3DDevice9_LightEnable(device, state->index, *(BOOL *)param_value); > + case SC_LIGHT: > + { > + D3DLIGHT9 light; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetLight(device, state->index, &light); > + if (FAILED(hr)) > + { > + WARN("Could not get light: %#x.\n", hr); > + memset(&light, 0, sizeof light); Please parenthesize the sizeof argument. > + } > + d3dx9_set_light_parameter(state_table[state->operation].op, &light, param_value); > + return IDirect3DDevice9_SetLight(device, state->index, &light); > + } > + case SC_MATERIAL: > + { > + D3DMATERIAL9 material; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetMaterial(device, &material); > + if (FAILED(hr)) > + { > + WARN("Could not get material: %#x.\n", hr); > + memset(&material, 0, sizeof material); > + } > + d3dx9_set_material_parameter(state_table[state->operation].op, &material, param_value); > + return IDirect3DDevice9_SetMaterial(device, &material); > + } > case SC_NPATCHMODE: > TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index e415a3c..3eaddb7 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2903,11 +2903,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(bval,"Got result %u, expected TRUE.\n", bval); > hr = IDirect3DDevice9_GetLight(device, 2, &light); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > @@ -2943,9 +2943,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - ok(!bval,"Got result %u, expected 0.\n", bval); > + todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

1 0

Re: [v2 2/6] d3dx9: implement simple effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 111 +++++++++++++++++++++++++++++++++++++++---- > dlls/d3dx9_36/tests/effect.c | 16 +++---- > 2 files changed, 110 insertions(+), 17 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index f0bbd0b..7ccdb36 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2490,6 +2490,102 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, > return E_NOTIMPL; > } > > +static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param) Please break lines so they stay under 100 - 120 characters. > +{ > + struct d3dx_parameter *param; > + param = state->parameter.referenced_param ? state->parameter.referenced_param : &state->parameter; > + > + switch (state->type) > + { > + case ST_CONSTANT: > + case ST_PARAMETER: > + *param_value = param->data; > + *out_param = param; > + return D3D_OK; > + case ST_ARRAY_SELECTOR: > + FIXME("Array selector.\n"); > + break; > + case ST_FXLC: > + FIXME("FXLC not supported yet.\n"); > + break; > + } > + *param_value = NULL; > + *out_param = NULL; > + return E_NOTIMPL; > +} > + > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +{ > + IDirect3DDevice9 *device = effect->device; > + struct d3dx_parameter *param; > + void *param_value; > + HRESULT hr; > + > + TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); > + hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param); > + if (FAILED(hr)) > + return hr; > + > + switch (state_table[state->operation].class) > + { > + case SC_RENDERSTATE: > + TRACE("%s: operation %u value %u.\n", state_table[state->operation].name, state_table[state->operation].op, *(DWORD *)param_value); You're not being entirely consistent with those traces. I'd use the style you're using here throughout the file but without the ':'. > + return IDirect3DDevice9_SetRenderState(device, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_FVF: > + TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > + return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURESTAGE: > + TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > + return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_VERTEXSHADER: > + TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > + hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set vertex shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_PIXELSHADER: > + TRACE("%s pixel shader %p.\n", state_table[state->operation].name, *(IDirect3DPixelShader9 **)param_value); > + hr = IDirect3DDevice9_SetPixelShader(device, *(IDirect3DPixelShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set pixel shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_TRANSFORM: > + TRACE("%s %u.\n", state_table[state->operation].name, state->index); > + return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_NPATCHMODE: > + TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > + return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > + default: > + FIXME("%s not handled.\n", state_table[state->operation].name); > + break; > + } > + return D3D_OK; > +} > + > +static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass) > +{ > + UINT i; I'd prefer "unsigned int" for these kind of loop variables, here and elsewhere in those patches. > + HRESULT ret; > + > + TRACE("Effect %p, pass %p, state_count=%u.\n", effect, pass, pass->state_count); Please drop the '='. While at it, use lowercase for "effect". > + > + ret = D3D_OK; > + for (i = 0; i < pass->state_count; i++) > + { > + HRESULT hr; > + > + hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + if (FAILED(hr)) > + { > + WARN("Error applying state: %#x.\n", hr); > + ret = hr; > + } > + } > + return ret; > +} > + > static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) > { > return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); > @@ -3175,18 +3271,15 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > > static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > - TRACE("iface %p, pass %u\n", This, pass); > + TRACE("iface %p, pass %u\n", effect, pass); > > - if (technique && pass < technique->pass_count && !This->active_pass) > + if (technique && pass < technique->pass_count && !effect->active_pass) > { > - This->active_pass = &technique->passes[pass]; > - > - FIXME("No states applied, yet!\n"); > - > - return D3D_OK; > + effect->active_pass = &technique->passes[pass]; > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > WARN("Invalid argument supplied.\n"); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 6dd3e00..e415a3c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2875,11 +2875,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); > > hr = effect->lpVtbl->BeginPass(effect, 0); > - ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > + ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > @@ -2887,11 +2887,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + ok(value == 2, "Got result %u, expected %u\n", value, 2); > > hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(vshader != NULL, "Got NULL vshader.\n"); > + ok(vshader != NULL, "Got NULL vshader.\n"); > if (vshader) > { > byte_code_size = sizeof(test_effect_states_vshader_buf); > @@ -2921,11 +2921,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + ok(value == 2, "Got result %u, expected %u\n", value, 2); > > hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value,"Got result %u, expected TRUE.\n", value); > + ok(value,"Got result %u, expected TRUE.\n", value); > > hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > @@ -2933,14 +2933,14 @@ static void test_effect_states(IDirect3DDevice9 *device) > > hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - todo_wine ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > + ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > > hr = effect->lpVtbl->End(effect); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > > hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > - ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + todo_wine ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > -- > 2.5.0

1 0

Re: [PATCH 2/3 try2] user32: Added more dialog owner tests.
by Marvin 02 Mar '16

02 Mar '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=21102 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [5/5] imm32: Destroy default IME window when all other windows are destroyed in the thread.
by Marvin 02 Mar '16

02 Mar '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=21100 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040196 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000C0108

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