January 2016 - Wine-Devel - list.winehq.org

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

Re: user32: Avoid -Wmisleading-indentation warnings and fix comments in comments in test_AppendMenu.
by Dmitry Timoshkov Aug. 11, 2016

Aug. 11, 2016

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c > index 33d8eb8..ea965cd 100644 > --- a/dlls/user32/tests/menu.c > +++ b/dlls/user32/tests/menu.c > @@ -3992,13 +3992,15 @@ static void test_AppendMenu(void) > mii.wID = 206; > ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); > ok(ret, "InsertMenuItem failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); > +} > mii.wID = 207; > ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); > ok(ret, "SetMenuItemInfo failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); > +} > DestroyMenu(hmenu); > > hbmp = CreateBitmap(1, 1, 1, 1, NULL); Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO. -- Dmitry.

3 2

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Re: [1/2 resend] user32/tests: Test DDE end to end with Chinese text which has latin characters begin.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Jactry Zeng <jzeng(a)codeweavers.com> writes: > Superseded patch 118355. > > For bug 38888: https://bugs.winehq.org/show_bug.cgi?id=38888 > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/user32/tests/dde.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so dde && touch dde.ok dde.c:2573: Test failed: Expected L"abc?", got L"a", msg_index=29 Makefile:306: recipe for target 'dde.ok' failed -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/3] msvcp110: Add tr2_sys__Symlink implementation and test.
by Piotr Caban Feb. 11, 2016

Feb. 11, 2016

On 01/11/16 14:56, YongHao Hu wrote: > + delete_flag = 1; > + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { > + errno = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); > + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { > + delete_flag = 0; > + tests[i].last_error = ret; > + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); I think it would be nicer if the tests are really skipped in this case. Please detect such case and return from the function instead of adding workarounds in the code for it. Thanks, Piotr

2 3

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump
by André Hentschel Feb. 11, 2016

Feb. 11, 2016

Hi, Sorry for the delay, but I haven't noticed that I got assigned for reviewing. Could you please tell me the name of the application so I can do some testing? Further reviewing inlined below: Am 07.01.2016 um 09:49 schrieb Jianqiu Zhang: > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + return pcap_dump_open(p, fname); > +} This can't work, the wpcap function might be called with fname set to "C:\dump.pcap" and the native function will be confused by that. > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} This should work, but where are pcap_dump_close and friends? > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 0e1e208..d7efd5e 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(str ptr str) wine_pcap_dump Should be (ptr ptr ptr), there are no strings to be displayed

3 9

Running WineTest every day the easy way
by Francois Gouget Feb. 10, 2016

Feb. 10, 2016

So this time I've done things in the right order: first publish the code and then announce it. So here's wt-daily, a script to "orchestrate all the daily WineTest runs and related tasks." Here's the 'quickstart guide': git clone https://github.com/fgouget/wt-daily.git cd wt-daily vi wt-daily.config In this file set the following environment variables: email="your email address here" tag="a-tag" desc="A description of your system for Wine developers" shutdown="suspend" Then when you know you won't be needing your computer for a while, just type ./wt-daily. This will update and rebuild Wine, run the tests and finally suspend your machine. It's that simple! If you'd rather not suspend your machine you can set shutdown to "poweroff", "reboot" or even leave it out to keep the computer on. By default wt-daily will ask for your green light before starting the tests. So you can start it while still using the computer and click 'Ok' once you take off. To have the tests run automatically (e.g. from cron), pass --auto-test on the command line or set default_options="--auto-test" in the configuration file. If you have a 64-bit system then you can also set the {tag,desc}wow32 and {tag,desc}wow64 variables to run the tests in a mixed 32/64-bit WinePrefix. If you have a Mac, set the {tag,desc}mac variables to run the tests using the Mac driver instead of (or in addition to) X11. The script should work on OS/X though I have obviously not tested it in a long time. I'ĺl be happy to get feedback on that, particularly in the form of patches. Now you can totally stop reading here. But there's a ton more that the script can do. Read on if you want to discover more. You can have the script start an application that will prevent the tests from running until you close it. I used that to run the tests on a MythTV client box. Wine would get updated and rebuilt in the background while I was watching TV and once that was done the script would run the tests and finally power off the computer. You can also take an image of a suitably configured Windows partition and have wt-daily restore that image to the partition, reboot to Windows which will automatically run WineTest (you'll find the batch script for that in the repository), then reboot back to Linux (or shutdown the computer). This functionality is used on the cw1-hd6800 and xw2-gtx560 CodeWeavers boxes to run the tests on Linux, then Windows 8.1 and then Windows 10. All automatically. The script actually runs every hour and skips the tests (and rebooting) if nothing changed since the last run. I also have this Windows image thing set up on my fg-acer64 laptop but there I interactively select which Windows image to restore, with a choice of Windows 8, 8.1 and 10 (or nothing if I don't feel like going through a reboot). You can also extend wt-daily to add non Wine tasks. For instance on my laptops it runs another script that synchronizes the Documents folder with my desktop and runs 'git fetch --all' in all my Git repositories. This way the next time I go offline everything is up to date. The repository also contains a number or scripts that you may find useful in your own automation tasks as they support not just Linux but OS/X too. wt-image Creates, checks, restores or reboots to a disk image. wt-bot Update, build and check the Wine source code, and run the tests. wt-make Seeks to automatically fully use CPU and I/O parallelism when running make. wt-ask Asks a simple Yes/No question to the user. wt-notify Displays a notification to the user. wt-power Powers off, reboots, suspends or hibernates the computer. wt-screensaver Controls the screensaver. In particular it can prevent it from triggering. wt-nice Runs the specified command with the lowest possible CPU and I/O priority. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Linux: the choice of a GNU generation

