September 2016 - Wine-Devel

Re: [3/3] imm32,user32: Create and destroy the default IME window implicitly. (try 9; resend)
by Sebastian Lackner Sept. 2, 2016

Sept. 2, 2016

On 23.08.2016 15:13, Akihiro Sagawa wrote: > > Try 9: > - Withdraw try 8 changes as we have ImmDisableIME now. > - Rebased and resolve conflicts against ImmDisableIME patch. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 99 +++++++++++++++++++++++++++++++++++----------- > dlls/imm32/imm32.spec | 1 + > dlls/imm32/tests/imm32.c | 12 +++--- > dlls/user32/misc.c | 4 +- > dlls/user32/user_private.h | 1 + > dlls/user32/win.c | 26 ++++++++++++ > dlls/user32/win.h | 1 + > 7 files changed, 113 insertions(+), 31 deletions(-) This patch broke various user32 tests in virtual desktop mode, for example: $ (cd dlls/user32/tests/; make broadcast.ok) ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so broadcast && touch broadcast.ok broadcast.c:174: Test failed: Asynchronous message sent instead broadcast.c:152: Test failed: Returned: 0 broadcast.c:153: Test failed: Asynchronous message sent instead broadcast.c:174: Test failed: Asynchronous message sent instead broadcast.c:238: Test failed: Returned: 0 broadcast.c:239: Test failed: Asynchronous message sent instead broadcast.c:257: Test failed: Asynchronous message sent instead broadcast.c:238: Test failed: Returned: 0 broadcast.c:239: Test failed: Asynchronous message sent instead broadcast.c:257: Test failed: Asynchronous message sent instead broadcast.c:298: Test failed: Returned: 0 error 1460 broadcast.c:299: Test failed: Asynchronous message sent instead broadcast.c:309: Test failed: Returned: 0 error 1460 broadcast.c:310: Test failed: Asynchronous message sent instead broadcast.c:320: Test failed: Returned: 0 error 1460 broadcast.c:321: Test failed: Asynchronous message sent instead broadcast.c:332: Test failed: Asynchronous message sent instead make: *** [Makefile:197: broadcast.ok] Fehler 17 Could you please take a look?

2 4

Re: [PATCH 2/2] ole32/tests: Update tests to the new channel hook info structure.
by Huw Davies Sept. 2, 2016

Sept. 2, 2016

On 2 Sep 2016, at 11:32, Huw Davies <huw(a)codeweavers.com> wrote: > > Also add tests for method number and causality. Please ignore this, I’ve sent a better version that doesn’t trace() garbage when the new structs are in use. Huw.

1 0

Re: [PATCH] winejoystick.drv: Fix long time consuming task of looking for joysticks
by Sebastian Lackner Sept. 1, 2016

Sept. 1, 2016

On 01.09.2016 05:18, Bruno Jesus wrote: > + joysticks = scandir(p, &files, filter_js, sort_js); Usually malloc-like allocations should be avoided in the Wine source. I am not sure if Alexandre is willing to make an exception in this case because its only a very small amount of memory - nevertheless, replacing with a different directory enumeration mechanism should also not be too difficult. Regards, Sebastian

2 1

Re: user32/tests: Mark a test failure with todo_wine.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > I am getting very consistently test failures here: > > clipboard.c:199: Test failed: 0002: seqno unchanged > clipboard.c:199: Test failed: 0082: seqno unchanged > > Also, currently the clipboard tests trigger all kind of other race-conditions > and bugs in winex11. Are you already aware of those issues, Alexandre? Yes, the stricter tests reveal all sorts of issues with the X11 implementation. I'll get to that once the user32 side works correctly. I don't get the above failure though (not that it means much, sequence number support is also fairly broken). -- Alexandre Julliard julliard(a)winehq.org

1 0

Maximum OpenGL version
by Fabian Maurer Sept. 1, 2016

Sept. 1, 2016

Currently looking at the directx11 implementation, and I noticed I first need to set a "MaxVersionGL" in the registry to enable creation of 4.3 context and so DX11 support. What's the reason behind this? The change is from a1e718ccabc7c330dd16c7face78022965b03e20 (wined3d: Add a setting for the maximum OpenGL version to use). Why do we need to set the maximum version instead of just using the highest context we can get (and still use) ? Fabian Maurer

3 6

Re: [PATCH 3/3] ddraw/tests: Port test_transform_vertices to ddraw2 and ddraw4.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25522 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2391: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw2) === ddraw2.c:2391: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw4) === ddraw4.c:2546: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw4) === ddraw4.c:2546: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 2/3] ddraw/tests: Test matrices in TransformVertices.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25521 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 1/3] ddraw/tests: Make the vec parameter of compare_vec4 const.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25520 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2542: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw4) === ddraw4.c:2542: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw7) === ddraw7.c:2272: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2272: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: Add a simple 3D APIs demo
by Matteo Bruni Sept. 1, 2016

Sept. 1, 2016

2016-08-19 21:41 GMT+02:00 Ruslan Kabatsayev <b7.10110111(a)gmail.com>: > This adds a 3d-demo wine application. It will allow users to check that their > system can handle at least basic WGL, D3D8 and D3D9 before they need to look > deeper into their problem. > > Signed-off-by: Ruslan Kabatsayev <b7.10110111(a)gmail.com> > --- > configure | 26 +- > configure.ac | 1 + > programs/3d-demo/Makefile.in | 14 + > programs/3d-demo/common.c | 107 ++++++ > programs/3d-demo/common.h | 36 ++ > programs/3d-demo/d3d.c | 605 ++++++++++++++++++++++++++++++++ > programs/3d-demo/d3d8.c | 2 + > programs/3d-demo/d3d9.c | 2 + > programs/3d-demo/demo.rc | 61 ++++ > programs/3d-demo/main.c | 175 +++++++++ > programs/3d-demo/resource.h | 33 ++ > programs/3d-demo/wgl.c | 473 +++++++++++++++++++++++++ > programs/3d-demo/winehq_logo_glass.png | Bin 0 -> 31512 bytes > 13 files changed, 1517 insertions(+), 18 deletions(-) > create mode 100644 programs/3d-demo/Makefile.in > create mode 100644 programs/3d-demo/common.c > create mode 100644 programs/3d-demo/common.h > create mode 100644 programs/3d-demo/d3d.c > create mode 100644 programs/3d-demo/d3d8.c > create mode 100644 programs/3d-demo/d3d9.c > create mode 100644 programs/3d-demo/demo.rc > create mode 100644 programs/3d-demo/main.c > create mode 100644 programs/3d-demo/resource.h > create mode 100644 programs/3d-demo/wgl.c > create mode 100644 programs/3d-demo/winehq_logo_glass.png I have a few pretty generic suggestions. You don't need to include configure changes in the patch, they will be regenerated by Alexandre anyway since those depend on the version of the autotools. Did you look into adding those tests to dxdiag instead of as a separate program? I don't think a separate program is necessarily bad but if integrating into dxdiag is reasonable it's probably better to do that from the start. Avoid camelCase or similar mixed-case identifier styles, just use lowercase_with_underscores. For pointer declarations you want to stick the '*' to the variable, not the type. Also please avoid LPTYPES, just use explicit pointer types. C++ comments (// comment) aren't allowed in Wine sources. Please replace them with normal C comments (/* comment */), or drop them entirely if they don't add anything that isn't clear from just looking at the code. It would be better to use explicit float constants when assigning to float variables (e.g. D3DMATERIAL). There aren't many other general style rules in Wine (it's mostly about using the style already used in the component so for new components you're mostly free to pick your own) as long as there is consistency. I see you mixing space after ',' with no space, pick one (preferably the space variant IMO) and stick to it. We usually use parentheses with the "sizeof" operator in Wine sources, so while it's not strictly required it would probably be nice to follow the general trend. More specific comments: I'd split this over multiple patches. You can probably make an initial patch adding the program with no real functionality, then multiple patches adding the various graphical API demos. In that regard, the d3d8 / d3d9 "merged" handling via macros seems a bit obfuscating to me. Just replicating the code twice seems cleaner. Maybe you can create a few helper functions for the common code. BTW, you can probably make things a bit more structured by moving the main loop to common code and have it call API backend functions. You'd have for each backend a structure like: static const struct render_backend d3d9_backend { d3d9_list_modes, d3d9_init, d3d9_draw, d3d9_wndproc, d3d9_destroy, }; (just an idea WRT the actual functions, I haven't really looked in detail) and you'd pass the structure from the selected API to the "main loop" function. I don't think you're using GLU anymore (good) so you should drop the glu32 import. I haven't looked in detail at the actual demos / renderers but I think there is enough stuff to work on already :)

4 6

Re: [v2] Add a GUI for dxdiag program
by Matteo Bruni Sept. 1, 2016

Sept. 1, 2016

2016-08-27 10:26 GMT+02:00 Ruslan Kabatsayev <b7.10110111(a)gmail.com>: > This adds a dialog with only System tab, reflecting what save-to-file > functionality currently provides. It can also save the report as file > from the GUI in a way similar to its Windows counterpart. > This version now also shows DMI information which current dxdiagn.dll doesn't > provide, but may do so in the future. Also some spacing issues are fixed. > > Signed-off-by: Ruslan Kabatsayev <b7.10110111(a)gmail.com> > --- > programs/dxdiag/Makefile.in | 3 +- > programs/dxdiag/dxdiag.rc | 64 +++++++++++ > programs/dxdiag/dxdiag_private.h | 9 +- > programs/dxdiag/main.c | 20 ++-- > programs/dxdiag/main_dialog.c | 220 ++++++++++++++++++++++++++++++++++++++ > programs/dxdiag/resource.h | 56 ++++++++++ > 6 files changed, 356 insertions(+), 16 deletions(-) > create mode 100644 programs/dxdiag/main_dialog.c > create mode 100644 programs/dxdiag/resource.h Hi Ruslan, first of all, I think this patch should be splitted. For example, you could split the "save all information" button functionality, together with the common dialog include and dll linkage, to a separate patch. Aside from that, I have some additional comments. I'm not exactly a Win32 GUI expert so I might certainly have missed something significant. Anyway... > diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in > index 437cc5e..d971a55 100644 > --- a/programs/dxdiag/Makefile.in > +++ b/programs/dxdiag/Makefile.in > @@ -1,10 +1,11 @@ > MODULE = dxdiag.exe > APPMODE = -mwindows -municode > -IMPORTS = dxguid ole32 oleaut32 user32 > +IMPORTS = dxguid ole32 oleaut32 user32 comdlg32 Keep it sorted alphabetically. > > C_SRCS = \ > information.c \ > main.c \ > + main_dialog.c \ > output.c Formatting. > +IDD_SYSTEM_TAB DIALOG 0, 0, 387, 176 > +STYLE DS_SETFONT | WS_CHILDWINDOW > +FONT 8, "Ms Shell Dlg" > +{ > + GROUPBOX "System Information", IDC_SYSINFO_GROUP, 3, 65, 381, 136, 0, WS_EX_LEFT > + LTEXT "If you know what area is causing the problem, click the appropriate tab above. Otherwise, you can use the ""Next Page"" button below to visit each page in sequence.", IDC_SYSTEMTAB_LABEL1, 9, 37, 344, 17, SS_LEFT, WS_EX_LEFT > + LTEXT "This tool reports information about the DirectX components and drivers installed on your system. It lets you test functionality and diagnose problems.", IDC_SYSTEMTAB_LABEL2, 9, 11, 370, 17, SS_LEFT, WS_EX_LEFT This text seems way too similar to the text in the original application. I'm not sure it adds much, maybe just dropping it entirely is fine? > + RTEXT "Current Date/Time:", IDC_SYSTEMTAB_DATETIME_LABEL, 10, 74, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_DATETIME_VALUE, 153, 74, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Computer name:", IDC_SYSTEMTAB_PCNAME_LABEL, 10, 84, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_PCNAME_VALUE, 153, 84, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Operating System:", IDC_SYSTEMTAB_OS_LABEL, 10, 94, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_OS_VALUE, 153, 94, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Language:", IDC_SYSTEMTAB_LANG_LABEL, 10, 104, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_LANG_VALUE, 153, 104, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "System Manufacturer:", IDC_SYSTEMTAB_VENDOR_LABEL, 10, 114, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_VENDOR_VALUE, 153, 114, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "System Model:", IDC_SYSTEMTAB_MODEL_LABEL, 10, 124, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_MODEL_VALUE, 153, 124, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "BIOS:", IDC_SYSTEMTAB_BIOS_LABEL, 10, 134, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_BIOS_VALUE, 153, 134, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Processor:", IDC_SYSTEMTAB_CPU_LABEL, 10, 144, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_CPU_VALUE, 153, 144, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Memory:", IDC_SYSTEMTAB_RAM_LABEL, 10, 154, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_RAM_VALUE, 153, 154, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "Page File:", IDC_SYSTEMTAB_PAGEFILE_LABEL, 10, 164, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_PAGEFILE_VALUE, 153, 164, 227, 9, SS_LEFT, WS_EX_LEFT > + > + RTEXT "DirectX Version:", IDC_SYSTEMTAB_DXVERSION_LABEL, 10, 174, 140, 9, SS_RIGHT, WS_EX_LEFT > + LTEXT "", IDC_SYSTEMTAB_DXVERSION_VALUE, 153, 174, 227, 9, SS_LEFT, WS_EX_LEFT > + > + AUTOCHECKBOX "Check for WHQL digital signatures", IDC_WHQL_CHECKBOX, 10, 186, 369, 9, 0, WS_EX_LEFT > } Similarly here. Not sure about these, I'd drop the unused entries though. > - WINE_FIXME("Information dialog is not implemented\n"); > + DialogBoxW(hInst,(WCHAR*)MAKEINTRESOURCE(IDD_MAIN),NULL,main_dlg_proc); Space after the commas. Also you don't need to cast, just use MAKEINTRESOURCEW() (see for example notepad/dialog.c). > +extern HINSTANCE hInstance; Please avoid camelcase or hungarian notation. > +extern struct dxdiag_information * dxdiag_info; The '*' should be next to the variable name, as in the preexisting dxdiag sources. > +void set_main_dialog_tab(int new_tab_index) > +{ > + RECT tab_rect; > + POINT top_left, bottom_right; > + const HWND new_tab = main_dialog_tabs[new_tab_index]; > + int tab = 0; > + for(;tab<MAIN_DIALOG_TAB_COUNT;++tab) > + ShowWindow(main_dialog_tabs[tab], SW_HIDE); Please leave a blank line between variable declarations and code. Stick to consistently having a whitespace between the '<' and its operands and after the ';'. Also, but this is probably just my preference, I'd initialize tab to 0 in the "for" instead. > +void main_dialog_insert_tab(int index, int caption_id, int template_id, DLGPROC dlg_proc) > +{ > + WCHAR tab_caption[MAX_STRING_LEN]; > + const TCITEMW tab_item = {.pszText = tab_caption, .mask = TCIF_TEXT}; Designated initializers aren't allowed in C89. > + LoadStringW(hInstance, caption_id, tab_caption, sizeof tab_caption/sizeof tab_caption[0]); Parentheses around the sizeof operand. > +void populate_system_tab(void) > +{ > + const HWND page = main_dialog_tabs[SYSTEM_TAB_INDEX]; > + const struct system_information zeros = {0}; > + const struct system_information*const si = dxdiag_info ? &dxdiag_info->system_info : &zeros; Spaces. > +void save_info_dialog(HWND parent) > +{ > + static const WCHAR filter[] = {'T','e','x','t',' ','f','i','l','e',' ','(','*','.','t','x','t',')',0, '*','.','t','x','t',0, > + 'X','M','L',' ','f','i','l','e',' ','(','*','.','x','m','l',')',0, '*','.','x','m','l',0,0}; > + OPENFILENAMEW ofn = {0}; > + WCHAR filename[MAX_PATH]; > + filename[0] = 0; You can initialize filename right in the definition, like: WCHAR filename[MAX_PATH] = {0}; Actually, do you need to initialize it at all? > + ofn.lStructSize = sizeof ofn; > + ofn.hwndOwner = parent; > + ofn.lpstrFilter = filter; > + ofn.lpstrFile = filename; > + ofn.nMaxFile = MAX_PATH; > + ofn.Flags = OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT; Spaces. > +void update_dxdiag_info(void) > +{ > + const HWND checkbox = GetDlgItem(main_dialog, IDC_WHQL_CHECKBOX); > + const HWND save_all_button = GetDlgItem(main_dialog, IDC_SAVE_INFO); > + const BOOL check_whql = SendMessageW(checkbox, BM_GETCHECK, 0L, 0L) == BST_CHECKED; > + free_dxdiag_information(dxdiag_info); > + dxdiag_info = collect_dxdiag_information(check_whql); > + /* update the dialog before showing error message */ > + populate_tabs(); > + if(!dxdiag_info) Nitpick, space after "if". > +INT_PTR CALLBACK system_tab_proc(HWND hsystab, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + switch(msg) > + { > + case WM_COMMAND: > + switch(HIWORD(wparam)) > + { > + case BN_CLICKED: > + switch(wparam) > + { > + case IDC_WHQL_CHECKBOX: > + { > + update_dxdiag_info(); > + return TRUE; > + } > + } This looks pretty ugly. You don't need a separate block inside the case so you can just drop the inner braces. Actually I don't think you're ever going to have other buttons in the system tab so the switch seems unnecessary.

2 3

Re: Bruno Jesus : xinput1_3: Stub XInputGetStateEx.
by Huw Davies Sept. 1, 2016

Sept. 1, 2016

On 1 Sep 2016, at 15:55, Alexandre Julliard <julliard(a)winehq.org> wrote: > Module: wine > Branch: master > Commit: 0fe758046ddc0f37944b8a3e075b8a5fdc5d81a4 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe758046ddc0f37944b8a3e0… > > Author: Bruno Jesus <00cpxxx(a)gmail.com> > Date: Wed Aug 31 15:17:44 2016 -0300 > > xinput1_3: Stub XInputGetStateEx. > > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > + if (pXInputGetStateEx_Ordinal) > + ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n"); > + else > + ok (broken(1), "XInputGetStateEx not found in this dll version\n”) Hi Bruno, This is causing test failures: https://testbot.winehq.org/JobDetails.pl?Key=25476 https://test.winehq.org/data/tests/xinput1_3:xinput.html Could you take a look? Thanks, Huw.

2 1

Experimental gcc optimization for 64-bit wine
by Daniel Santos Sept. 1, 2016

Sept. 1, 2016

Over the last two weeks I've been working on an experimental gcc optimization for wine that out-of-lines the expensive prologues & epilogues required for an ms x64 abi function to call a 64-bit sysv function. The theory is that the added expense of each function executing a few extra instructions to facilitate this will be offset by the reduction in instruction cache misses. As far as I can tell, gcc's ix86 back end has never supported any type of out-of-line pro/epilogue stubs, so adding this support has been somewhat tedious as it tends to get broken by subsequent optimization passes. It currently works in many cases, but in other cases produces bad code so this is a work in progress. None the less, I thought it was interesting enough to post the current results in terms of .text size reduction. On gcc 5.4.0 (with the 8-byte aligned stack assumption flaw corrected), the total .text size of all dlls on my build was 45.2MiB while the out-of-lined build was 35.9MiB, a reduction of 20.5%, so it looks promising so far. I presume it will be a little while before all of the flaws are worked out so that it always produces good code, but once there I can start to produce some real performance numbers. It's probably also worth mentioning that the ideal long-term solution is to find ways eliminate the register save/restores through various means-- static analysis, better evaluation of branch costs, and other optimizations in Wine its self. For example, there are many WINAPI functions who's only sysv call is to wine_dbg_log() via a TRACE(). Just marking this function as __attribute__((__cold__)) should reduce the number of unneeded register save/restores in the function's main path by a great amount. (I haven't actually tested it yet.) Daniel

2 3

Re: wintrust/tests: Fix test for pfnAddSgnr2Chain.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25506 Your paranoid android. === w864 (32 bit softpub) === softpub: unhandled exception c0000005 at 77723ED2 === w1064 (32 bit softpub) === softpub: unhandled exception c0000005 at 768AC81B === w864 (64 bit softpub) === softpub: unhandled exception c0000005 at 00007FFB7AFF266C === w1064 (64 bit softpub) === softpub.c:254: Test failed: Expected S_OK, got 00000001 softpub.c:257: Test failed: Expected S_OK, got 00000001 softpub: unhandled exception c0000005 at 00007FFC77A79A5D

1 0

Re: rpcrt4/tests: Remove an unnecessary and confusing message.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25500 Your paranoid android. === w864 (32 bit rpc) === rpc.c:812: Test failed: GUID does not appear to contain a MAC address: {f03f0f60-7046-11e6-be78-e71666c2e04a} === w864 (64 bit rpc) === rpc.c:812: Test failed: GUID does not appear to contain a MAC address: {ab19995e-7047-11e6-be78-e71666c2e04a}

1 0

Re: [PATCH] msctf/tests: Return interface pointers instead of pointers to impl structure
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25492 Your paranoid android. === w864 (64 bit inputprocessor) === inputprocessor.c:831: Test failed: Deactivation came unexpectedly

2 1

Re: [PATCH 5/5] ddraw/tests: Extend TransformVertices invalid data tests.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25491 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: ntoskrnl.exe: Stub IoInvalidateDeviceRelations.
by Aric Stewart Sept. 1, 2016

Sept. 1, 2016

On 9/1/16 2:28 AM, Sebastian Lackner wrote: > From: Aric Stewart <aric(a)codeweavers.com> > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > After we have reduced the size of the implementation a lot, it feels a bit > unnecessary to add a separate pnp_manager.c file. > > @ Aric: Are you fine with this change, or do you have significantly more > PnP work after those initial four patches? > I am find with it being in ntoskrnl.c if that is the decision as to what is best. It does affect the rest of the patch set so if this is where Alexandre agree it should go then that would be useful to get committed so that I can rebase the rest. Also one of my earlier patches (125976) has an implementation of get_device_id in ntoskrnl.c which of course can be replace by the version in this set of patches. -aric > For patch 2 I have some more feedback which I will reply separately. > > dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- > include/ddk/wdm.h | 1 + > 3 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index a2cbb74..507ffdd 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -4,6 +4,7 @@ > * Copyright (C) 2007 Alexandre Julliard > * Copyright (C) 2010 Damjan Jovanovic > * Copyright (C) 2016 Sebastian Lackner > + * Copyright (C) 2016 CodeWeavers, Aric Stewart > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -2788,3 +2789,12 @@ done: > CloseServiceHandle( service_handle ); > return status; > } > + > + > +/*********************************************************************** > + * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) > + */ > +void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) > +{ > + FIXME( "(%p, %i): stub\n", device_object, type ); > +} > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 5408e91..1c4d08f 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -400,7 +400,7 @@ > @ stdcall IoInitializeIrp(ptr long long) > @ stdcall IoInitializeRemoveLockEx(ptr long long long long) > @ stdcall IoInitializeTimer(ptr ptr ptr) > -@ stub IoInvalidateDeviceRelations > +@ stdcall IoInvalidateDeviceRelations(ptr long) > @ stub IoInvalidateDeviceState > @ stub IoIsFileOriginRemote > @ stub IoIsOperationSynchronous > diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h > index 68694af..0024968 100644 > --- a/include/ddk/wdm.h > +++ b/include/ddk/wdm.h > @@ -1234,6 +1234,7 @@ PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); > PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); > void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); > VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); > +void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); > NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); > > PKTHREAD WINAPI KeGetCurrentThread(void); >