1 1

Re: [PATCH 1/6] d3d11: Implement d3d11_device_CheckMultisampleQualityLevels().
by Henri Verbeet Feb. 3, 2016

Feb. 3, 2016

On 29 January 2016 at 00:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (sample_count > 32) > + return E_FAIL; I think that's D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT. > + if (sample_count > 16) > + { > + FIXME("sample_count %u not handled yet.\n", sample_count); > + return S_OK; > + } I think that belongs in wined3d_check_device_multisample_type(). > + hr = wined3d_device_check_multisample_quality_levels(device->wined3d_device, > + wined3dformat_from_dxgi_format(format), sample_count, quality_level_count); > + if (hr == WINED3DERR_INVALIDCALL) > + return E_INVALIDARG; > + if (hr == WINED3DERR_NOTAVAILABLE) > + return S_OK; This is fine, but the d3d10+ API probably makes more sense in the long run. I.e., eventually we'd want to handle the difference in d3d8/9 instead. > +HRESULT CDECL wined3d_device_check_multisample_quality_levels(const struct wined3d_device *device, > + enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, > + DWORD *quality_level_count) I don't think we really want to introduce a new entry point for this. I guess the issue is that we can't get at the wined3d object that created the device from inside d3d11, but I think it would be preferable to do something about that instead. It seems likely that CheckFeatureSupport() and CheckFormatSupport() would run into this as well.

2 1

Re: comctl32: treeview: Fix crash when deleting the first visible item while bRedraw == false
by Nikolay Sivov Jan. 31, 2016

Jan. 31, 2016

On 01/30/2016 12:11 AM, Joachim Priesner wrote: > When bRedraw == false, TREEVIEW_DeleteItem returned early, leaving > firstVisible == NULL. This led to a crash when bRedraw was set to true > again. > > Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> > --- > dlls/comctl32/tests/treeview.c | 38 ++++++++++++++++++++++++++++++++++++++ > dlls/comctl32/treeview.c | 4 +++- > 2 files changed, 41 insertions(+), 1 deletion(-) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index 92504c1..34d0674 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -1903,6 +1903,43 @@ static void test_delete_items(void) > DestroyWindow(hTree); > } > > +static void test_delete_first_visible_setredraw_false(void) Please append new tests to test_delete_items(), after a comment line describing what's being tested. > +{ > + HWND hTree; > + INT ret; > + TVINSERTSTRUCTA ins; > + HTREEITEM hItem1; > + > + static CHAR item1[] = "Item 1"; > + static CHAR item2[] = "Item 2"; > + > + hTree = create_treeview_control(0); > + > + ins.hParent = TVI_ROOT; > + ins.hInsertAfter = TVI_ROOT; > + U(ins).item.mask = TVIF_TEXT; > + U(ins).item.pszText = item1; > + hItem1 = TreeView_InsertItemA(hTree, &ins); Just to make sure add a test for hItem != NULL. > + > + ins.hParent = TVI_ROOT; > + ins.hInsertAfter = hItem1; > + U(ins).item.mask = TVIF_TEXT; > + U(ins).item.pszText = item2; > + (void*) TreeView_InsertItemA(hTree, &ins); /* return value unused */ > + Same here, it'll also make a value used. > + ret = SendMessageA(hTree, WM_SETREDRAW, 0, 0); > + ok(ret == 0, "got %d\n", ret); > + > + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); > + ok(ret == TRUE, "got %d\n", ret); > + > + /* this used to crash, test that it does not any more */ > + ret = SendMessageA(hTree, WM_SETREDRAW, 1, 0); > + ok(ret == 0, "got %d\n", ret); > + For WM_SETREDRAW wParam please use TRUE/FALSE instead. Otherwise looks good, thanks for fixing this.

1 0

Re: [v2 PATCH 1/3] gdiplus: Implement GdipGetPenTransform
by Nikolay Sivov Jan. 31, 2016

Jan. 31, 2016

On Sunday, 31 January 2016, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com > <javascript:;>> > --- > dlls/gdiplus/gdiplus_private.h | 1 + > dlls/gdiplus/pen.c | 9 ++++----- > dlls/gdiplus/tests/pen.c | 6 +++--- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h > b/dlls/gdiplus/gdiplus_private.h > index 1af0bd0..fd45a49 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -197,6 +197,7 @@ struct GpPen{ > REAL offset; /* dash offset */ > GpBrush *brush; > GpPenAlignment align; > + GpMatrix *transform; > }; Why does it have to be a separate allocation? It looks like GpMatrix field will work fine.

1 0

Re: [PATCH 2/2] mscoree: call native DllEntryPoint when it is defined in COR header.
by Vincent Povirk Jan. 29, 2016

Jan. 29, 2016

You seem to have some weird indentation? We should probably still call DisableThreadLibraryCalls on process attach if there's no native entry point.

1 0

Re: jscript: Fixed tests on some old jscript versions.
by Marvin Jan. 29, 2016

Jan. 29, 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=20096 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/6] d3d11/tests: Add a test for CheckMultisampleQualityLevels.
by Henri Verbeet Jan. 29, 2016

Jan. 29, 2016

On 29 January 2016 at 00:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void test_checkmultisamplequalitylevels(void) The naming here is a bit different from the other tests. :) I guess it was inspired by the equivalent d3d9 test?

1 0

Re: [PATCH 6/6] d3d10core/tests: Test the creation of textures with invalid multisample settings.
by Józef Kucia Jan. 29, 2016

Jan. 29, 2016

On Fri, Jan 29, 2016 at 12:51 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 48 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c > index ae755d3..de3b551 100644 > --- a/dlls/d3d10core/tests/device.c > +++ b/dlls/d3d10core/tests/device.c > @@ -5138,6 +5138,53 @@ done: > ok(!refcount, "Device has %u references left.\n", refcount); > } > > +static void test_invalid_multisample(void) > +{ > + D3D10_TEXTURE2D_DESC desc; > + ID3D10Texture2D *texture; > + UINT quality_level_count; > + ID3D10Device *device; > + ULONG refcount; > + HRESULT hr; > + > + if (!(device = create_device())) > + { > + skip("Failed to create device.\n"); > + return; > + } > + > + ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_level_count); > + desc.Width = 128; > + desc.Height = 128; > + desc.MipLevels = 1; > + desc.ArraySize = 1; > + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; > + desc.SampleDesc.Count = 2; > + desc.SampleDesc.Quality = 0; > + desc.Usage = D3D10_USAGE_DEFAULT; > + desc.BindFlags = D3D10_BIND_RENDER_TARGET; > + desc.CPUAccessFlags = 0; > + desc.MiscFlags = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + if (quality_level_count) > + { > + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); > + ID3D10Texture2D_Release(texture); > + desc.SampleDesc.Quality = quality_level_count; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + } > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + /* We assume 15 samples multisampling is never supported in practice. */ > + desc.SampleDesc.Count = 15; > + desc.SampleDesc.Quality = 0; > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + > + refcount = ID3D10Device_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +} > + > START_TEST(device) > { > test_feature_level(); > @@ -5168,4 +5215,5 @@ START_TEST(device) > test_copy_subresource_region(); > test_multisample_init(); > test_checkmultisamplequalitylevels(); > + test_invalid_multisample(); > } > -- > 2.4.10 > > > This is fine by me but it could be considered to be merged into test_create_texture2d().

2 1

Re: [PATCH 3/5] wined3d: Recognize SM4 dcl_immediateConstantBuffer.
by Henri Verbeet Jan. 29, 2016

Jan. 29, 2016