1 0

Re: [PATCH 3/5] ddraw: Fix offscreen flag handling in TransformVertices.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25490 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). The test timed out

1 0

Re: [PATCH 2/5] ddraw: Copy extra vertex data in viewport::TransformVertices.
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25489 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 1/5] ddraw/tests: Move IDirect3DViewport::TransformVertices tests to ddraw1.c (v2).
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25488 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2051: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2235: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2382: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2051: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2051: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2235: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2382: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2382: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2240: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 3/4] xinput1_3: Stub XInputGetStateEx
by Marvin Sept. 1, 2016

Sept. 1, 2016

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=25476 Your paranoid android. === wxppro (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w2003std (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === wvistau64 (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w8 (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w864 (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w1064 (32 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === wvistau64 (64 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w864 (64 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal === w1064 (64 bit xinput) === xinput.c:242: Test failed: XInputGetStateEx in the wrong ordinal

1 0

Re: [PATCH v2 2/4] ntoskrnl.exe: Implement loading plug and play devices
by Sebastian Lackner Sept. 1, 2016

Sept. 1, 2016

On 31.08.2016 18:38, Aric Stewart wrote: > v2: No longer maintaining a device store > Suggestions from Sebastian Lackner > > We are not handling installing drivers just yet, so we just make use > of the critical device store. These are drivers that, on Windows, are > automatically loaded on boot every time. This database is maintained > in [CurrentControlSet/Control/CriticalDeviceDatabase] The keys in this > registry key represent a HardwareID that match a device. We query the > IDs from the bus device’s BusQueryHardwareIDs and if we find a match > (from most specific to most general) we look at that registry key. The > CriticalDeviceDatabase entry specify a [Service] value representing > the driver. > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/pnp_manager.c | 196 +++++++++++++++++++++++++++++++++++++++- > include/ddk/wdm.h | 3 +- > 2 files changed, 197 insertions(+), 2 deletions(-) > > > > v2-0002-ntoskrnl.exe-Implement-loading-plug-and-play-device.txt > > > diff --git a/dlls/ntoskrnl.exe/pnp_manager.c b/dlls/ntoskrnl.exe/pnp_manager.c > index 7ebd07d..04b218b 100644 > --- a/dlls/ntoskrnl.exe/pnp_manager.c > +++ b/dlls/ntoskrnl.exe/pnp_manager.c > @@ -17,6 +17,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#define NONAMELESSUNION > #include <stdarg.h> > #include "ntstatus.h" > #define WIN32_NO_STATUS > @@ -24,14 +25,207 @@ > #include "winbase.h" > #include "winternl.h" > #include "ddk/wdm.h" > +#include "wine/unicode.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > +#define MAX_SERVICE_NAME 260 > + > +static NTSTATUS WINAPI internal_complete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) > +{ > + SetEvent(irp->UserEvent); > + return STATUS_MORE_PROCESSING_REQUIRED; > +} > + > +static NTSTATUS send_device_irp(DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info) > +{ > + NTSTATUS status; > + IO_STACK_LOCATION *irpsp; > + HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); > + > + irp->UserEvent = event; > + irpsp = IoGetNextIrpStackLocation(irp); > + irpsp->CompletionRoutine = internal_complete; > + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; > + > + IoCallDriver(device, irp); > + > + if (irp->IoStatus.u.Status == STATUS_PENDING) > + WaitForSingleObject(event, INFINITE); > + > + status = irp->IoStatus.u.Status; > + if (info) > + *info = irp->IoStatus.Information; > + IoCompleteRequest(irp, IO_NO_INCREMENT); > + CloseHandle(event); > + return status; > +} > + > +static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id) > +{ > + IO_STACK_LOCATION *irpsp; > + IO_STATUS_BLOCK irp_status; > + IRP *irp; > + > + irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); > + if (irp == NULL) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation(irp); > + irpsp->MinorFunction = IRP_MN_QUERY_ID; > + irpsp->Parameters.QueryId.IdType = type; > + return send_device_irp(device, irp, (ULONG_PTR*)id); > +} > + > +static NTSTATUS find_driver_for_id(const WCHAR *id, WCHAR *driver) > +{ > + NTSTATUS rc; > + static const WCHAR critical_fmtW[] = > + {'\\','R','e','g','i','s','t','r','y', > + '\\','M','a','c','h','i','n','e', > + '\\','S','y','s','t','e','m', > + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', > + '\\','C','o','n','t','r','o','l', > + '\\','C','r','i','t','i','c','a','l','D','e','v','i','c','e','D','a','t','a','b','a','s','e', > + '\\','%','s',0}; > + > + HANDLE hkey; > + WCHAR *regW; > + UNICODE_STRING key; > + OBJECT_ATTRIBUTES attr; > + > + regW = HeapAlloc(GetProcessHeap(), 0, sizeof(critical_fmtW) + strlenW(id) * sizeof(WCHAR)); > + sprintfW(regW, critical_fmtW, id); > + RtlInitUnicodeString(&key, regW); > + > + InitializeObjectAttributes(&attr, &key, OBJ_CASE_INSENSITIVE, NULL, NULL); > + rc = ZwOpenKey(&hkey, KEY_ALL_ACCESS, &attr); > + if (rc == STATUS_SUCCESS) > + { > + static const WCHAR serviceW[] = {'S','e','r','v','i','c','e',0}; > + static const UNICODE_STRING serviceStr = {sizeof(serviceW) - sizeof(WCHAR), sizeof(serviceW), (WCHAR*)serviceW}; > + KEY_VALUE_PARTIAL_INFORMATION *info; > + DWORD total_size = sizeof(*info) + MAX_SERVICE_NAME * sizeof(WCHAR); > + > + info = HeapAlloc(GetProcessHeap(), 0, total_size); > + > + rc = ZwQueryValueKey(hkey, &serviceStr, KeyValuePartialInformation, info, total_size, &total_size); > + if (rc == STATUS_SUCCESS && info->Type == REG_SZ && info->DataLength < MAX_SERVICE_NAME * sizeof(WCHAR)) > + { > + WCHAR *service = (WCHAR*)info->Data; > + TRACE("Got service %s\n",debugstr_w(service)); > + strcpyW(driver, service); > + } > + else > + { > + if (info->Type != REG_SZ) > + ERR("Failed to get Service from registry entry, Bad type\n"); > + else if (info->DataLength >= MAX_SERVICE_NAME * sizeof(WCHAR)) > + ERR("Failed to get Service from registry entry, Buffer too small\n"); > + else > + ERR("Failed to get Service from registry entry (%x)\n",rc); I don't think it makes sense to trace this an error, especially when you use a TRACE for the lack of a critical device database key. > + } > + HeapFree(GetProcessHeap(), 0, info); > + ZwClose(hkey); > + } > + else > + TRACE("Failed to find Critical Device Database entry for %s\n",debugstr_w(id)); > + HeapFree(GetProcessHeap(), 0, regW); > + return rc; > +} > + > +static void handle_bus_relations(DEVICE_OBJECT *device) > +{ > + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > + static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', > + '\\','M','a','c','h','i','n','e', > + '\\','S','y','s','t','e','m', > + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', > + '\\','S','e','r','v','i','c','e','s', > + '\\',0}; > + > + NTSTATUS status; > + WCHAR *id, *idptr; > + WCHAR driver[MAX_SERVICE_NAME] = {0}; > + WCHAR fullname[MAX_PATH]; > + DRIVER_OBJECT *driver_obj; > + UNICODE_STRING driverName; > + WCHAR driverKey[MAX_PATH]; > + UNICODE_STRING driverPath; You'll have to allocate bigger buffers for the concatenated strings. In fact, a single buffer should be sufficient for both the fullname and the driver key. > + > + TRACE("Device %p\n", device); > + > + /* We could(should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, > + * but we dont have to, We have the DEVICE_OBJECT of the new device > + * so we can simply handle the process here */ > + > + status = get_device_id(device, BusQueryCompatibleIDs, &id); > + if (status != ERROR_SUCCESS || !id) > + { > + ERR("Failed to get device IDs\n"); > + return; > + } > + > + idptr = id; > + while(*idptr != 0) > + { > + TRACE("Checking for id %s\n",debugstr_w(idptr)); > + if (find_driver_for_id(idptr, driver) == STATUS_SUCCESS) > + break; > + idptr += (strlenW(idptr) + 1); > + } > + HeapFree(GetProcessHeap(), 0, id); > + > + if (!driver[0]) > + { > + ERR("No matching driver found for device\n"); > + return; > + } > + > + strcpyW(driverKey, servicesW); > + strcatW(driverKey, driver); > + RtlInitUnicodeString(&driverPath, driverKey); > + if (ZwLoadDriver(&driverPath) != STATUS_SUCCESS) > + { > + ERR("Failed to load driver %s\n", debugstr_w(driver)); > + return; > + } > + > + strcpyW(fullname, driverW); > + strcatW(fullname, driver); > + RtlInitUnicodeString(&driverName, fullname); > + if (ObReferenceObjectByName(&driverName, OBJ_CASE_INSENSITIVE, NULL, > + 0, NULL, KernelMode, NULL, (void**)&driver_obj) != STATUS_SUCCESS) > + { > + ERR("Failed to locate loaded driver %s\n", debugstr_w(driver)); > + return; > + } > + > + if (!driver_obj->DriverExtension->AddDevice) > + status = STATUS_NOT_IMPLEMENTED; > + else > + status = driver_obj->DriverExtension->AddDevice(driver_obj, device); > + > + ObDereferenceObject(driver_obj); > + > + if (status != STATUS_SUCCESS) > + ERR("AddDevice failed for driver %s\n", debugstr_w(driver)); > +} > + > /*********************************************************************** > * IoInvalidateDeviceRelations(NTOSKRNL.EXE.@) > */ > void WINAPI IoInvalidateDeviceRelations(DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type) > { > - FIXME("(%p, %i): stub\n", device_object, type); > + TRACE("(%p, %i)\n", device_object, type); > + > + switch (type) > + { > + case BusRelations: > + handle_bus_relations(device_object); > + break; > + default: > + FIXME("Unhandled Relation %i\n", type); > + } > } > diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h > index bd3b323..e893ba2 100644 > --- a/include/ddk/wdm.h > +++ b/include/ddk/wdm.h > @@ -48,6 +48,7 @@ typedef NTSTATUS (WINAPI *PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT *, PUNICODE_ > typedef NTSTATUS (WINAPI *PDRIVER_DISPATCH)(struct _DEVICE_OBJECT *, struct _IRP *); > typedef void (WINAPI *PDRIVER_STARTIO)(struct _DEVICE_OBJECT *, struct _IRP *); > typedef void (WINAPI *PDRIVER_UNLOAD)(struct _DRIVER_OBJECT *); > +typedef NTSTATUS (WINAPI *PDRIVER_ADD_DEVICE)(struct _DRIVER_OBJECT *, struct _DEVICE_OBJECT *); > > typedef struct _DISPATCHER_HEADER { > UCHAR Type; > @@ -336,7 +337,7 @@ typedef struct _DEVICE_RELATIONS *PDEVICE_RELATIONS; > > typedef struct _DRIVER_EXTENSION { > struct _DRIVER_OBJECT *DriverObject; > - PVOID AddDevice; > + PDRIVER_ADD_DEVICE AddDevice; > ULONG Count; > UNICODE_STRING ServiceKeyName; > } DRIVER_EXTENSION, *PDRIVER_EXTENSION; > > >

1 0