On 29 January 2016 at 09:44, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) > + { > + struct wined3d_shader_immediate_constant_buffer *icb = ins.declaration.icb; > + if (reg_maps->icb) > + { > + ERR("Multiple immediate constant buffers.\n"); This would need to be a WARN or a FIXME, unless you ensure that it can never happen in the front-end. > + HeapFree(GetProcessHeap(), 0, reg_maps->icb); > + } > + if (!(reg_maps->icb = HeapAlloc(GetProcessHeap(), 0, icb->element_count * sizeof(*icb->data)))) > + { > + ERR("Failed to allocate immediate constant buffer.\n"); > + return E_OUTOFMEMORY; > + } > + memcpy(reg_maps->icb, icb->data, icb->element_count * sizeof(*icb->data)); > + reg_maps->icb_size = icb->element_count / 4; I think it shouldn't be necessary to copy the data, shader->frontend_data should stay alive until the shader is destroyed. > + FIXME("Unexpected size of immediate constant buffer %u.\n", len); "Unexpected immediate constant buffer size %u.\n" sounds more natural to me, but it's not a big deal.

1 0

Re: [PATCH v3] ntoskrnl.exe: Implement IoGetDeviceProperty for DevicePropertyPhysicalDeviceObjectName
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Aric Stewart <aric(a)codeweavers.com> writes: > + case DevicePropertyPhysicalDeviceObjectName: > + { > + ULONG used_len; > + OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, buffer_length + (sizeof(OBJECT_NAME_INFORMATION))); > + > + status = NtQueryObject(device->Reserved, ObjectNameInformation, name, buffer_length + sizeof(OBJECT_NAME_INFORMATION), &used_len); > + if (status == STATUS_SUCCESS) > + { > + memcpy(property_buffer, name->Name.Buffer, name->Name.Length); > + *result_length = name->Name.Length; > + } > + else > + *result_length = 0; Length is still not correct if the buffer is too small, and the string needs to be null-terminated. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32/tests: Add traces to the WaitForInputIdle() hooking process.
by Marvin Jan. 29, 2016

Jan. 29, 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=20058 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2391: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt4CE4.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt4CE4.tmp\test file.sde")]' shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2 shlexec.c:2379: Test failed: failed: rc=29 err=2

3 3

Re: [PATCH 1/3] gdiplus: Implement GdipGetPenTransform
by Nikolay Sivov Jan. 29, 2016

Jan. 29, 2016

On Friday, 29 January 2016, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com > <javascript:;>> > --- > dlls/gdiplus/gdiplus_private.h | 6 ++++++ > dlls/gdiplus/pen.c | 9 ++++----- > dlls/gdiplus/tests/pen.c | 6 +++--- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h > b/dlls/gdiplus/gdiplus_private.h > index 1af0bd0..1ed1e5e 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -71,6 +71,11 @@ static inline BOOL heap_free(void *mem) > return HeapFree(GetProcessHeap(), 0, mem); > } > > +static inline void copy_matrix(GpMatrix *in, GpMatrix *out) > +{ > + memcpy(out, in, 6 * sizeof(REAL)); > +} > + Simple assignment could be used instead of this helper.

1 0

Re: [PATCH 2/6] d3d11: Implement d3d10_device_CheckMultisampleQualityLevels().
by Józef Kucia Jan. 29, 2016

Jan. 29, 2016

On Fri, Jan 29, 2016 at 12:51 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d10core/tests/device.c | 5 ++--- > dlls/d3d11/device.c | 33 +++++++++++++++++++++++++++++++-- > 2 files changed, 33 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c > index 92ae1cf..d267471 100644 > --- a/dlls/d3d10core/tests/device.c > +++ b/dlls/d3d10core/tests/device.c > @@ -5002,7 +5002,7 @@ static void test_multisample_init(void) > } > > hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); > - todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); > + ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); > if (!count) > { > skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); > @@ -5032,7 +5032,6 @@ static void test_multisample_init(void) > hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); > ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > > - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, > (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); > > @@ -5052,7 +5051,7 @@ static void test_multisample_init(void) > break; > } > release_texture_readback(&rb); > - ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); > + todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); > > ID3D10RenderTargetView_Release(rtview); > ID3D10Texture2D_Release(backbuffer); > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 785e537..e7d2521 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -4501,10 +4501,39 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 * > static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface, > DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count) > { > - FIXME("iface %p, format %s, sample_count %u, quality_level_count %p stub!\n", > + struct d3d_device *device = impl_from_ID3D10Device(iface); > + HRESULT hr; > + > + TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n", > iface, debug_dxgi_format(format), sample_count, quality_level_count); > > - return E_NOTIMPL; > + if (!quality_level_count) > + return E_INVALIDARG; > + > + *quality_level_count = 0; > + > + if (!sample_count) > + return E_FAIL; > + if (sample_count == 1) > + { > + *quality_level_count = 1; > + return S_OK; > + } > + if (sample_count > 32) > + return E_FAIL; > + > + if (sample_count > 16) > + { > + FIXME("sample_count %u not handled yet.\n", sample_count); > + return S_OK; > + } > + hr = wined3d_device_check_multisample_quality_levels(device->wined3d_device, > + wined3dformat_from_dxgi_format(format), sample_count, quality_level_count); > + if (hr == WINED3DERR_INVALIDCALL) > + return E_INVALIDARG; > + if (hr == WINED3DERR_NOTAVAILABLE) > + return S_OK; > + return hr; > } I think you could simply call d3d11_device_CheckFormatSupport() from d3d10_device_CheckFormatSupport(). We do it that way for some ID3D10Device methods, e.g. d3d10_device_CreateBlendState1().

1 0

Re: [PATCH] user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences
by Marvin Jan. 29, 2016

Jan. 29, 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=20077 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

2 1

Re: [PATCH 4/7] ddraw/tests: Add tests for invalid render states.
by Henri Verbeet Jan. 29, 2016

Jan. 29, 2016

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > Tested on Windows 7 and 10. > > A similar test crashes in ddraw1. > > I'm also not sure if this test is safe for ddraw7 as it seems to crash > with higher values. Yeah, it probably corrupts memory in ddraw7. What does GetRenderState() do?

2 1

Re: [PATCH 3/3] bcrypt: Added BCRYPT_ALGORITHM_NAME property implementation.
by Hans Leidekker Jan. 29, 2016

Jan. 29, 2016

Hi Jacek, > --- a/dlls/bcrypt/bcrypt_main.c > +++ b/dlls/bcrypt/bcrypt_main.c > @@ -182,11 +182,12 @@ enum alg_id > > struct { > ULONG hash_length; > + WCHAR alg_name[16]; > } alg_props[] = { > - /* ALG_ID_SHA1 */ { 20 }, > - /* ALG_ID_SHA256 */ { 32 }, > - /* ALG_ID_SHA384 */ { 48 }, > - /* ALG_ID_SHA512 */ { 64 } > + /* ALG_ID_SHA1 */ { 20, {'S','H','A','1'} }, > + /* ALG_ID_SHA256 */ { 32, {'S','H','A','2','5','6'} }, > + /* ALG_ID_SHA384 */ { 48, {'S','H','A','3','8','4'} }, > + /* ALG_ID_SHA512 */ { 64, {'S','H','A','5','1','2'} } > }; I would use BCRYPT_SHA1_ALGORITHM, etc here and make alg_props static const.

1 0

Re: [5/6] shell32/tests: Test environment variable inheritance with ShellExecute().
by Marvin Jan. 29, 2016

Jan. 29, 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=20063 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1666: Test failed: WaitForSingleObject returned 258 shlexec.c:1695: Test failed: argvA3 expected 'QuotedLowerL', got 'Open' shlexec.c:1703: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\test file.noassoc.shlexec' shlexec.c:1695: Test failed: argvA3 expected 'QuotedUpperL', got 'QuotedLowerL' shlexec.c:1666: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:1695: Test failed: argvA3 expected 'Open', but key not found or empty shlexec.c:1703: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD4FA.tmp\masked file.shlexec', but key not found or empty === w1064 (32 bit shlexec) === shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2424: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2426: Test failed: failed: rc=29 err=32 shlexec.c:2438: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt9FCE.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt9FCE.tmp\test file.sde")]' shlexec.c:2426: Test failed: failed: rc=29 err=2 shlexec.c:2426: Test failed: failed: rc=29 err=2

2 1

Re: [6/6] shell32/tests: Add server-side DDE checks.
by Marvin Jan. 29, 2016

Jan. 29, 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=20064 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2433: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2435: Test failed: failed: rc=29 err=32 shlexec.c:2447: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt209B.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt209B.tmp\test file.sde")]' shlexec.c:2435: Test failed: failed: rc=29 err=2 shlexec.c:2435: Test failed: failed: rc=29 err=2

1 0

Re: [4/6] shell32/tests: Check for failures in the child process.
by Marvin Jan. 29, 2016

Jan. 29, 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=20062 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32 shlexec.c:2408: Test failed: failed: rc=29 err=2 shlexec.c:2408: Test failed: failed: rc=29 err=32

1 0

Re: [3/6] shell32/tests: Check the child process exit code and close the process handle.
by Marvin Jan. 28, 2016

Jan. 28, 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=20061 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2 shlexec.c:2394: Test failed: failed: rc=29 err=2

1 0

Re: [2/6] shell32/tests: Declare childPrintf() as a printf-style function.
by Marvin Jan. 28, 2016

Jan. 28, 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=20060 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2401: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt8341.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt8341.tmp\test file.sde")]' shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2

1 0

Re: [1/6] shell32/tests: Reorder the functions to avoid forward declarations.
by Marvin Jan. 28, 2016

Jan. 28, 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=20059 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2 shlexec.c:2389: Test failed: failed: rc=29 err=2

1 0

Re: [1/3] scrrun: Implement filesys_DriveExists. (resend)
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Joachim Priesner <joachim.priesner(a)web.de> writes: > - return E_NOTIMPL; > + if (!pfExists) return E_POINTER; > + *pfExists = VARIANT_FALSE; > + len = SysStringLen(DriveSpec); > + if (len >= 1 && DriveSpec[0] >= 'A' && DriveSpec[0] <= 'Z' > + && (len < 2 || DriveSpec[1] == ':') > + && (len < 3 || DriveSpec[2] == '\\')) { Surely lower-case drives should work too. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] shell32: Set the stream and storage attributes where needed.
by Marvin Jan. 28, 2016

Jan. 28, 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=20039 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

2 1

Re: ndis.sys: add NdisAllocateSpinLock stub
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Austin English <austinenglish(a)gmail.com> writes: > From 5450fedec076c6d2f2c10c2e5cfa8f79578803a0 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 5 Jan 2016 17:24:12 -0600 > Subject: [PATCH] ndis.sys: add NdisAllocateSpinLock stub > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/ndis.sys/main.c | 5 +++++ > include/ddk/ndis.h | 7 +++++++ > 2 files changed, 12 insertions(+) You forgot the spec file. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/7] wined3d: Validate stream_idx in wined3d_device_set_stream_source_freq().
by Henri Verbeet Jan. 28, 2016

Jan. 28, 2016

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1412,6 +1412,12 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic > return WINED3DERR_INVALIDCALL; > } > > + if (stream_idx >= MAX_STREAMS) > + { > + FIXME("Stream index %u out of range.\n", stream_idx); > + return WINED3DERR_INVALIDCALL; > + } This would have to be a WARN instead of a FIXME, but in general we don't do this in wined3d unless we have to.

1 0

Re: [PATCH 2/7] d3d9/tests: Add test for invalid render states.
by Henri Verbeet Jan. 28, 2016

Jan. 28, 2016

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > A similar test crashes in d3d8. > --- > dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > This probably just corrupts memory on Windows, if e.g. SetTextureStageState() is any indication.

1 0

Re: [PATCH 1/7] wined3d: Validate render state in wined3d_device_set_render_state().
by Henri Verbeet Jan. 28, 2016

Jan. 28, 2016

On 28 January 2016 at 00:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (state > WINEHIGHEST_RENDER_STATE) > + { > + WARN("Unhandled render state %#x.\n", state); > + return; > + } It may make sense to do this for wined3d_device_get_render_state() as well.

1 0

Re: [PATCH v2] ntoskrnl.exe: Implement IoGetDeviceProperty for DevicePropertyPhysicalDeviceObjectName
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Aric Stewart <aric(a)codeweavers.com> writes: > + switch (device_property) > + { > + case DevicePropertyPhysicalDeviceObjectName: > + { > + OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, buffer_length + (sizeof(OBJECT_NAME_INFORMATION))); > + > + status = NtQueryObject(device->Reserved, ObjectNameInformation, name, buffer_length + sizeof(OBJECT_NAME_INFORMATION), result_length); > + if (status == STATUS_SUCCESS) > + memcpy(property_buffer, name->Name.Buffer, name->Name.Length); > + HeapFree(GetProcessHeap(), 0, name); > + break; result_length is not handled correctly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] d3dx9: Signature isn't part of the DDS header
by Matteo Bruni Jan. 28, 2016

Jan. 28, 2016

2016-01-27 10:29 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/surface.c | 78 ++++++++++++++++++++++++++----------------------- > 1 file changed, 41 insertions(+), 37 deletions(-) > > diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c > index 4fa2a76..a7bf9b7 100644 > --- a/dlls/d3dx9_36/surface.c > +++ b/dlls/d3dx9_36/surface.c > @@ -125,7 +125,6 @@ struct dds_pixel_format > > struct dds_header > { > - DWORD signature; > DWORD size; > DWORD flags; > DWORD height; > @@ -142,6 +141,12 @@ struct dds_header > DWORD reserved2; > }; > > +struct DDS Probably better to pick a lowercase struct name. > +{ > + DWORD signature; > + struct dds_header header; > +}; > + > static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) > { > unsigned int i; > @@ -355,7 +360,7 @@ static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, U > } > > file_size *= faces; > - file_size += sizeof(struct dds_header); > + file_size += sizeof(struct DDS); > return file_size; > } > > @@ -379,37 +384,37 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG > { > UINT faces = 1; > UINT expected_length; > - const struct dds_header *header = buffer; > + const struct DDS *dds = buffer; I'd keep the *header variable, initializing it to &dds->header... > > - if (length < sizeof(*header) || !info) > + if (length < sizeof(*dds) || !info) > return D3DXERR_INVALIDDATA; > > - if (header->pixel_format.size != sizeof(header->pixel_format)) > + if (dds->header.pixel_format.size != sizeof(dds->header.pixel_format)) > return D3DXERR_INVALIDDATA; ... so that you can leave this and the other similar lines below unchanged. > > - info->Width = header->width; > - info->Height = header->height; > + info->Width = dds->header.width; > + info->Height = dds->header.height; > info->Depth = 1; > - info->MipLevels = header->miplevels ? header->miplevels : 1; > + info->MipLevels = dds->header.miplevels ? dds->header.miplevels : 1; > > - info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); > + info->Format = dds_pixel_format_to_d3dformat(&dds->header.pixel_format); > if (info->Format == D3DFMT_UNKNOWN) > return D3DXERR_INVALIDDATA; > > TRACE("Pixel format is %#x\n", info->Format); > > - if (header->caps2 & DDS_CAPS2_VOLUME) > + if (dds->header.caps2 & DDS_CAPS2_VOLUME) > { > - info->Depth = header->depth; > + info->Depth = dds->header.depth; > info->ResourceType = D3DRTYPE_VOLUMETEXTURE; > } > - else if (header->caps2 & DDS_CAPS2_CUBEMAP) > + else if (dds->header.caps2 & DDS_CAPS2_CUBEMAP) > { > DWORD face; > faces = 0; > for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) > { > - if (header->caps2 & face) > + if (dds->header.caps2 & face) > faces++; > } > info->ResourceType = D3DRTYPE_CUBETEXTURE; > @@ -437,8 +442,8 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET > { > UINT size; > UINT src_pitch; > - const struct dds_header *header = src_data; > - const BYTE *pixels = (BYTE *)(header + 1); > + const struct DDS *dds = src_data; > + const BYTE *pixels = (BYTE *)(dds + 1); I guess you could instead make the src_data parameter BYTE * and compute "pixels" as src_data + sizeof(struct dds) (or however you want to call the new struct). It's mostly a matter of taste though so it's fine to me either way.

2 1

Re: [PATCH 4/7] ddraw/tests: Add tests for invalid render states.
by Marvin Jan. 28, 2016

Jan. 28, 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=20023 Your paranoid android. === build (build) === Missing build status line The build timed out

2 1

Re: [PATCH v2] winspool.drv: If the call to cupsPrintFile fails, print the cups error message.
by Huw Davies Jan. 28, 2016

Jan. 28, 2016

On Wed, Jan 27, 2016 at 08:58:26AM -0600, Jeremy White wrote: > diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c > index cebf6f7..89966ce 100644 > --- a/dlls/winspool.drv/info.c > +++ b/dlls/winspool.drv/info.c > @@ -781,6 +781,7 @@ static void *cupshandle; > DO_FUNC(cupsPrintFile) > #define CUPS_OPT_FUNCS \ > DO_FUNC(cupsGetNamedDest); \ > + DO_FUNC(cupsLastErrorString); \ > DO_FUNC(cupsGetPPD3) Could we keep these in alphabetical order please? Otherwise, looks good. Huw.

1 0

Re: [PATCH 5/7] ddraw/tests: Move other SetRenderState() tests to test_set_render_state().
by Marvin Jan. 28, 2016

Jan. 28, 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=20024 Your paranoid android. === w1064 (32 bit d3d) === d3d.c:2301: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2301: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2301: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2301: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2485: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2632: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2632: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2632: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2632: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 6/6] d3d8/tests: Test the creation of render targets with invalid multisample settings.
by Marvin Jan. 27, 2016

Jan. 27, 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=20021 Your paranoid android. === w1064 (32 bit device) === device.c:2727: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2732: Test failed: The focus window is active. device.c:2740: Test failed: Got unexpected hr 0x88760869. device.c:2746: Test failed: Got unexpect screen size 800x600. device.c:2761: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2770: Test failed: Got unexpect screen size 800x600. device.c:2783: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2791: Test failed: Got unexpect width 640. device.c:2792: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 5/6] d3d8/tests: Port test_checkdevicemultisampletype() from d3d9.
by Marvin Jan. 27, 2016

Jan. 27, 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=20020 Your paranoid android. === w1064 (32 bit device) === device.c:2668: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2673: Test failed: The focus window is active. device.c:2681: Test failed: Got unexpected hr 0x88760869. device.c:2687: Test failed: Got unexpect screen size 800x600. device.c:2702: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2711: Test failed: Got unexpect screen size 800x600. device.c:2724: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2732: Test failed: Got unexpect width 640. device.c:2733: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 6/6] jscript: Added JSON tests.
by Marvin Jan. 27, 2016

Jan. 27, 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=20011 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/6] jscript: Added JSON object stub implementation.
by Marvin Jan. 27, 2016

Jan. 27, 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=20010 Your paranoid android. === build (build) === Missing build status line The build timed out

1 0

Re: [PATCH] cmd: Consistently wrap lines to 75 characters.
by Francois Gouget Jan. 27, 2016

Jan. 27, 2016

On Fri, 3 Jul 2015, Alex Henrie wrote: > 75 characters is the maximum length of a line before gettext breaks it, > so this convention will cause each translatable string to fit snugly > into the po files. It's also about what we were doing anyway, just not > consistently. I think this patch and particularly its justification does not make any sense. The command line tool messages were wrapped to the typical width of a terminal: 80 characters. So with this change the messages now take more lines and lose in readability for the user. So now we gettext does not wrap the messages as much in the PO files. But that's totally irrelevant and invisible to the users. It's also totally irrelevant and invisible to a translator as soon as he uses a tool like poedit or a web GUI like Pootle. So what we have here is a change made solely to make things look a bit nicer to the few developers who look at PO files, at the cost of making them slightly worse for our users. Not a good tradeoff in my book and never a good justification for a patch. > I removed Hebrew "translations" of cmd.rc that were just copies of > the English strings, There was a reason for these. Has anything changed? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The last time religion ruled, it was called the dark ages.

2 5

New Wiki
by Jeremy Newman Jan. 27, 2016

Jan. 27, 2016

Hey all. We've migrated our Wiki to a new backend. At this point we've ported most of the English pages over. BIG BIG thanks to Rosanne for doing this migration work. Right now, the Wiki is locked down so only approved editors can make changes. So, if you need edit access, send an email to web-admin(a)winehq.org until we have a better system for approving editors in place. The old wiki is temporarily available at http://oldwiki.winehq.org If you need some content from there. I'm sure there will be plenty of things to fix. I also want to give serious kudos to Dimi and Lattica for previously hosting the Wiki. Thanks man! -N

5 7

Re: [PATCH] ntdll: Filling in memory counters under OS X.
by Ken Thomases Jan. 27, 2016

Jan. 27, 2016

Hi, Thanks for the submission. See my comments below. On Jan 27, 2016, at 10:19 AM, Snorri Sturluson <snorri.sturluson(a)ccpgames.com> wrote: > > +#ifdef __APPLE__ > +#include <mach/mach.h> > +#endif We're not totally consistent about this, but probably better to conditionalize this (and the code below) on HAVE_MACH_MACH_H instead of __APPLE__. > +#if defined(__APPLE__) > + > +void fill_VM_COUNTERS(VM_COUNTERS* pvmi) This should be "static" (in both branches of the #if). > +{ > + struct mach_task_basic_info info; > + mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; > + if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) You need to conditionalize this on MACH_TASK_BASIC_INFO being defined. It is not defined in the 10.5 SDK and Wine needs to compile against that. (Well, Alexandre may have finally given up on 10.5, but it's also not in the 10.6 SDK.) If it's not defined, you can fall back to TASK_BASIC_INFO_64 / struct task_basic_info_64, although it doesn't have as much information. > + { > + pvmi->VirtualSize = info.resident_size + info.virtual_size; > + pvmi->PagefileUsage = info.virtual_size; > + pvmi->WorkingSetSize = info.resident_size; pvmi->PeakWorkingSetSize can be set from info.resident_size_max, right? The other two Peak* fields could be set based on the current info.virtual_size (possibly combined with resident_size_max), at least. You could also track the highest value seen by this code, which is not the same as the real peak but at least never decreases. You would have to be careful to do it in a thread-safe manner, probably with atomic compare-and-swap in a loop. > + } You can get PageFaultCount from TASK_EVENTS_INFO / struct task_events_info.faults. Regards, Ken

1 0

Releasing wine-1.8.1 Soon
by Michael Stefaniuc Jan. 27, 2016

Jan. 27, 2016

Hello guys, now that two proper devel versions are out I plan to release wine-1.8.1 next week on Monday or Tuesday (2nd or 3rd February). A list of included and queued patches can be found on https://static-winehq.rhcloud.com/stable/ Or directly via git from https://github.com/mstefani/wine-stable . I still need to pull in two bugs marked for 1.8.x (https://bugs.winehq.org/buglist.cgi?bug_status=RESOLVED&bug_status=CLOSED&l…) If you guys know other bugs or commits that should go into 1.8.1 please let me know (set 1.8.x in bugzilla, email, irc). The rules for acceptable patches for Stable are on https://wiki.winehq.org/Stable_Rules 1.8.x bugs deferred for 1.8.2 or later: - #35187 - Jade Empire Special Edition configuration tool always resetting video settings - #39838 - Wreckfest Server: Crashes at startup, unimplemented function KERNEL32.dll.GetConsoleScreenBufferInfoEx & SetConsoleScreenBufferInfoEx Out of scope for 1.8.x: - D3D10 / D3D11 as cherry-picking single commits makes no sense. Many thanks to the people that already provided me with input on patches for Stable. bye michael

1 0

crypt32:chain test failures
by Francois Gouget Jan. 27, 2016

Jan. 27, 2016

crypt32:chain has started having the following failures on the 21st on essentially all the VMs it runs on: https://test.winehq.org/data/tests/crypt32:chain.html chain.c:3875: Test failed: didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE, got 10 chain.c:3897: Test failed: didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE And yet it has not been modified recently. Based on the source it looks like these tests are running against Google's certificate. Could it be that that certificate changed recently thus breaking the tests? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Indifference will certainly be the downfall of mankind, but who cares?

1 0