- wine-devel - winehq.org

Re: ntdll: Skip unused import descriptors when loading libraries.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -901,7 +901,18 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) > status = STATUS_SUCCESS; > for (i = 0; i < nb_imports; i++) > { > - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) > + const IMAGE_IMPORT_DESCRIPTOR *descr = &imports[i]; > + const IMAGE_THUNK_DATA *import_list = get_rva( wm->ldr.BaseAddress, descr->u.OriginalFirstThunk ? > + (DWORD)descr->u.OriginalFirstThunk : (DWORD)descr->FirstThunk ); > + if (!import_list->u1.Ordinal) I feel it would be cleaner to do these checks inside import_dll(). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] winebuild: When building implibs, invoke dlltool with a machine type. (try 2)
by Alexandre Julliard 10 Feb '16

10 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > That way, if the installed MinGW toolchain is multilib enabled (as mine > is), the import libraries will get built for the correct architecture. > > Try 2: Correct machine name for x86-64. I'm afraid this doesn't work either: /usr/bin/x86_64-w64-mingw32-dlltool: Machine 'x86-64' not supported winebuild: /usr/bin/x86_64-w64-mingw32-dlltool failed with status 1 The help says: -m --machine <machine> Create as DLL for <machine>. [default: i386:x86-64] possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: usp10: ScriptPlace should honour the fZeroWidth attribute.
by Marvin 10 Feb '16

10 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20325 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1437: Test failed: 0: uJustification incorrect (0) usp10.c:1437: Test failed: 1: uJustification incorrect (0) usp10.c:1437: Test failed: 2: uJustification incorrect (0) usp10.c:1437: Test failed: 3: uJustification incorrect (0) usp10.c:1437: Test failed: 4: uJustification incorrect (0) usp10.c:1437: Test failed: 5: uJustification incorrect (0) usp10.c:1437: Test failed: 6: uJustification incorrect (0) usp10.c:1437: Test failed: 7: uJustification incorrect (0) usp10.c:1437: Test failed: 8: uJustification incorrect (0) usp10.c:1437: Test failed: 9: uJustification incorrect (0) usp10.c:1453: Test failed: 3: uJustification incorrect (0) usp10.c:1453: Test failed: 5: fDiacritic incorrect (1) usp10.c:1453: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1453: Test failed: 15: fDiacritic incorrect (1) usp10.c:1453: Test failed: 15: fZeroWidth incorrect (1)

2 1

Re: ntdll/tests: Simplify exception tests by using todo_wine_if.
by Marvin 10 Feb '16

10 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20310 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003C0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/003F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: wlanapi: add a stub for WlanEnumInterfaces
by Sebastian Lackner 10 Feb '16

10 Feb '16

Hiho Austin, here some feedback on the patch as inline comments: On 05.02.2016 06:19, Austin English wrote: > Should fix https://bugs.winehq.org/show_bug.cgi?id=40034. Unfortunately, > the user is having issues building wine, and there's no download to verify > myself.. > > > attachment.txt > > > From 060d3427b61058fe7dc4da447743008d030da331 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Sun, 24 Jan 2016 20:18:24 -0600 > Subject: [PATCH] wlanapi: add WlanOpenHandleFunction stub > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/wlanapi/main.c | 8 ++++++++ > dlls/wlanapi/wlanapi.spec | 2 +- > include/wlanapi.h | 36 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 45 insertions(+), 1 deletion(-) > create mode 100644 include/wlanapi.h > > diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c > index 0b0d100..cba9864 100644 > --- a/dlls/wlanapi/main.c > +++ b/dlls/wlanapi/main.c > @@ -24,6 +24,8 @@ > #include "winbase.h" > #include "wine/debug.h" > > +# include "wlanapi.h" Why is there a space between "#" and include? > + > WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); > > DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, > @@ -49,3 +51,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > > return TRUE; > } I would suggest to add your implementation above, below the other Wlan* functions. > + > +DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_INFO_LIST *interface_list) MSDN says the second argument is a double-pointer. > +{ > + FIXME("%p, %p, %p) stub\n",client, reserved, interface_list); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > \ No newline at end of file > diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec > index 79f9e43..22264c5 100644 > --- a/dlls/wlanapi/wlanapi.spec > +++ b/dlls/wlanapi/wlanapi.spec > @@ -3,7 +3,7 @@ > @ stub WlanConnect > @ stub WlanDeleteProfile > @ stub WlanDisconnect > -@ stub WlanEnumInterfaces > +@ stdcall WlanEnumInterfaces(ptr ptr ptr) HANDLEs should be specified as "long" in spec files. > @ stub WlanExtractPsdIEDataList > @ stub WlanFreeMemory > @ stub WlanGetAvailableNetworkList > diff --git a/include/wlanapi.h b/include/wlanapi.h > new file mode 100644 > index 0000000..15a52ac > --- /dev/null > +++ b/include/wlanapi.h > @@ -0,0 +1,36 @@ > +/* > + * Copyright (C) 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + Some header-guard wouldn't hurt. > +typedef enum _WLAN_INTERFACE_STATE { > + WLAN_INTERFACE_STATE_UNUSED, Typically all new files use 4 space indentation. Did you copy it from somewhere? Also, where are all the enum fields listed on MSDN? https://msdn.microsoft.com/en-us/library/windows/desktop/ms706877(v=vs.85).… > +} WLAN_INTERFACE_STATE; > + > +typedef struct _WLAN_INTERFACE_INFO { > + GUID InterfaceGuid; > + WCHAR strInterfaceDescription[256]; > + WLAN_INTERFACE_STATE isState; > +} WLAN_INTERFACE_INFO, *PWLAN_INTERFACE_INFO; > + > +typedef struct _WLAN_INTERFACE_INFO_LIST { > + DWORD dwNumberOfItems; > + DWORD dwIndex; > + WLAN_INTERFACE_INFO InterfaceInfo[1]; > +} WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; > + > +DWORD (WINAPI *WlanOpenHandleFunction)(DWORD, VOID *, DWORD *, HANDLE *); This declares a variable and doesn't belong in a header file. > +DWORD WINAPI WlanEnumInterfaces(HANDLE, VOID *, WLAN_INTERFACE_INFO_LIST *); Should also be a double-pointer here. > -- 2.7.0.rc3 > > >

1 0

Re: [v2 PATCH] include: Add IColumnsInfo interface
by Nikolay Sivov 10 Feb '16

10 Feb '16

Now you removed size_is() completely. Why?

1 0

Re: [PATCH v2 1/7] d3d11/tests: Test creation of typeless resources.
by Dmitry Timoshkov 10 Feb '16

10 Feb '16

Józef Kucia <jkucia(a)codeweavers.com> wrote: > + todo_wine_if(tests[i].todo) > + ok(tests[i].succeeds ? SUCCEEDED(hr) : FAILED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); Isn't an actual behaviour well defined and particular error/success codes should be used instead of generic SUCCEEDED()/FAILED()? -- Dmitry.

1 0

Running WineTest every day the easy way
by Francois Gouget 10 Feb '16

10 Feb '16

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] gdi32: Fix otmfsSelection to have bold style set in case of bold simulation
by Marvin 10 Feb '16

10 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20292 Your paranoid android. === wvistau64 (64 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

finalizing 64-bit mixed mode issues
by Paul Gofman 09 Feb '16

09 Feb '16

Hi Vincent, I currently have all my cases with 64-bit mixed assemblies calling pure .Net working just fine under Wine/Mono (well, almost fine, it looks like I found a bug in Mono System.Windows.Forms cs code, but this is a separate issue), but not with vanilla ones. The following issues are not fixed upstream yet: 1. Loading 32-bit pure assemblies in 64-bit code. The patch you attached some time ago (which includes CorValidateImage implementation) works just fine for me. Do you have any plans for pushing it upstream soon? 2. Mono JIT compiler PTR/I8 issues. I've extended a bit your test case and updated the patch in the Mono bug info. While we are waiting for some reply on this in Mono maybe it is possible to send my patch for wine-mono? I am not sure that it is fully correct (it would in fact require to get familiar with the whole JIT code generation path to make sure), but I presume it is safe to use as: - the changes relate to 64-bit code generation only, 32 bit is not affected anyhow; - as for 64 bit, the changes solely extend what instruction/call parameters are considered valid for JIT code generator. If something was valid without this patch, it will not be affected. If something was invalid and gets touched by the patch incorrectly for some cases, it will likely result in segfault instead of 'invalid il code' exception in the worst case. 3. 64-bit .Net programs constantly crashing on process exit for me (this affects test case with exe and dll you sent previously as well). The crash happens in Mono GC finalizing code triggered by System.Process.Exit call from mscoree CorExitProcess. The immediate crash reason is that some objects touched by GC through its hash tables get NULL vtable pointer somewhere earlier in deinitialization. I did not find the exact reason for this yet, but looked at coree.c in Mono where they just call ExitProcess without anything else, and comment says: "FIXME: This is not currently supported by the runtime.". If I do the same in mscoree CorExitProcess it fixes the issue with crash. Do you think this is a right way to do for now? If yes I could send a patch for this. Thanks, Paul.

2 6

Re: [PATCH 1/2] gdi32: Fix otmfsSelection to have italic style set in case of oblique simulation
by Dmitry Timoshkov 09 Feb '16

09 Feb '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + hdc = GetDC(0); > + hfont = CreateFontIndirectA(lf); > + ok(hfont != NULL, "failed to create a font\n"); > + > + hfont_old = SelectObject(hdc, hfont); Please avoid using GetDC(0) for all kinds of graphics tests, this may lead (inadvertently) to graphics artifacts because it's basically an eqivalent of CreateDC("display"). I'd suggest to use CreateCompatibleDC(0) instead, and create a dedicated window if painting is really desired. -- Dmitry.

2 1

Re: [PATCH 2/2] gdi32/tests: Turn some asserts in font tests into regular tests
by Marvin 09 Feb '16

09 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20287 Your paranoid android. === wvistau64 (32 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === wvistau64 (64 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 5/5] d3d11/tests: Test creation of typeless resources.
by Henri Verbeet 09 Feb '16

09 Feb '16

On 9 February 2016 at 11:24, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + enum resource_type > + { > + rt_texture_2d, > + rt_texture_3d, > + }; > + > + static const struct > + { > + DXGI_FORMAT format; > + D3D11_BIND_FLAG bind_flags; > + enum resource_type type; Why not D3D11_RESOURCE_DIMENSION?

2 2

Re: [PATCH] winebuild: When building implibs, invoke dlltool with a machine type.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > That way, if the installed MinGW toolchain is multilib enabled (as mine > is), the import libraries will get built for the correct architecture. This breaks the build for me: /usr/bin/x86_64-w64-mingw32-dlltool: Machine 'x86_64' not supported winebuild: /usr/bin/x86_64-w64-mingw32-dlltool failed with status 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Gecko 2.44 not there yet?
by Gerald Pfeifer 09 Feb '16

09 Feb '16

I noticed that the release notes of Wine 1.9.3 announced a "new version of the Geck engine based on Firefox 44". Alas, none of the many sf.net mirrors I tried carries http://*.dl.sourceforge.net/project/wine/Wine%20Gecko/2.44/ . The Wiki at https://wiki.winehq.org/Gecko refers to http://dl.winehq.org/wine/wine-gecko/2.40//wine_gecko-2.44-x86.msi which does not exist either. (Note 2.40 vs 2.44.) And http://sourceforge.net/projects/wine/files/Wine%20Gecko/ does not seem to carry a trace, either. Gerald

2 2

Re: [PATCH 1/5] wined3d: Add support for WINED3DFMT_R16_UINT format.
by Józef Kucia 09 Feb '16

09 Feb '16

On Tue, Feb 9, 2016 at 10:53 AM, Józef Kucia <jkucia(a)codeweavers.com> wrote: > struct wined3d_format_block_info > @@ -1138,6 +1139,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = > WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING > | WINED3DFMT_FLAG_RENDERTARGET, > ARB_TEXTURE_RG, NULL}, > + {WINED3DFMT_R16_UINT, GL_R16UI, GL_R16UI, 0, > + GL_RED_INTEGER, GL_UNSIGNED_SHORT, 0, > + WINED3DFMT_FLAG_TEXTURE, > + WINED3D_GL_VERSION_3_0, NULL}, Actually, it should depend on ARB_TEXTURE_RG.

1 0

Re: [PATCH 2/2 v2] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Sebastian Lackner 09 Feb '16

09 Feb '16

On 07.01.2016 08:15, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 57 ++++++++++++++++++++++++++++++++++++++++------ > dlls/odbccp32/tests/misc.c | 4 ++-- > 2 files changed, 52 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 3d150a1..a55947b 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1105,22 +1105,65 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) > return FALSE; > } > > -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, > - LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL removeDSN, LPDWORD usage_count) When you are refactoring code like this, please also use "const WCHAR *" and "DWORD *" instead of LP* types. Any reason why you keep the ugly name for lpszDriver? > { > + DWORD usage_cnt = 0; > + HKEY hkey; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > + TRACE("%s %d %p\n", debugstr_w(lpszDriver), removeDSN, usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, lpszDriver, &hkeydriver) == ERROR_SUCCESS) > + { > + if (usage_count) > + { > + if (RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, NULL, &usage_cnt, NULL) == ERROR_SUCCESS) > + { > + usage_cnt--; Implementing UsageCount handling only here doesn't seem very useful. It also has to be set / updated, and depending on the result the code below should behave different. > + } > + } > + > + RegCloseKey(hkeydriver); > + } > + > + if(RegDeleteKeyW(hkey, lpszDriver) != ERROR_SUCCESS) > + ERR("Failed to delete registry key: %s\n", debugstr_w(lpszDriver)); > + > + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegDeleteValueW(hkeydriver, lpszDriver) != ERROR_SUCCESS) > + ERR("Failed to delete registry value: %s\n", debugstr_w(lpszDriver)); > + > + RegCloseKey(hkeydriver); > + } > + > + } > + > + if (usage_count) > + *usage_count = usage_cnt; > + > return TRUE; > } > > BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, > LPDWORD lpdwUsageCount) > { > + WCHAR *driver; > + BOOL ret; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > - return TRUE; > + TRACE("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); > + > + driver = SQLInstall_strdup(lpszDriver); > + > + ret = SQLRemoveDriverW(driver, fRemoveDSN, lpdwUsageCount); > + > + HeapFree(GetProcessHeap(), 0, driver); > + return ret; > } > > BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) > diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c > index 3ae1fd3..e3adffd 100644 > --- a/dlls/odbccp32/tests/misc.c > +++ b/dlls/odbccp32/tests/misc.c > @@ -462,12 +462,12 @@ void test_SQLInstallDriverEx(void) > cnt = 100; > ret = SQLRemoveDriver("WINE ODBC Driver", FALSE, &cnt); > ok(ret, "SQLRemoveDriver failed\n"); > - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > > cnt = 100; > ret = SQLRemoveDriver("WINE ODBC Driver Path", FALSE, &cnt); > ok(ret, "SQLRemoveDriver failed\n"); > - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > } > > START_TEST(misc) >

1 0

Re: [PATCH 1/2 v2] odbccp32: Implement SQLInstallDriverEx correctly
by Sebastian Lackner 09 Feb '16

09 Feb '16

Sorry for the late reply, didn't see that this patch was assigned to me. Below is some feedback on this iteration. On 07.01.2016 08:15, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 90 +++++++++++++++++++++++++++++++++++++++++----- > dlls/odbccp32/tests/misc.c | 59 ++++++++++++++++++++++++++++++ > 2 files changed, 140 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index bc643d4..3d150a1 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -29,6 +29,7 @@ > #include "winbase.h" > #include "winreg.h" > #include "winnls.h" > +#include "wine/unicode.h" > #include "wine/debug.h" > > #include "odbcinst.h" > @@ -38,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc); > /* Registry key names */ > static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; > static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; > +static const WCHAR odbcini[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\',0}; > +static const WCHAR odbcdrivers[] = {'O','D','B','C',' ','D','r','i','v','e','r','s',0}; > > /* This config mode is known to be process-wide. > * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. > @@ -626,12 +629,85 @@ BOOL WINAPI SQLInstallDriver(LPCSTR lpszInfFile, LPCSTR lpszDriver, > pcbPathOut, ODBC_INSTALL_COMPLETE, &usage); > } > > +static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, const WCHAR *path_in, WCHAR *path) > +{ > + static const WCHAR installed[] = {'I','n','s','t','a','l','l','e','d',0}; > + static const WCHAR slash[] = {'\\', 0}; > + static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; > + static const WCHAR setupW[] = {'S','e','t','u','p',0}; > + HKEY hkey, hkeydriver; > + > + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + if (RegCreateKeyW(hkey, regkey, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegSetValueExW(hkeydriver, driver, 0, REG_SZ, (BYTE*)installed, > + (lstrlenW(installed)+1)*sizeof(WCHAR)) != ERROR_SUCCESS) > + ERR("Failed to write registry installed key\n"); I think it would be better to let SQLInstallDriverExW fail when things go wrong. > + > + RegCloseKey(hkeydriver); > + } > + > + if (RegCreateKeyW(hkey, driver, &hkeydriver) == ERROR_SUCCESS) > + { > + WCHAR entry[1024]; > + WCHAR value[MAX_PATH]; > + const WCHAR *p; > + > + /* Skip name entry */ > + p = driver; > + p += lstrlenW(p) + 1; > + > + if(!path_in) > + GetSystemDirectoryW(path, MAX_PATH); > + else > + lstrcpyW(path, path_in); If one of the registry operations above fails, path will be unset, without propagating this failure to the parent function. > + > + for (; *p; p += lstrlenW(p) + 1) > + { > + WCHAR *divider = strchrW(p,'='); > + > + if (divider) > + { > + /* Write pair values to the registry. */ > + lstrcpynW(entry, p, divider - p + 1); The size limit for entry / value could lead to buffer overflows. I'm aware that wine already contains a lot of similar issues, but usually it is recommended to avoid such design decisions for new code (unless Windows has the same limitiation). > + > + divider++; > + TRACE("Writing pair %s,%s\n", debugstr_w(entry), debugstr_w(divider)); > + > + /* Driver and Setup entries use the system path unless a path is specified. */ > + if(lstrcmpiW(driverW, entry) == 0 || lstrcmpiW(setupW, entry) == 0) > + { > + lstrcpyW(value, path); > + lstrcatW(value, slash); > + lstrcatW(value, divider); > + } > + else > + lstrcpyW(value, divider); > + > + if(RegSetValueExW(hkeydriver, entry, 0, REG_SZ, (BYTE*)value, > + (lstrlenW(value)+1)*sizeof(WCHAR)) != ERROR_SUCCESS) > + ERR("Failed to write registry data %s %s\n", debugstr_w(entry), debugstr_w(value)); > + } > + else > + { > + ERR("No pair found. %s\n", debugstr_w(p)); > + break; > + } > + } > + > + RegCloseKey(hkeydriver); > + } > + > + RegCloseKey(hkey); > + } > +} > + > BOOL WINAPI SQLInstallDriverExW(LPCWSTR lpszDriver, LPCWSTR lpszPathIn, > LPWSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, > WORD fRequest, LPDWORD lpdwUsageCount) > { > UINT len; > - LPCWSTR p; > WCHAR path[MAX_PATH]; > > clear_errors(); > @@ -639,15 +715,15 @@ BOOL WINAPI SQLInstallDriverExW(LPCWSTR lpszDriver, LPCWSTR lpszPathIn, > debugstr_w(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, > fRequest, lpdwUsageCount); > > - for (p = lpszDriver; *p; p += lstrlenW(p) + 1) > - TRACE("%s\n", debugstr_w(p)); > + write_registry_values(odbcdrivers, lpszDriver, lpszPathIn, path); > > - len = GetSystemDirectoryW(path, MAX_PATH); > + len = lstrlenW(path); > > if (pcbPathOut) > *pcbPathOut = len; > > - len = GetSystemDirectoryW(path, MAX_PATH); > + if(lpdwUsageCount) > + *lpdwUsageCount = 1; This is probably fine for a first version, but usage count handling is also very important and will require various changes to the registry code (for example, checking for other matching drivers and incrementing usage count) - so I would suggest to look at this early enough to avoid huge rewrites. > > if (lpszPathOut && cbPathOutMax > len) > { > @@ -661,7 +737,6 @@ BOOL WINAPI SQLInstallDriverEx(LPCSTR lpszDriver, LPCSTR lpszPathIn, > LPSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, > WORD fRequest, LPDWORD lpdwUsageCount) > { > - LPCSTR p; > LPWSTR driver, pathin; > WCHAR pathout[MAX_PATH]; > BOOL ret; > @@ -672,9 +747,6 @@ BOOL WINAPI SQLInstallDriverEx(LPCSTR lpszDriver, LPCSTR lpszPathIn, > debugstr_a(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, > fRequest, lpdwUsageCount); > > - for (p = lpszDriver; *p; p += lstrlenA(p) + 1) > - TRACE("%s\n", debugstr_a(p)); > - > driver = SQLInstall_strdup_multi(lpszDriver); > pathin = SQLInstall_strdup(lpszPathIn); > > diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c > index 505ce1b..3ae1fd3 100644 > --- a/dlls/odbccp32/tests/misc.c > +++ b/dlls/odbccp32/tests/misc.c > @@ -412,6 +412,64 @@ static void test_SQLGetPrivateProfileStringW(void) > } > } > > +void test_SQLInstallDriverEx(void) > +{ > + char path[MAX_PATH]; > + char syspath[MAX_PATH]; > + WORD size = 0; > + BOOL ret, sql_ret; > + DWORD cnt, error_code = 0; > + HKEY hkey; > + DWORD reg_ret; > + > + GetSystemDirectoryA(syspath, MAX_PATH); > + > + ret = SQLInstallDriverEx("WINE ODBC Driver\0Driver=sample.dll\0Setup=sample.dll\0\0", NULL, path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); Wouldn't it make sense to check ret? Otherwise you can remove this unnecessary assignment. Also, one terminating null "\0" at the end should be sufficient because the second one is added by the compiler. > + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); > + if (sql_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) > + { > + win_skip("not enough privileges\n"); > + return; > + } > + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); > + ok(!strcmp(path, syspath), "invalid path %s\n", path); > + > + ret = SQLInstallDriverEx("WINE ODBC Driver Path\0Driver=sample.dll\0Setup=sample.dll\0\0", "c:\\temp", path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); > + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); > + ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); > + ok(!strcmp(path, "c:\\temp"), "invalid path %s\n", path); > + > + if(ret) > + { If this code should always execute fine, you can remove the check for "ret". Otherwise, if it doesn't run on some systems, please add a win_skip(...) message. > + reg_ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); > + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); > + if (reg_ret == ERROR_SUCCESS) > + { > + DWORD type, size = MAX_PATH; > + char driverpath[MAX_PATH]; > + > + strcpy(driverpath, syspath); > + strcat(driverpath, "\\sample.dll"); > + > + reg_ret = RegGetValueA(hkey, NULL, "Driver", RRF_RT_REG_SZ, &type, &path, &size); > + ok(reg_ret == ERROR_SUCCESS, "RegGetValueA failed\n"); > + ok(!strcmp(path, driverpath), "invalid path %s\n", path); > + > + RegCloseKey(hkey); > + } > + } > + > + cnt = 100; > + ret = SQLRemoveDriver("WINE ODBC Driver", FALSE, &cnt); > + ok(ret, "SQLRemoveDriver failed\n"); > + todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > + > + cnt = 100; > + ret = SQLRemoveDriver("WINE ODBC Driver Path", FALSE, &cnt); > + ok(ret, "SQLRemoveDriver failed\n"); > + todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); > +} > + > START_TEST(misc) > { > test_SQLConfigMode(); > @@ -420,4 +478,5 @@ START_TEST(misc) > test_SQLWritePrivateProfileString(); > test_SQLGetPrivateProfileString(); > test_SQLGetPrivateProfileStringW(); > + test_SQLInstallDriverEx(); > } >

1 0

Re: [PATCH 2/7] reg: Split reg_printfW into separate functions
by Alexandre Julliard 09 Feb '16

09 Feb '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > +static void __cdecl output_array(const WCHAR *fmt, ...) > +{ > + __ms_va_list va_args; > + > + __ms_va_start(va_args, fmt); > + output_formatstring(fmt, va_args); > + __ms_va_end(va_args); > } That's a strange name, why "array"? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH] msvcr120: Implement atoll, _atoll_l, _wtoll, _wtoll_l.
by Piotr Caban 08 Feb '16

08 Feb '16

On 02/07/16 23:36, Rafał Harabień wrote: > dlls/msvcr120/msvcr120.spec | 8 ++++---- > dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- > dlls/msvcrt/string.c | 16 ++++++++++++++++ > dlls/msvcrt/wcs.c | 16 ++++++++++++++++ Please also update: dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec dlls/ucrtbase/ucrtbase.spec files. > /****************************************************************** > + * _atoll_l (MSVCRT.@) Since it's not exported from MSVCRT please change the comment to "... (MSVCR120.@)" Thanks, Piotr

1 0

Re: shell32/tests: Allow the short and long forms when checking a ShellExecute() path.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20248 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1691: Test failed: WaitForSingleObject returned 258 === w1064 (32 bit shlexec) === shlexec.c:2458: Test failed: failed: rc=29 err=2 shlexec.c:2456: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2458: Test failed: failed: rc=29 err=32 shlexec.c:2458: Test failed: failed: rc=29 err=2 shlexec.c:2456: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2458: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2458: Test failed: failed: rc=29 err=2 shlexec.c:2458: Test failed: failed: rc=29 err=2 shlexec.c:2456: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2458: Test failed: failed: rc=29 err=32 shlexec.c:2470: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtA1B2.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtA1B2.tmp\test file.sde")]' shlexec.c:2458: Test failed: failed: rc=29 err=2 shlexec.c:2458: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Fix the ShellExecute() environment variable inheritance checks.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20247 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2453: Test failed: failed: rc=29 err=2 shlexec.c:2451: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2453: Test failed: failed: rc=29 err=32 shlexec.c:2453: Test failed: failed: rc=29 err=2 shlexec.c:2451: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2453: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2453: Test failed: failed: rc=29 err=2 shlexec.c:2453: Test failed: failed: rc=29 err=2 shlexec.c:2451: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2453: Test failed: failed: rc=29 err=32 shlexec.c:2465: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt87E1.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt87E1.tmp\test file.sde")]' shlexec.c:2453: Test failed: failed: rc=29 err=2 shlexec.c:2453: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Move a test_argify() check so it is run even if we could not create associations.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20246 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 shlexec.c:2454: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt5289.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt5289.tmp\test file.sde")]' shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2442: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20245 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2448: Test failed: failed: rc=29 err=2 shlexec.c:2446: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2448: Test failed: failed: rc=29 err=32 shlexec.c:2448: Test failed: failed: rc=29 err=2 shlexec.c:2446: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2448: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2448: Test failed: failed: rc=29 err=2 shlexec.c:2448: Test failed: failed: rc=29 err=2 shlexec.c:2446: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2448: Test failed: failed: rc=29 err=32 shlexec.c:2460: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt477D.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt477D.tmp\test file.sde")]' shlexec.c:2448: Test failed: failed: rc=29 err=2 shlexec.c:2448: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Remove support for a todo_wine flag in ShellExecute()'s test_lnks() loop.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20244 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1683: Test failed: WaitForSingleObject returned 258 === 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\wt9F9F.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt9F9F.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: shell32/tests: Fix a ShellExecute() race condition.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20243 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1675: Test failed: WaitForSingleObject returned 258 shlexec.c:1704: Test failed: argvA3 expected 'Open', but key not found or empty shlexec.c:1712: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDD72.tmp\test file.noassoc.shlexec', but key not found or empty shlexec.c:1704: Test failed: argvA3 expected 'QuotedLowerL', got 'Open' shlexec.c:1712: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDD72.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtDD72.tmp\test file.noassoc.shlexec' shlexec.c:1704: Test failed: argvA3 expected 'QuotedUpperL', got 'QuotedLowerL' === w1064 (32 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2455: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt48B4.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt48B4.tmp\test file.sde")]' shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2443: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Fix test_dde_default_app() on Windows XP SP1.
by Marvin 08 Feb '16

08 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20242 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32 shlexec.c:2442: Test failed: failed: rc=29 err=2 shlexec.c:2440: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2442: Test failed: failed: rc=29 err=32

1 0

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 08 Feb '16

08 Feb '16

On 08.02.2016 3:07, Theodore Dubois wrote: > >> On Feb 7, 2016, at 4:25 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> >> Why do you need this? > > So I can assert in Init. That's not necessary. > >> >>> This->hkeyProgID = This->hkeySource; >> >> I know it's not something you introduced, but it's dirty and should be >> fixed, because it leads to double free on a same handle. > > I’ll fix that in the next version. > >> Basically you remove everything, and tests don't show that you should do >> that. For example looking at Win7 registry I see HKCR\.exe with default >> value of "exefile", then default value for HKCR\exefile is Application >> (and also there is a FriendlyTypeName key that's most likely localized). >> Current code will return "Application" and that seems like a better >> candidate for a friendly name. > > In that case, hkeyProgID would refer to HKCR\exefile, and then I return the > default value from that key which is “Application”. It used to start with hkeySource > (would point to HKCR\.exe) and do some digging, but my code does that work in Init. > + if (*pszAssoc == '.') > + { > + /* for a file extension, the progid is the default value */ > + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + } What happens if default value is not set? > + else /* if (*pszAssoc == '{') */ > + { > + assert(*pszAssoc == '{'); > + > + HKEY progIdKey; > + /* for a clsid, the progid is the default value of the ProgID subkey */ > + ret = RegOpenKeyExW(This->hkeySource, > + szProgID, > + 0, > + KEY_READ, > + &progIdKey); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > + hr = ASSOC_GetValue(progIdKey, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + RegCloseKey(progIdKey); > + } Now Init() will fail on missing progid subkey, and it didn't before. Also this introduces leaks. > >> A convincing test should create a custom extension key, and test all >> possible combinations of empty default values, missing keys with default >> value name etc. > > Yes, more tests is always good. I’ll try and figure out how to test things on Windows and add some more tests in the next version. > > ~Theodore >

2 1

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Theodore Dubois 08 Feb '16

08 Feb '16

> On Feb 7, 2016, at 4:25 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > Why do you need this? So I can assert in Init. > >> This->hkeyProgID = This->hkeySource; > > I know it's not something you introduced, but it's dirty and should be > fixed, because it leads to double free on a same handle. I’ll fix that in the next version. > Basically you remove everything, and tests don't show that you should do > that. For example looking at Win7 registry I see HKCR\.exe with default > value of "exefile", then default value for HKCR\exefile is Application > (and also there is a FriendlyTypeName key that's most likely localized). > Current code will return "Application" and that seems like a better > candidate for a friendly name. In that case, hkeyProgID would refer to HKCR\exefile, and then I return the default value from that key which is “Application”. It used to start with hkeySource (would point to HKCR\.exe) and do some digging, but my code does that work in Init. > A convincing test should create a custom extension key, and test all > possible combinations of empty default values, missing keys with default > value name etc. Yes, more tests is always good. I’ll try and figure out how to test things on Windows and add some more tests in the next version. ~Theodore

1 0

Re: [PATCH 4/5] wined3d: Introduce wined3d_texture_get_overlay_position().
by Stefan Dösinger 07 Feb '16

07 Feb '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-02-05 um 20:31 schrieb Henri Verbeet: > dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++++ I think the overlay API would be much nicer in swapchains, either textures overlaying swapchains or swapchains overlaying swapchains. Unfortunately the fact that you can assign an overlay to an offscreenplain surface makes that very difficult. A solution similar to palettes where we do most tracking in ddraw and only forward "useful" setups to wined3d might be feasible. Fwiw, the only non video player app that uses overlays that I know is settlers 3, which uses them to draw the mouse pointer if certain options are set. (Feel free to completely ignore this concern, I don't think overlays should be a side quest for CSMT...) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWt33BAAoJEN0/YqbEcdMwiAoP/2uQ2ieAcs6PnFDTpwFhXMxf nYthS9pQfhmLSKPfyp69sj1QJvGLkfwtRJD4xqdu0TkJp3YMYsHIzFktT6wODcOd hqnMcN+8S0EYLFg7CYWgbwN+b+stUUzyFxML5DkLglnU6zC2nfid5Vv0h8o27o/D ySUKnSMqyhIzU5N1KL1qTaucnLYG9zW9Sgtw05zCpBZ86wy2X12ylyhRvofslqPj Cm6TPT5RPcgDw7TGSDfF1nFIp4c3nO6DIl4mWMBP6VCl+Z69Q2CqvSGBqW4ZWd3U Zs1Kae+6iF8FghwNtXx68o/gi/hcab648mA6Jc1ybnwGupv3i27/7ayQPB4Wb4R3 rx/37cJNz4FS9X5/reQJEOhoJR9wDzbBqmyctMOoMp8lOJCcpUaACdFDYvxVhvcv C4T0nMA8nmJ+uW5fgscsduEUFqPAN9QHwHDpn9AzzGVnjrpCEvFwXYFfuLZdhU9r NqMaxpyllA7S8GGuF4gmPPKopKl5C9+ZlNyTEadzhtksgZ9vqtXYbrxYaJryIMwG CPakKX5VHVP48IFxbFgzi7/0iq51njkS0BmTKc65+ZCa6bO3sVAcbu29N1UOFOYU T0XfO6PDUgljCCDLm/9+wrbpGd23yu9HQnUHcwyh41H06L1rBcun52P7PSdoC8Jh vGSx0aSmRCCBYTM9RpWi =XqoV -----END PGP SIGNATURE-----

2 1

Re: [v2] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 07 Feb '16

07 Feb '16

On 07.02.2016 1:09, Theodore Dubois wrote: > Basically, returns the correct value for > ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON > when passed a ProgID instead of a file extension. > > Also adds some tests to make sure it works. > > Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> > --- > dlls/shell32/assoc.c | 115 +++++++++++++++++++++++---------------------- > dlls/shell32/tests/assoc.c | 12 ++++- > 2 files changed, 70 insertions(+), 57 deletions(-) > > diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c > index 90d00a8..49af3c3 100644 > --- a/dlls/shell32/assoc.c > +++ b/dlls/shell32/assoc.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > #include <stdarg.h> > +#include <assert.h> Why do you need this? > This->hkeyProgID = This->hkeySource; I know it's not something you introduced, but it's dirty and should be fixed, because it leads to double free on a same handle. > + return S_OK; > + } > + > + /* if it's not a progid, it's a file extension or clsid */ > + if (*pszAssoc == '.') > + { > + /* for a file extension, the progid is the default value */ > + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + } > + else /* if (*pszAssoc == '{') */ > + { > + assert(*pszAssoc == '{'); > + > + HKEY progIdKey; > + /* for a clsid, the progid is the default value of the ProgID subkey */ > + ret = RegOpenKeyExW(This->hkeySource, > + szProgID, > + 0, > + KEY_READ, > + &progIdKey); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > + hr = ASSOC_GetValue(progIdKey, NULL, (void**)&progId, NULL); > + if (FAILED(hr)) > + return hr; > + RegCloseKey(progIdKey); > + } > + > + /* open the actual progid key, the one with the shell subkey */ > + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, > + progId, > + 0, > + KEY_READ, > + &This->hkeyProgID); > + if (ret != ERROR_SUCCESS) > + return HRESULT_FROM_WIN32(ret); > return S_OK; > } > else if (hkeyProgid != NULL) > @@ -507,33 +544,12 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( > > case ASSOCSTR_FRIENDLYDOCNAME: > { > - WCHAR *pszFileType; > - DWORD ret; > - DWORD size; > + WCHAR *docName; > > - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); > + hr = ASSOC_GetValue(This->hkeyProgID, NULL, (void**)&docName, NULL); > if (FAILED(hr)) > return hr; > - size = 0; > - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > - if (ret == ERROR_SUCCESS) > - { > - WCHAR *docName = HeapAlloc(GetProcessHeap(), 0, size); > - if (docName) > - { > - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); > - if (ret == ERROR_SUCCESS) > - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, docName); > - } > - else > - hr = E_OUTOFMEMORY; > - } > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, pszFileType); > + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); > return hr; > } Basically you remove everything, and tests don't show that you should do that. For example looking at Win7 registry I see HKCR\.exe with default value of "exefile", then default value for HKCR\exefile is Application (and also there is a FriendlyTypeName key that's most likely localized). Current code will return "Application" and that seems like a better candidate for a friendly name. A convincing test should create a custom extension key, and test all possible combinations of empty default values, missing keys with default value name etc. > > @@ -623,41 +639,28 @@ get_friendly_name_fail: > case ASSOCSTR_DEFAULTICON: > { > static const WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; > - WCHAR *pszFileType; > DWORD ret; > DWORD size; > - HKEY hkeyFile; > > - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); > - if (FAILED(hr)) > - return hr; > - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); > + size = 0; > + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > if (ret == ERROR_SUCCESS) > { > - size = 0; > - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); > - if (ret == ERROR_SUCCESS) > + WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); > + if (icon) > { > - WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); > - if (icon) > - { > - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); > - if (ret == ERROR_SUCCESS) > - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); > - else > - hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, icon); > - } > + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); > + if (ret == ERROR_SUCCESS) > + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); > else > - hr = E_OUTOFMEMORY; > + hr = HRESULT_FROM_WIN32(ret); > + HeapFree(GetProcessHeap(), 0, icon); > } > else > - hr = HRESULT_FROM_WIN32(ret); > - RegCloseKey(hkeyFile); > + hr = E_OUTOFMEMORY; > } > else > hr = HRESULT_FROM_WIN32(ret); > - HeapFree(GetProcessHeap(), 0, pszFileType); > return hr; > } Same.

1 0

Re: shell32/tests: Fix okShell()'s tracing so it takes todo and other flags into account.
by Marvin 06 Feb '16

06 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20233 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=29 err=32 shlexec.c:2436: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde")]' shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=29 err=2 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt7EA7.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=29 err=32 shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=29 err=2 shlexec.c:2422: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2424: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtEC4F.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=29 err=32

1 0

Re: [1/2] tests: Add winetest_status() which indicates what to do with a test result.
by Alexandre Julliard 06 Feb '16

06 Feb '16

Francois Gouget <fgouget(a)codeweavers.com> writes: > winetest_status() takes into account not just the condition but also > the todo level, debug level, whether to report successful tests; and > returns the test status and whether to trace its result. > This allows individual tests to do their own logging taking into account all these flags. > > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Honestly, this thing is getting out of hand. Not only is this adding a lot of complexity for a trivial difference in output, but it has actually made the traces less readable IMO. Can we please get rid of the fancy macros and go back to printing the relevant information in the ok() calls, like all other tests do? Pretty please? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20228 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:144: Test failed: 3: got needed length 18 assoc.c:144: Test failed: 5: got needed length 18 === w2003std (32 bit assoc) === assoc.c:144: Test failed: 3: got needed length 18 assoc.c:144: Test failed: 5: got needed length 18 === wvistau64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 19 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 19 === w2008s64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w7u (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 16 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 16 === w7pro64 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w8 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w864 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w1064 (32 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === wvistau64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 19 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 19 === w2008s64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w7pro64 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w864 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18 === w1064 (64 bit assoc) === assoc.c:140: Test failed: 2: GetString failed, 0x8007007a assoc.c:144: Test failed: 3: got needed length 18 assoc.c:140: Test failed: 4: GetString failed, 0x8007007a assoc.c:144: Test failed: 5: got needed length 18

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20227 Your paranoid android. === wvistau64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7u (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w8 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === wvistau64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 06 Feb '16

06 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20226 Your paranoid android. === wvistau64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7u (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w8 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (32 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === wvistau64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w2008s64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w7pro64 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w864 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a === w1064 (64 bit assoc) === assoc.c:136: Test failed: 2: GetString failed, 0x8007007a

1 0

Re: [PATCH 3/5] ddraw/tests: Rewrite rectangle_settings().
by Marvin 06 Feb '16

06 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20225 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/5] ddraw/tests: Rewrite offscreen_test().
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20224 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/5] ddraw/tests: Rewrite yv12_test().
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20223 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/7] wined3d: Move internal format queries to separate function.
by Henri Verbeet 05 Feb '16

05 Feb '16

On 5 February 2016 at 15:08, Józef Kucia <jkucia(a)codeweavers.com> wrote: > adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); > adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); > srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) > && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); > It seems wasteful to do this for each format.

1 0

Re: [PATCH] usp10: Implement fOverrideDirection
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20222 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1437: Test failed: 0: uJustification incorrect (0) usp10.c:1437: Test failed: 1: uJustification incorrect (0) usp10.c:1437: Test failed: 2: uJustification incorrect (0) usp10.c:1437: Test failed: 3: uJustification incorrect (0) usp10.c:1437: Test failed: 4: uJustification incorrect (0) usp10.c:1437: Test failed: 5: uJustification incorrect (0) usp10.c:1437: Test failed: 6: uJustification incorrect (0) usp10.c:1437: Test failed: 7: uJustification incorrect (0) usp10.c:1437: Test failed: 8: uJustification incorrect (0) usp10.c:1437: Test failed: 9: uJustification incorrect (0) usp10.c:1453: Test failed: 3: uJustification incorrect (0) usp10.c:1453: Test failed: 5: fDiacritic incorrect (1) usp10.c:1453: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1453: Test failed: 15: fDiacritic incorrect (1) usp10.c:1453: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [2/2] shell32/tests: Fix okShell() so it takes all logging options into account.
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20213 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 === w1064 (64 bit shlexec) === shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32 shlexec.c:2443: Test failed: failed: rc=29 err=2 shlexec.c:2441: Test failed: ShlexecVar expected 'Present', but key not found or empty shlexec.c:2443: Test failed: failed: rc=29 err=32

1 0

Re: uxtheme: test and fix CloseThemeData with invalid handle value
by Alexandre Julliard 05 Feb '16

05 Feb '16

Piet Jankbal <xerox.xerox2000x(a)gmail.com> writes: > Hi, this fixes https://bugs.winehq.org/show_bug.cgi?id=29862 > > signed off: Louis Lenders Please add a Signed-off-by header in the correct format. Also why are you sending this under a different name? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Add test MultiByteToWideChar for code page is 936. (try 2)
by Alexandre Julliard 05 Feb '16

05 Feb '16

Changhui LIU <chliu027028(a)gmail.com> writes: > + BOOL vistaOrLater = FALSE; > + OSVERSIONINFOA osvi; > + > + memset(&osvi, 0, sizeof(osvi)); > + osvi.dwOSVersionInfoSize = sizeof(osvi); > + GetVersionExA(&osvi); > + vistaOrLater = (osvi.dwMajorVersion > 5); Please don't do version checks in tests. You can mark the old behavior as broken if necessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v5 PATCH 1/2] gdiplus: Implement GdipSetPenTransform
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20197 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [v5 PATCH 2/2] gdiplus: Implement GdipResetPenTransform
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20198 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v5 PATCH 2/2] gdiplus: Implement GdipResetPenTransform
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20195 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v5 PATCH 1/2] gdiplus: Implement GdipSetPenTransform
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20194 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] dwrite/tests: Remove failing test line, we have skips for this now
by Marvin 05 Feb '16

05 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20191 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v4 PATCH 2/3] gdiplus: Implement GdipSetPenTransform
by Vincent Povirk 04 Feb '16

04 Feb '16

Why did you remove the TRACE from this function?

1 0

Re: [PATCH 3/6] wined3d: Add support for separate sRGB formats.
by Henri Verbeet 04 Feb '16

04 Feb '16

On 4 February 2016 at 01:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > - factory->wined3d = wined3d_create(0); > + factory->wined3d = wined3d_create(WINED3D_SEPARATE_SRGB_FORMATS); In some ways I like this, although I wonder if it wouldn't make more sense to handle this in terms of a flag to enable support for SRGB_READ/SRGB_WRITE. I.e., when WINED3D_SAMP_SRGB_TEXTURE and WINED3D_RS_SRGBWRITEENABLE are supported, WINED3DFMT_R8G8B8A8_UNORM and WINED3DFMT_R8G8B8A8_UNORM_SRGB would effectively be the same, while when they aren't you'd get the d3d10+ behaviour. > @@ -5993,7 +5994,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) > return WINED3D_OK; > } > > - if (!wined3d_adapter_init(&wined3d->adapters[0], 0)) > + if (!wined3d_adapter_init(&wined3d->adapters[0], wined3d, 0)) I'm not a huge fan of this, although I could probably live with it. I guess it's mostly to get at wined3d->flags during format initialization, in which case it may be sufficient to just pass the flags to wined3d_adapter_init(). > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index 1904dd1..718aa18 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -58,8 +58,11 @@ static const struct wined3d_format_channels formats[] = > {WINED3DFMT_DXT4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_DXT5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC1_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC1_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC2_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC2_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_BC3_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > + {WINED3DFMT_BC3_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_G8R8_G8B8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, > {WINED3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, One thought I have about this is that we could just store the channel sizes and shifts for the typeless formats, and then have the typed formats copy the information from there, perhaps instead of the format_base_flags[] table we have now. So you'd have something like this: {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, UNORM, UNORM, UNORM, UNORM} {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_TYPELESS, UNORM, UNORM, UNORM, UNORM} {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, SNORM, SNORM, SNORM, SNORM} {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, UINT, UINT, UINT, UINT} {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, SINT, SINT, SINT, SINT} > @@ -2237,7 +2255,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, > format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); > > if (!gl_info->supported[ARB_DEPTH_TEXTURE] > - && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) > + && !!texture_info && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) The "!!" before texture_info seems unnecessary. > +static inline BOOL should_use_separate_srgb_gl_texture(const struct wined3d_context *context) That's a fairly long function name. Not that I have a better suggestion though. > +{ > + return !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] > + && !(context->swapchain->device->wined3d->flags & WINED3D_SEPARATE_SRGB_FORMATS); > +} The number of pointer dereferences in here is scary. :) (Yeah, I know, there are other places that are just as bad.) Maybe it makes sense to store a copy of the flags in struct d3d_info?

2 1

Re: kernel32: Add test MultiByteToWideChar for code page is 936.
by Alexandre Julliard 04 Feb '16

04 Feb '16

Changhui LIU <chliu027028(a)gmail.com> writes: > +static void test_cp936_to_widechar(void) > +{ > + int count = 0; > + int count2 = 0; > + WCHAR wide_buf[4]; > + unsigned char buf[] = {0xbf, 0xb4, 0xc7}; > + > + count = MultiByteToWideChar(936, 0, (char*)&buf[0], sizeof(buf), NULL, 0); > + ok(count > 0, "returned %d (expected > '0')\n", count); > + > + count2 = MultiByteToWideChar(936, 0, (char*)&buf[0], sizeof(buf), wide_buf, count); > + todo_wine ok(count2 > 0, "returned %d (expected > '0')\n", count2); > + > + todo_wine ok(count == count2, "expected twice call result is same\n"); That test could be more strict, I expect that there's a defined behavior, not just > 0. Comparing with the results from MB_ERR_INVALID_CHARS would also be interesting. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hhctrl.ocx: Store window position in registry so that it's persistent between runs.
by Jacek Caban 04 Feb '16

04 Feb '16

On 02/04/16 13:05, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/hhctrl.ocx/help.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 68 insertions(+), 3 deletions(-) Please ignore this patch. It's not the right fix. Jacek

1 0

Re: [PATCH] include: Add IColumnsInfo interface (resend)
by Nikolay Sivov 04 Feb '16

04 Feb '16

On 04.02.2016 12:31, Alistair Leslie-Hughes wrote: > +[ > + object, > + uuid(0c733a11-2a1c-11ce-ade5-00aa0044773d), > + pointer_default(unique) > +] > +interface IColumnsInfo : IUnknown > +{ > + [local] > + HRESULT GetColumnInfo([in, out] DBORDINAL *columns,[out, size_is(*columns)] DBCOLUMNINFO **colinfo, > + [out] OLECHAR *stringsbuffer); > + > + [call_as(GetColumnInfo)] > + HRESULT RemoteGetColumnInfo([in, out] DBORDINAL *columns, [out, size_is((ULONG)*columns)] DBCOLUMNINFO **col_info, > + [out, size_is((ULONG)*columns)] DBBYTEOFFSET **name_offsets, > + [out, size_is((ULONG)*columns)] DBBYTEOFFSET **columnid_offsets, > + [in, out] DBLENGTH *string_len, [in, out, unique, size_is((ULONG)*string_len)] OLECHAR **stringsbuffer, > + [out] IErrorInfo **error); > + ULONG in SDK comes from DBORDINAL being ULONGLONG vs ULONG depending on bitness, I agree we probably don't have to duplicate that, and can always use cast. In any case size_is attribute is used in a wrong way, and at least one method prototype does not match SDK.

1 0

Re: [PATCH] usp10: Correct math punctuation handling in itemization
by Marvin 03 Feb '16

03 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20174 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1284: Test failed: 0: uJustification incorrect (0) usp10.c:1284: Test failed: 1: uJustification incorrect (0) usp10.c:1284: Test failed: 2: uJustification incorrect (0) usp10.c:1284: Test failed: 3: uJustification incorrect (0) usp10.c:1284: Test failed: 4: uJustification incorrect (0) usp10.c:1284: Test failed: 5: uJustification incorrect (0) usp10.c:1284: Test failed: 6: uJustification incorrect (0) usp10.c:1284: Test failed: 7: uJustification incorrect (0) usp10.c:1284: Test failed: 8: uJustification incorrect (0) usp10.c:1284: Test failed: 9: uJustification incorrect (0) usp10.c:1300: Test failed: 3: uJustification incorrect (0) usp10.c:1300: Test failed: 5: fDiacritic incorrect (1) usp10.c:1300: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1300: Test failed: 15: fDiacritic incorrect (1) usp10.c:1300: Test failed: 15: fZeroWidth incorrect (1)

2 1

Re: [v3 PATCH 2/3] gdiplus: Implement GdipSetPenTransform
by Vincent Povirk 03 Feb '16

03 Feb '16

I think we should keep the FIXME on this one until we use the transform in rendering, maybe change it to semi-stub.

1 0

Re: [PATCH 1/6] d3d11: Implement d3d11_device_CheckMultisampleQualityLevels().
by Henri Verbeet 03 Feb '16

03 Feb '16

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: [5/5] webservices: Implement WsWriteStartCData and WsWriteEndCData.
by Marvin 03 Feb '16

03 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20164 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH v5] user32: Add MOUSEHOOKSTRUCTEX to improve mouse wheel support
by Alex Henrie 03 Feb '16

03 Feb '16

+typedef struct +{ + struct { /* MOUSEHOOKSTRUCT */ + POINT pt; + HWND hwnd; + UINT wHitTestCode; + ULONG_PTR dwExtraInfo; + } DUMMYSTRUCTNAME; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; Other than the excessive indentation in "DWORD mouseData", this patch looks good, and the user32 tests still pass on my machine. -Alex

1 0

Re: [PATCH 6/6] ddraw: Replace wined3d_surface_preload() with wined3d_texture_preload().
by Henri Verbeet 01 Feb '16

01 Feb '16

On 31 January 2016 at 11:22, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > Also removed wined3d_surface_preload as it's now unused > > Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> > --- > dlls/ddraw/device.c | 2 +- > dlls/wined3d/surface.c | 13 ------------- > dlls/wined3d/wined3d.spec | 1 - > include/wine/wined3d.h | 1 - > 4 files changed, 1 insertion(+), 16 deletions(-) > You may have noticed that I started working on this myself instead, and this patch is practically a duplicate of 118671.

2 3

Re: [PATCH 5/5] dwrite: Remove some redundant includes
by Marvin 01 Feb '16

01 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20128 Your paranoid android. === wvistau64 (32 bit layout) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [v3] msvcrt: handle of thread created by _beginthread should not be closed on thread detach.
by Piotr Caban 01 Feb '16

01 Feb '16

Hi, On 02/01/16 12:00, Paul Gofman wrote: > + /* _beginthreadex: handle is not closed on _endthread */ > + hThread = (HANDLE)_beginthreadex(NULL,0, test_thread_func_ex, NULL, 0, NULL); > + ok(hThread != INVALID_HANDLE_VALUE, "_beginthreadex failed (%d)\n", errno); _beginthreadex returns 0 in case of error (not INVALID_HANDLE_VALUE). Except of it the patch looks good for me. Thanks, Piotr

1 0

Re: [v2] msvcrt: handle of thread created by _beginthread should not be closed on thread detach.
by Piotr Caban 01 Feb '16

01 Feb '16

Hi Paul, On 01/31/16 22:58, Paul Gofman wrote: > + /* _beginthread: handle is not closed on ExitProcess and _endthreadex */ > + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); > + Sleep(150); > + ret = WaitForSingleObject(hThread, INFINITE); > + ok(ret == WAIT_FAILED, "ret = %d\n", ret); This test may fail if for some reason thread has not finished during 150ms sleep. You can workaround this issue following way: hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); WaitForSingleObject(hThread, INFINITE); ret = CloseHandle(hThread); ok(!ret, "ret = %d\n", ret); > @@ -69,6 +69,9 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) > MSVCRT_free(arg); > > local_trampoline.start_address(local_trampoline.arglist); > + > + CloseHandle(data->handle); > + data->handle = NULL; According to MSDN _endthread should be called here. Because it's documented I think we should implement it in similar way. > @@ -136,8 +139,18 @@ MSVCRT_uintptr_t CDECL _beginthreadex( > */ > void CDECL _endthread(void) > { > + thread_data_t *tls; > + > TRACE("(void)\n"); > > + tls = TlsGetValue(msvcrt_tls_index); > + if (tls && tls->handle) You should check for INVALID_HANDLE_VALUE instead of NULL here. It's doesn't really matter but for sake of consistency tls->handle should be set to INVALID_HANDLE_VALUE after close. Thanks, Piotr

2 1

Re: [PATCH] server: Implement serial port read interval timeouts.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39875 > > There is a test program attached to the bug report. > > Version 3 has all the logic in serial.c, even though this required > adding a getter in async.c and another getter in fd.c. The first > interval timeout no longer trashes subsequent interval timeouts or > the total timeout, and absolute timeouts are used exclusively. You should be able to do this without adding all the extra getter functions. I'd suggest something along these lines (completely untested): diff --git a/server/serial.c b/server/serial.c index 164a4b1fe717..04b517dd347e 100644 --- a/server/serial.c +++ b/server/serial.c @@ -62,12 +62,15 @@ static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial { struct object obj; struct fd *fd; + struct timeout_user *read_timer; + /* timeout values */ unsigned int readinterval; unsigned int readconst; @@ -115,7 +118,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ + serial_reselect_async, /* reselect_async */ default_fd_cancel_async /* cancel_async */ }; @@ -134,6 +137,7 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->read_timer = NULL; serial->readinterval = 0; serial->readmult = 0; serial->readconst = 0; @@ -157,6 +161,7 @@ static struct fd *serial_get_fd( struct object *obj ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; + if (serial->read_timer) remove_timeout_user( serial->read_timer ); release_object( serial->fd ); } @@ -203,6 +208,34 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } +static void serial_read_timeout( void *arg ) +{ + struct serial *serial = arg; + + serial->read_timer = NULL; + fd_async_wake_up( serial->fd, ASYNC_TYPE_READ, STATUS_TIMEOUT ); +} + +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct serial *serial = get_fd_user( fd ); + + if (serial->read_timer) + { + if (!(default_fd_get_poll_events( fd ) & POLLIN)) + { + remove_timeout_user( serial->read_timer ); + serial->read_timer = NULL; + } + } + else if (!serial->read_timer && serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + { + serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial_read_timeout, serial ); + } + default_fd_reselect_async( fd, queue ); +} + DECL_HANDLER(get_serial_info) { struct serial *serial; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] user32: A window may be notified with WM_CAPTURECHANGED about itself gaining mouse capture if SetCapture() i
by Marvin 01 Feb '16

01 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20123 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 === w1064 (64 bit msg) === msg.c:7246: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH] user32: Allow WM_CAPTURECHANGED indicating SetCapture() parameter
by Ken Thomases 01 Feb '16

01 Feb '16

On Jan 31, 2016, at 7:18 PM, Christopher Thielen <cthielen(a)gmail.com> wrote: > > A window may be notified with WM_CAPTURECHANGED about itself > gaining mouse capture if it calls SetCapture() twice. > > Tested on Windows XP and Fedora Workstation 22. > > Revised to simplify based on wine-devel feedback. > Revised to address any side-effects of new WM_CAPTURECHANGED > messages. The changes to comctl32 should be in a separate patch. In general, changes to different DLLs should be in separate patches unless it can't be avoided. The comctl32 patch should come before the change to when WM_CAPTURECHANGED is sent so that things aren't broken part-way through the patch series. You might also put the button.c changes in a separate patch, too. > case WM_CAPTURECHANGED: > - return TOOLBAR_CaptureChanged(infoPtr); > + if(hwnd != lParam) > + { > + return TOOLBAR_CaptureChanged(infoPtr); > + } > + else > + { > + return 0; > + } The second return can be hoisted out of the else since the true branch can't fall through. Also, you can reverse the logic, so the code can look like: case WM_CAPTURECHANGED: if(hwnd == lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); I think that's clearer and also a smaller diff. Same for the other files. Cheers, Ken

2 1

Re: [PATCH] user32: Allow WM_CAPTURECHANGED indicating SetCapture() parameter
by Marvin 01 Feb '16

01 Feb '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20122 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

1 0

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

31 Jan '16

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 31 Jan '16

31 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 29 Jan '16

29 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 28 Jan '16

28 Jan '16

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 28 Jan '16

28 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=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 27 Jan '16

27 Jan '16

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 27 Jan '16

27 Jan '16

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 27 Jan '16

27 Jan '16

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 27 Jan '16

27 Jan '16

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 27 Jan '16

27 Jan '16

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

Re: shell32/tests: Fix a couple of okChildPath()/okChildString() mixups.
by Marvin 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20002 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2368: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt714C.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt714C.tmp\test file.sde")]' shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Show that verbs and classes override ShellExecute()'s normal handling of executables.
by Marvin 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20001 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1610: Test failed: WaitForSingleObject returned 258 === w1064 (32 bit shlexec) === shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2382: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt4F85.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt4F85.tmp\test file.sde")]' shlexec.c:2370: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: failed: rc=29 err=2

1 0

Re: shell32/tests: Test handling of nonexistent verbs in ShellExecute() & co.
by Marvin 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20000 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2370: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtAA64.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtAA64.tmp\test file.sde")]' shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2 shlexec.c:2358: Test failed: failed: rc=29 err=2

1 0

Re: [PATCH 5/8] wined3d: Fail texture creation when invalid multisample settings are specified.
by Henri Verbeet 27 Jan '16

27 Jan '16

On 26 January 2016 at 22:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -1137,6 +1137,8 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width > { > wined3d_mutex_unlock(); > WARN("Failed to create texture, hr %#x.\n", hr); > + if (hr == D3DERR_NOTAVAILABLE) > + hr = D3DERR_INVALIDCALL; That should check for WINED3DERR_NOTAVAILABLE.

1 0

Re: [PATCH v3 4/8] wined3d: Add a real implementation of wined3d_check_device_multisample_type().
by Henri Verbeet 27 Jan '16

27 Jan '16

On 26 January 2016 at 22:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (format->glInternal > + && (format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_RENDERTARGET > + || format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH > + || format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_STENCIL)) It's not the worst thing in the world, but I think you meant "format->flags[WINED3D_GL_RES_TYPE_RB] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)"?

1 0

Re: [PATCH 2/2] kernel32/tests: Add tests for the TRUE pathway of GetCurrentConsoleFont
by Marvin 27 Jan '16

27 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19992 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 1210300685 console.c:1445: Test failed: [15] Expected output count to be 0, got 1210300685 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1210300685 console.c:1689: Test failed: [13] Expected output count to be 0, got 1210300685 console.c:1689: Test failed: [15] Expected output count to be 0, got 1210300685 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1210300685 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3069051044 console.c:1445: Test failed: [15] Expected output count to be 0, got 3069051044 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3069051044 console.c:1689: Test failed: [13] Expected output count to be 0, got 3069051044 console.c:1689: Test failed: [15] Expected output count to be 0, got 3069051044 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3069051044 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3792776332 console.c:1445: Test failed: [15] Expected output count to be 0, got 3792776332 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3792776332 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3792776332 console.c:1689: Test failed: [15] Expected output count to be 0, got 3792776332 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3792776332 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0

2 1

calling dll native entry point for mixed assemblies
by Paul Gofman 26 Jan '16

26 Jan '16

Hi Vincent, thank you for your help so far and sorry for disturbing you with my patches again so soon. While looking a bit further into my app under Wine I found out that some mixed assemblies are completely broken under Wine/Mono due to the fact that native entry point is not called at all. It relates to both 32 bit and 64 bit. 32 bit works fine under native MS .Net which apparently does call the entry point. The entry point address is present in IMAGE_COR20_HEADER (when appropriate flag is set in Flags member). It is DllMain-type entry point having the same parameters. This entry point does static initialization, e. g. calls all the constructors for static classes. I am attaching preliminary patch to illustrate what I am talking about. It would be great if you could give some high level feedback on whether you like the idea of doing this in general before I will be spamming it to wine-patches. The potential issue which I can imagine with it is that if there are some old apps (built with VS 2003) which called CLR code in native init but by chance worked if native init was not called at all, may stop working. MSDN says that such apps could non-deterministically deadlock when loaded; with Wine/Mono they will lock deterministically I think ( https://msdn.microsoft.com/en-us/library/ms173266.aspx). Still I suppose the issue with entry point should be addressed somehow since it affects "normal" newer applications. Regards, Paul.

2 6

Re: include: Create todo_wine_if.
by Sebastian Lackner 26 Jan '16

26 Jan '16

On 26.01.2016 18:06, Bernhard Übelacker wrote: > Currently list based tests, where just some elements are todo_wine, need > the same ok()-line twice, one without and one with todo_wine. > (e.g. dlls/msvcr120/tests/msvcr120.c line 243) > > This patch makes it possible to use a single ok()-line > prefixed with a todo_wine_if(condition). > e.g.: > todo_wine_if(tests[i].todo) > ok(...); > > Questions: > - Is "todo_level" ever supposed to have a value greater than 1? I don't know if its used in practice anywhere, but the old way handling of nested todo_wines was definitely more clear than your new proposed method. I would suggest to keep this "feature", even when its probably not used in the Wine source. The first idea which comes to my mind would be to store it in a bitmask (which allows at least up to 32 bit nested todos when declaring todo_level as unsigned integer value). For example: start: todo_level = (todo_level << 1) | (is_todo != 0); testing: if (todo_level != 0) end: todo_level >>= 1; > > Changes: > 2016-01-26: > - Give parameter is_todo just to *start_dodo. > - Decrement in *end_todo just when todo_level > 0. > > 2016-01-22: > - First version > (Thanks to Sebastian Lackner for review.) > Comments: https://www.winehq.org/pipermail/wine-devel/2016-January/111386.html > --- > include/wine/test.h | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) >

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop
by André Hentschel 26 Jan '16

26 Jan '16

Hi, Could you please explain what is happing that causes the crash? Also you should move "res" into the right scope, then you also don't need to initialize it. Am 07.01.2016 um 09:49 schrieb Jianqiu Zhang: > From 064be8949c53e43ba56a586d30d2186e5da8cb06 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Tue, 5 Jan 2016 09:12:42 +0800 > Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index da911c7..0c725a4 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -95,7 +95,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h > TRACE("(%p %p %p)\n", user_data, h, p); > pcb = (PCAP_HANDLER_CALLBACK *)user_data; > pcb->pfn_cb(pcb->user_data, h, p); > - HeapFree(GetProcessHeap(), 0, pcb); > TRACE("Callback COMPLETED\n"); > } > > @@ -103,6 +102,7 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, > void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), > unsigned char *user) > { > + int res = 0; > TRACE("(%p %i %p %p)\n", p, cnt, callback, user); > > if (callback) > @@ -111,7 +111,9 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_dispatch(p, cnt, NULL, user); > @@ -196,6 +198,7 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, > void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), > unsigned char *user) > { > + int res = 0; > TRACE("(%p %i %p %p)\n", p, cnt, callback, user); > > if (callback) > @@ -204,7 +207,9 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_loop(p, cnt, NULL, user); > -- > 2.6.4 > > >

2 2

Re: Revert "winex11.drv: Fix IME status handling."
by Aric Stewart 26 Jan '16

26 Jan '16

Sorry, I missed I was assigned to this. I dont know if reverting right away is the right path, did you explore adding XIMStatusCallbacks to the XCreateIC call? If not, then is there a way to detect that XNPreeditStartCallback is not being utilized? Maybe have a flag or something that gets set in addition to the IME_SetOpenStatus call, then if we go straight into XIMPreEditStartCallback without having seen the PreeditStartCallback we do the opening automatically, like we did before, but without the revert? -aric

2 2

Re: wininet/tests: Fix test failures.
by Marvin 26 Jan '16

26 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19970 Your paranoid android. === w1064 (32 bit http) === http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1773: Test failed: Expected 2, got 4 http.c:1774: Test failed: Expected CRLF, got ' http.c:2408: Test failed: count was wrong http.c:2409: Test failed: http data wrong, got: Garbage: Header http.c:3072: Test failed: HttpAddRequestHeaders succeeded http.c:3073: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

2 1

Re: [PATCH 3/3] ddraw: DDSCAPS_ALLOCONLOAD requires DDSCAPS_TEXTURE.
by Marvin 26 Jan '16

26 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19964 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2339: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2188: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2524: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/3] ddraw: DDSCAPS_ALLOCONLOAD doesn't override DDSD_LPSURFACE.
by Marvin 25 Jan '16

25 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19963 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2339: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2188: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2524: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/3] ddraw: DDSD_LPSURFACE requires a non-NULL lpSurface.
by Marvin 25 Jan '16

25 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19962 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH] xaudio2: Report incoming underruns to the application
by Andrew Eikum 25 Jan '16

25 Jan '16

This won't apply. I'll send a new version. Andrew On Mon, Jan 25, 2016 at 12:54:49PM -0600, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > This should fix Bug 39092. > > dlls/xaudio2_7/xaudio_dll.c | 41 ++++++++++++++++++++++++++++++++++++----- > 1 file changed, 36 insertions(+), 5 deletions(-) > > diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c > index 8ae1a24..4c41016 100644 > --- a/dlls/xaudio2_7/xaudio_dll.c > +++ b/dlls/xaudio2_7/xaudio_dll.c > @@ -40,6 +40,8 @@ static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei > > static HINSTANCE instance; > > +#define IN_AL_PERIODS 4 > + > #if XAUDIO2_VER == 0 > #define COMPAT_E_INVALID_CALL E_INVALIDARG > #define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED > @@ -2485,6 +2487,32 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al > return buf->offs_bytes < buf->cur_end_bytes; > } > > +static UINT32 get_underrun_warning(XA2SourceImpl *src) > +{ > + UINT32 period_bytes = src->xa2->period_frames * src->submit_blocksize; > + UINT32 total = 0, i; > + > + if(IS_WMA(src->fmt->wFormatTag)) > + /* PCM only */ > + return 0; > + > + for(i = 0; i < src->nbufs && total < IN_AL_PERIODS * period_bytes; ++i){ > + XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; > + total += buf->cur_end_bytes - buf->offs_bytes; > + if(buf->xa2buffer.LoopCount == XAUDIO2_LOOP_INFINITE) > + return 0; > + if(buf->xa2buffer.LoopCount > 0){ > + total += (buf->loop_end_bytes - buf->xa2buffer.LoopBegin) * (buf->xa2buffer.LoopCount - buf->looped); > + total += buf->play_end_bytes - buf->loop_end_bytes; > + } > + } > + > + if(total >= IN_AL_PERIODS * period_bytes) > + return 0; > + > + return ((IN_AL_PERIODS * period_bytes - total) / period_bytes + 1) * period_bytes; > +} > + > /* Looping: > * > * The looped section of a buffer is a subset of the play area which is looped > @@ -2500,7 +2528,7 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al > * > * In the simple case, playback will start at PlayBegin. At LoopEnd, playback > * will move to LoopBegin and repeat that loop LoopCount times. Then, playback > - * will cease at LoopEnd. > + * will cease at PlayEnd. > * > * If PlayLength is zero, then PlayEnd is the end of the buffer. > * > @@ -2560,9 +2588,9 @@ static void update_source_state(XA2SourceImpl *src) > > alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); > > - /* maintain 4 periods in AL */ > + /* maintain IN_AL_PERIODS periods in AL */ > while(src->cur_buf != (src->first_buf + src->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS && > - src->in_al_bytes - bufpos < 4 * src->xa2->period_frames * src->submit_blocksize){ > + src->in_al_bytes - bufpos < IN_AL_PERIODS * src->xa2->period_frames * src->submit_blocksize){ > TRACE("%p: going to queue a period from buffer %u\n", src, src->cur_buf); > > /* starting from an empty buffer */ > @@ -2640,8 +2668,11 @@ static void do_engine_tick(IXAudio2Impl *This) > #if XAUDIO2_VER == 0 > IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); > #else > - /* TODO: detect incoming underrun and inform callback */ > - IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, 0); > + UINT32 underrun; > + underrun = get_underrun_warning(src); > + if(underrun > 0) > + TRACE("Calling OnVoiceProcessingPassStart with BytesRequired: %u\n", underrun); > + IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, underrun); > #endif > } > > -- > 2.7.0 > > >

1 0

Re: include: Add d3dx10math.h/inl
by Matteo Bruni 25 Jan '16

25 Jan '16

2016-01-07 8:16 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > The d3dx10math.h guard has the define as in d3dx9math.h, which is > to prevent double-inclusion. This is the same as the DirectX SDK. > > This is just a copy of d3dx9math.h/inl with the following changes > - D3D9_VIEWPORT -> D3D10_VIEWPORT > - Copied D3DVECTOR, D3DMATRIX types from d3d9types.h This makes part of the review (which is late, sorry about that :/) very easy by checking the diff with the corresponding d3dx9 headers. Unfortunately the comment from MS's d3dx10math.h isn't quite right (i.e. the d3dx10 header doesn't perfectly match the d3dx9 header) and our d3dx9math.h isn't exactly a paragon of quality. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > include/Makefile.in | 2 + > include/d3dx10.h | 1 + > include/d3dx10math.h | 500 +++++++++++++++++++ > include/d3dx10math.inl | 1298 ++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 1801 insertions(+) > create mode 100644 include/d3dx10math.h > create mode 100644 include/d3dx10math.inl > > diff --git a/include/Makefile.in b/include/Makefile.in > index ea0e3fd..ac5e9ea 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -247,6 +247,8 @@ HEADER_SRCS = \ > d3dvec.inl \ > d3dx10.h \ > d3dx10async.h \ > + d3dx10math.h \ > + d3dx10math.inl \ > d3dx9.h \ > d3dx9anim.h \ > d3dx9core.h \ > diff --git a/include/d3dx10.h b/include/d3dx10.h > index df7cdb1..b3825b3 100644 > --- a/include/d3dx10.h > +++ b/include/d3dx10.h > @@ -27,6 +27,7 @@ > #define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) > > #include "d3d10.h" > +#include "d3dx10math.h" > #include "d3dx10core.h" > #include "d3dx10async.h" > > diff --git a/include/d3dx10math.h b/include/d3dx10math.h > new file mode 100644 > index 0000000..5ef8738 > --- /dev/null > +++ b/include/d3dx10math.h > @@ -0,0 +1,500 @@ > +/* > + * Copyright (C) 2007 David Adam > + * Copyright (C) 2007 Tony Wasserka > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <d3dx10.h> > + > +/* This guaud is the same as D3DX9 to prevent double-inclusion */ Typo. > +#ifndef __D3DX9MATH_H__ > +#define __D3DX9MATH_H__ > + > +#include <math.h> > + > +#define D3DX_PI ((FLOAT)3.141592654) > +#define D3DX_1BYPI ((FLOAT)0.318309886) In d3dx10math.h these use double constants (and they actually make use of the additional available precision). > + > +#define D3DXSH_MINORDER 2 > +#define D3DXSH_MAXORDER 6 > + > +#define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f)) > +#define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI)) Same for those two. > + > +/* Copied from d3d9types.h */ > +#ifndef D3DVECTOR_DEFINED > +typedef struct _D3DVECTOR { > + float x; > + float y; > + float z; > +} D3DVECTOR; > +#define D3DVECTOR_DEFINED > +#endif I don't think the comment adds much. While you're here, can you please put the '{' on its own line? > + > +#ifndef D3DMATRIX_DEFINED > +typedef struct _D3DMATRIX { > + union { > + struct { > + float _11, _12, _13, _14; > + float _21, _22, _23, _24; > + float _31, _32, _33, _34; > + float _41, _42, _43, _44; > + } DUMMYSTRUCTNAME; > + float m[4][4]; > + } DUMMYUNIONNAME; > +} D3DMATRIX; > +#define D3DMATRIX_DEFINED > +#endif > + > +typedef struct D3DXVECTOR2 > +{ > +#ifdef __cplusplus > + D3DXVECTOR2(); > + D3DXVECTOR2(const FLOAT *pf); > + D3DXVECTOR2(FLOAT fx, FLOAT fy); There should be an additional constructor from D3DXFLOAT16 *, here and for most of the other types. FWIW it should also be in the d3dx9 header. I guess it's not critical. Similarly, D3DXVECTOR{2,3,4}_16F are missing in both versions. > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXVECTOR2& operator += (const D3DXVECTOR2&); > + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); > + D3DXVECTOR2& operator *= (FLOAT); > + D3DXVECTOR2& operator /= (FLOAT); > + > + D3DXVECTOR2 operator + () const; > + D3DXVECTOR2 operator - () const; > + > + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; > + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; > + D3DXVECTOR2 operator * (FLOAT) const; > + D3DXVECTOR2 operator / (FLOAT) const; > + > + friend D3DXVECTOR2 operator * (FLOAT, const D3DXVECTOR2&); > + > + BOOL operator == (const D3DXVECTOR2&) const; > + BOOL operator != (const D3DXVECTOR2&) const; > +#endif /* __cplusplus */ > + FLOAT x, y; > +} D3DXVECTOR2, *LPD3DXVECTOR2; I think you can use plain "float" instead. Also, maybe it's just me, but I find the space between the keyword "operator" and the overloaded operator, or between the operator and the '(' ugly. Certainly not a big deal though. > + > +#ifdef __cplusplus > +typedef struct D3DXVECTOR3 : public D3DVECTOR > +{ > + D3DXVECTOR3(); > + D3DXVECTOR3(const FLOAT *pf); > + D3DXVECTOR3(const D3DVECTOR& v); > + D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz); > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXVECTOR3& operator += (const D3DXVECTOR3&); > + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); > + D3DXVECTOR3& operator *= (FLOAT); > + D3DXVECTOR3& operator /= (FLOAT); > + > + D3DXVECTOR3 operator + () const; > + D3DXVECTOR3 operator - () const; > + > + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; > + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; > + D3DXVECTOR3 operator * (FLOAT) const; > + D3DXVECTOR3 operator / (FLOAT) const; > + > + friend D3DXVECTOR3 operator * (FLOAT, const struct D3DXVECTOR3&); > + > + BOOL operator == (const D3DXVECTOR3&) const; > + BOOL operator != (const D3DXVECTOR3&) const; > +} D3DXVECTOR3, *LPD3DXVECTOR3; > +#else /* !__cplusplus */ > +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; > +#endif /* !__cplusplus */ > + > +typedef struct D3DXVECTOR4 > +{ > +#ifdef __cplusplus > + D3DXVECTOR4(); > + D3DXVECTOR4(const FLOAT *pf); > + D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw); This misses a constructor taking a D3DVECTOR and a float. Again, it's also missing from the d3dx9 version. > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXVECTOR4& operator += (const D3DXVECTOR4&); > + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); > + D3DXVECTOR4& operator *= (FLOAT); > + D3DXVECTOR4& operator /= (FLOAT); > + > + D3DXVECTOR4 operator + () const; > + D3DXVECTOR4 operator - () const; > + > + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; > + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; > + D3DXVECTOR4 operator * (FLOAT) const; > + D3DXVECTOR4 operator / (FLOAT) const; > + > + friend D3DXVECTOR4 operator * (FLOAT, const D3DXVECTOR4&); > + > + BOOL operator == (const D3DXVECTOR4&) const; > + BOOL operator != (const D3DXVECTOR4&) const; > +#endif /* __cplusplus */ > + FLOAT x, y, z, w; > +} D3DXVECTOR4, *LPD3DXVECTOR4; > + > +#ifdef __cplusplus > +typedef struct D3DXMATRIX : public D3DMATRIX > +{ > + D3DXMATRIX(); > + D3DXMATRIX(const FLOAT *pf); > + D3DXMATRIX(const D3DMATRIX& mat); > + D3DXMATRIX(FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, > + FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, > + FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, > + FLOAT f41, FLOAT f42, FLOAT f43, FLOAT f44); > + > + FLOAT& operator () (UINT row, UINT col); > + FLOAT operator () (UINT row, UINT col) const; > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXMATRIX& operator *= (const D3DXMATRIX&); > + D3DXMATRIX& operator += (const D3DXMATRIX&); > + D3DXMATRIX& operator -= (const D3DXMATRIX&); > + D3DXMATRIX& operator *= (FLOAT); > + D3DXMATRIX& operator /= (FLOAT); > + > + D3DXMATRIX operator + () const; > + D3DXMATRIX operator - () const; > + > + D3DXMATRIX operator * (const D3DXMATRIX&) const; > + D3DXMATRIX operator + (const D3DXMATRIX&) const; > + D3DXMATRIX operator - (const D3DXMATRIX&) const; > + D3DXMATRIX operator * (FLOAT) const; > + D3DXMATRIX operator / (FLOAT) const; > + > + friend D3DXMATRIX operator * (FLOAT, const D3DXMATRIX&); > + > + BOOL operator == (const D3DXMATRIX&) const; > + BOOL operator != (const D3DXMATRIX&) const; > +} D3DXMATRIX, *LPD3DXMATRIX; > +#else /* !__cplusplus */ > +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; > +#endif /* !__cplusplus */ > + > +typedef struct D3DXQUATERNION > +{ > +#ifdef __cplusplus > + D3DXQUATERNION(); > + D3DXQUATERNION(const FLOAT *pf); > + D3DXQUATERNION(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw); > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXQUATERNION& operator += (const D3DXQUATERNION&); > + D3DXQUATERNION& operator -= (const D3DXQUATERNION&); > + D3DXQUATERNION& operator *= (const D3DXQUATERNION&); > + D3DXQUATERNION& operator *= (FLOAT); > + D3DXQUATERNION& operator /= (FLOAT); > + > + D3DXQUATERNION operator + () const; > + D3DXQUATERNION operator - () const; > + > + D3DXQUATERNION operator + (const D3DXQUATERNION&) const; > + D3DXQUATERNION operator - (const D3DXQUATERNION&) const; > + D3DXQUATERNION operator * (const D3DXQUATERNION&) const; > + D3DXQUATERNION operator * (FLOAT) const; > + D3DXQUATERNION operator / (FLOAT) const; > + > + friend D3DXQUATERNION operator * (FLOAT, const D3DXQUATERNION&); > + > + BOOL operator == (const D3DXQUATERNION&) const; > + BOOL operator != (const D3DXQUATERNION&) const; > +#endif /* __cplusplus */ > + FLOAT x, y, z, w; > +} D3DXQUATERNION, *LPD3DXQUATERNION; > + > +typedef struct D3DXPLANE > +{ > +#ifdef __cplusplus > + D3DXPLANE(); > + D3DXPLANE(const FLOAT *pf); > + D3DXPLANE(FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd); > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + D3DXPLANE operator + () const; > + D3DXPLANE operator - () const; > + > + BOOL operator == (const D3DXPLANE&) const; > + BOOL operator != (const D3DXPLANE&) const; > +#endif /* __cplusplus */ > + FLOAT a, b, c, d; > +} D3DXPLANE, *LPD3DXPLANE; There should be two other overloaded operators, * and /, with their assignment version. > + > +typedef struct D3DXCOLOR > +{ > +#ifdef __cplusplus > + D3DXCOLOR(); > + D3DXCOLOR(DWORD col); > + D3DXCOLOR(const FLOAT *pf); > + D3DXCOLOR(const D3DCOLORVALUE& col); The last constructor was dropped in d3dx10. > + D3DXCOLOR(FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa); > + > + operator DWORD () const; > + > + operator FLOAT* (); > + operator const FLOAT* () const; > + > + operator D3DCOLORVALUE* (); > + operator const D3DCOLORVALUE* () const; > + > + operator D3DCOLORVALUE& (); > + operator const D3DCOLORVALUE& () const; Same with these conversions. > + > + D3DXCOLOR& operator += (const D3DXCOLOR&); > + D3DXCOLOR& operator -= (const D3DXCOLOR&); > + D3DXCOLOR& operator *= (FLOAT); > + D3DXCOLOR& operator /= (FLOAT); > + > + D3DXCOLOR operator + () const; > + D3DXCOLOR operator - () const; > + > + D3DXCOLOR operator + (const D3DXCOLOR&) const; > + D3DXCOLOR operator - (const D3DXCOLOR&) const; > + D3DXCOLOR operator * (FLOAT) const; > + D3DXCOLOR operator / (FLOAT) const; > + > + friend D3DXCOLOR operator * (FLOAT, const D3DXCOLOR&); > + > + BOOL operator == (const D3DXCOLOR&) const; > + BOOL operator != (const D3DXCOLOR&) const; > +#endif /* __cplusplus */ > + FLOAT r, g, b, a; > +} D3DXCOLOR, *LPD3DXCOLOR; > + > +typedef struct D3DXFLOAT16 > +{ > +#ifdef __cplusplus > + D3DXFLOAT16(); > + D3DXFLOAT16(FLOAT f); > + D3DXFLOAT16(const D3DXFLOAT16 &f); > + > + operator FLOAT (); > + > + BOOL operator == (const D3DXFLOAT16 &) const; > + BOOL operator != (const D3DXFLOAT16 &) const; > +#endif /* __cplusplus */ > + WORD value; > +} D3DXFLOAT16, *LPD3DXFLOAT16; > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, const D3DXCOLOR *pc, FLOAT s); Please consistently put a space between the type and the '*' (that maybe doesn't quite look as nice in those operator overloading declarations above and it's arguably a pretty standard practice in C++ to not put spaces before the '*' or '&' when the type is not followed by a variable, so I'm okay with no space there). Same for the other C prototypes below. > +D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, const D3DXCOLOR *pc, FLOAT s); > + > +FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex); > + > +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, FLOAT scaling, const D3DXVECTOR3 *rotationcenter, const D3DXQUATERNION *rotation, > + const D3DXVECTOR3 *translation); > +D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *pout, FLOAT scaling, const D3DXVECTOR2 *protationcenter, FLOAT rotation, > + const D3DXVECTOR2 *ptranslation); > +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, const D3DXMATRIX *pm); > +FLOAT WINAPI D3DXMatrixDeterminant(const D3DXMATRIX *pm); > +D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, const D3DXMATRIX *pm); > +D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup); > +D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup); > +D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2); > +D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2); > +D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixPerspectiveRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); > +D3DXMATRIX* WINAPI D3DXMatrixReflect(D3DXMATRIX *pout, const D3DXPLANE *pplane); > +D3DXMATRIX* WINAPI D3DXMatrixRotationAxis(D3DXMATRIX *pout, const D3DXVECTOR3 *pv, FLOAT angle); > +D3DXMATRIX* WINAPI D3DXMatrixRotationQuaternion(D3DXMATRIX *pout, const D3DXQUATERNION *pq); > +D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle); > +D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle); > +D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); > +D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle); > +D3DXMATRIX* WINAPI D3DXMatrixScaling(D3DXMATRIX *pout, FLOAT sx, FLOAT sy, FLOAT sz); > +D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, const D3DXVECTOR4 *plight, const D3DXPLANE *pPlane); > +D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, const D3DXVECTOR3 *pscalingcenter, const D3DXQUATERNION *pscalingrotation, const D3DXVECTOR3 *pscaling, const D3DXVECTOR3 *protationcenter, > + const D3DXQUATERNION *protation, const D3DXVECTOR3 *ptranslation); > +D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, const D3DXVECTOR2 *pscaling, > + const D3DXVECTOR2 *protationcenter, FLOAT rotation, const D3DXVECTOR2 *ptranslation); > +D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLOAT z); > +D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm); > + > +D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, const D3DXVECTOR3 *pvpoint, const D3DXVECTOR3 *pvnormal); > +D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3); > +D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, const D3DXPLANE *pp, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2); > +D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, const D3DXPLANE *pp); > +D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, const D3DXPLANE *pplane, const D3DXMATRIX *pm); > +D3DXPLANE* WINAPI D3DXPlaneTransformArray(D3DXPLANE *pout, UINT outstride, const D3DXPLANE *pplane, UINT pstride, const D3DXMATRIX *pm, UINT n); > + > +D3DXQUATERNION* WINAPI D3DXQuaternionBaryCentric(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3, FLOAT f, FLOAT g); > +D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); > +D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); > +D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); > +D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2); > +D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, const D3DXQUATERNION *pq); > +D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, const D3DXVECTOR3 *pv, FLOAT angle); > +D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, const D3DXMATRIX *pm); > +D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); > +D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, FLOAT t); > +D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3, > + const D3DXQUATERNION *pq4, FLOAT t); > +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, const D3DXQUATERNION *pq0, > + const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3); > +void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); > + > +D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pv3, FLOAT f, FLOAT g); > +D3DXVECTOR2* WINAPI D3DXVec2CatmullRom(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv0, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pv3, FLOAT s); > +D3DXVECTOR2* WINAPI D3DXVec2Hermite(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pt1, const D3DXVECTOR2 *pv2, const D3DXVECTOR2 *pt2, FLOAT s); > +D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv); > +D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR4* WINAPI D3DXVec2TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > +D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray(D3DXVECTOR2 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > +D3DXVECTOR2* WINAPI D3DXVec2TransformNormal(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray(D3DXVECTOR2 *pout, UINT outstride, const D3DXVECTOR2 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > + > +D3DXVECTOR3* WINAPI D3DXVec3BaryCentric(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3, FLOAT f, FLOAT g); > +D3DXVECTOR3* WINAPI D3DXVec3CatmullRom( D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv0, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pv3, FLOAT s); > +D3DXVECTOR3* WINAPI D3DXVec3Hermite(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pt1, const D3DXVECTOR3 *pv2, const D3DXVECTOR3 *pt2, FLOAT s); > +D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv); > +D3DXVECTOR3* WINAPI D3DXVec3Project(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3D10_VIEWPORT *pviewport, const D3DXMATRIX *pprojection, > + const D3DXMATRIX *pview, const D3DXMATRIX *pworld); > +D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3D10_VIEWPORT *pviewport, > + const D3DXMATRIX *pprojection, const D3DXMATRIX *pview, const D3DXMATRIX *pworld, UINT n); > +D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR4* WINAPI D3DXVec3TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > +D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > +D3DXVECTOR3* WINAPI D3DXVec3TransformNormal(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > +D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, const D3D10_VIEWPORT *pviewport, const D3DXMATRIX *pprojection, > + const D3DXMATRIX *pview, const D3DXMATRIX *pworld); > +D3DXVECTOR3* WINAPI D3DXVec3UnprojectArray(D3DXVECTOR3 *pout, UINT outstride, const D3DXVECTOR3 *pv, UINT vstride, const D3D10_VIEWPORT *pviewport, > + const D3DXMATRIX *pprojection, const D3DXMATRIX *pview, const D3DXMATRIX *pworld, UINT n); > +D3DXVECTOR4* WINAPI D3DXVec4BaryCentric(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3, FLOAT f, FLOAT g); > +D3DXVECTOR4* WINAPI D3DXVec4CatmullRom(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv0, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3, FLOAT s); > +D3DXVECTOR4* WINAPI D3DXVec4Cross(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pv3); > +D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pt1, const D3DXVECTOR4 *pv2, const D3DXVECTOR4 *pt2, FLOAT s); > +D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv); > +D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv, const D3DXMATRIX *pm); > +D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, const D3DXVECTOR4 *pv, UINT vstride, const D3DXMATRIX *pm, UINT n); > + > +D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, const FLOAT *pin, UINT n); > +FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, const D3DXFLOAT16 *pin, UINT n); > + > +FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b); > +FLOAT WINAPI D3DXSHDot(UINT order, const FLOAT *a, const FLOAT *b); > +HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); > +FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir); > +HRESULT WINAPI D3DXSHEvalDirectionalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); > +HRESULT WINAPI D3DXSHEvalHemisphereLight(UINT order, const D3DXVECTOR3 *dir, D3DXCOLOR top, D3DXCOLOR bottom, FLOAT *rout, FLOAT *gout, FLOAT *bout); > +HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOAT radius, FLOAT Rintensity, FLOAT Gintensity, FLOAT Bintensity, FLOAT *rout, FLOAT *gout, FLOAT *bout); > +FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); > +FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); > +FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); In theory there should also be D3DXSHMultiply5 and D3DXSHMultiply6 here. > +FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); > +FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); > +FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale); > + These function should probably alphabetically sorted with those above. There are some "new" functions in d3dx10math.h compared to d3dx9math.h which should be added (possibly in a separate patch): D3DXIntersectTri, D3DXSphereBoundProbe, D3DXBoxBoundProbe, D3DXComputeBoundingSphere and D3DXComputeBoundingBox and D3DXCpuOptimizations are those I noticed. > +#ifdef __cplusplus > +} > +#endif > + > +typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK; > + > +DEFINE_GUID(IID_ID3DXMatrixStack, > +0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85); > + > +#undef INTERFACE > +#define INTERFACE ID3DXMatrixStack > + > +DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) > +{ > + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; > + STDMETHOD_(ULONG,AddRef)(THIS) PURE; > + STDMETHOD_(ULONG,Release)(THIS) PURE; > + STDMETHOD(Pop)(THIS) PURE; > + STDMETHOD(Push)(THIS) PURE; > + STDMETHOD(LoadIdentity)(THIS) PURE; > + STDMETHOD(LoadMatrix)(THIS_ const D3DXMATRIX* pM ) PURE; > + STDMETHOD(MultMatrix)(THIS_ const D3DXMATRIX* pM ) PURE; > + STDMETHOD(MultMatrixLocal)(THIS_ const D3DXMATRIX* pM ) PURE; > + STDMETHOD(RotateAxis)(THIS_ const D3DXVECTOR3* pV, FLOAT Angle) PURE; > + STDMETHOD(RotateAxisLocal)(THIS_ const D3DXVECTOR3* pV, FLOAT Angle) PURE; > + STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; > + STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; > + STDMETHOD(Scale)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; > + STDMETHOD(ScaleLocal)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; > + STDMETHOD(Translate)(THIS_ FLOAT x, FLOAT y, FLOAT z ) PURE; > + STDMETHOD(TranslateLocal)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; > + STDMETHOD_(D3DXMATRIX*, GetTop)(THIS) PURE; > +}; '*' next to the parameter name, no spurious spaces before the ')', please avoid caps / hungarian notation in the parameter names. BTW, I guess this shows pretty clearly that this piece of text started as a copy of the MS header :/ > + > +#undef INTERFACE > + > +#if !defined(__cplusplus) || defined(CINTERFACE) > + > +#define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) > +#define ID3DXMatrixStack_AddRef(p) (p)->lpVtbl->AddRef(p) > +#define ID3DXMatrixStack_Release(p) (p)->lpVtbl->Release(p) > +#define ID3DXMatrixStack_Pop(p) (p)->lpVtbl->Pop(p) > +#define ID3DXMatrixStack_Push(p) (p)->lpVtbl->Push(p) > +#define ID3DXMatrixStack_LoadIdentity(p) (p)->lpVtbl->LoadIdentity(p) > +#define ID3DXMatrixStack_LoadMatrix(p,a) (p)->lpVtbl->LoadMatrix(p,a) > +#define ID3DXMatrixStack_MultMatrix(p,a) (p)->lpVtbl->MultMatrix(p,a) > +#define ID3DXMatrixStack_MultMatrixLocal(p,a) (p)->lpVtbl->MultMatrixLocal(p,a) > +#define ID3DXMatrixStack_RotateAxis(p,a,b) (p)->lpVtbl->RotateAxis(p,a,b) > +#define ID3DXMatrixStack_RotateAxisLocal(p,a,b) (p)->lpVtbl->RotateAxisLocal(p,a,b) > +#define ID3DXMatrixStack_RotateYawPitchRoll(p,a,b,c) (p)->lpVtbl->RotateYawPitchRoll(p,a,b,c) > +#define ID3DXMatrixStack_RotateYawPitchRollLocal(p,a,b,c) (p)->lpVtbl->RotateYawPitchRollLocal(p,a,b,c) > +#define ID3DXMatrixStack_Scale(p,a,b,c) (p)->lpVtbl->Scale(p,a,b,c) > +#define ID3DXMatrixStack_ScaleLocal(p,a,b,c) (p)->lpVtbl->ScaleLocal(p,a,b,c) > +#define ID3DXMatrixStack_Translate(p,a,b,c) (p)->lpVtbl->Translate(p,a,b,c) > +#define ID3DXMatrixStack_TranslateLocal(p,a,b,c) (p)->lpVtbl->TranslateLocal(p,a,b,c) > +#define ID3DXMatrixStack_GetTop(p) (p)->lpVtbl->GetTop(p) > + > +#endif Those macros seem to be missing in the MS header, probably it's better to drop them here too (similarly to e.g. the mesh-related interfaces in d3dx9mesh.h). The d3dx9 header is identical in this respect. > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); > + > +#ifdef __cplusplus > +} > +#endif > + > +#include <d3dx10math.inl> > + > +#endif /* __D3DX9MATH_H__ */ > diff --git a/include/d3dx10math.inl b/include/d3dx10math.inl > new file mode 100644 > index 0000000..71cfe41 > --- /dev/null > +++ b/include/d3dx10math.inl > @@ -0,0 +1,1298 @@ > +/* > + * Copyright (C) 2007 David Adam > + * Copyright (C) 2007 Tony Wasserka > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#ifndef __D3DXMATH_INL__ > +#define __D3DXMATH_INL__ > + > +/* constructors & operators */ > +#ifdef __cplusplus > + > +inline D3DXVECTOR2::D3DXVECTOR2() > +{ > +} > + > +inline D3DXVECTOR2::D3DXVECTOR2(const FLOAT *pf) > +{ > + if(!pf) return; > + x = pf[0]; > + y = pf[1]; > +} That if (and many other similar checks) is actually conditional on a define. That was already the case in d3dx9, although it used a different define. > + > +inline D3DXVECTOR2::D3DXVECTOR2(FLOAT fx, FLOAT fy) > +{ > + x = fx; > + y = fy; > +} > + > +inline D3DXVECTOR2::operator FLOAT* () > +{ > + return (FLOAT*)&x; > +} > + > +inline D3DXVECTOR2::operator const FLOAT* () const > +{ > + return (const FLOAT*)&x; > +} > + > +inline D3DXVECTOR2& D3DXVECTOR2::operator += (const D3DXVECTOR2& v) > +{ > + x += v.x; > + y += v.y; > + return *this; > +} > + > +inline D3DXVECTOR2& D3DXVECTOR2::operator -= (const D3DXVECTOR2& v) > +{ > + x -= v.x; > + y -= v.y; > + return *this; > +} > + > +inline D3DXVECTOR2& D3DXVECTOR2::operator *= (FLOAT f) > +{ > + x *= f; > + y *= f; > + return *this; > +} > + > +inline D3DXVECTOR2& D3DXVECTOR2::operator /= (FLOAT f) > +{ > + x /= f; > + y /= f; > + return *this; > +} These kind of '/' operators are implemented in the original header by computing the reciprocal and then multiplying it by the operand. I guess that was changed to make it different compared to the header from the SDK but that isn't exactly an equivalent implementation. I'm sure it doesn't really matter in practice (these would only matter if someone compiles a C++ program using those methods with the wine headers AND the actual numbers used would happen to make a visible difference) but I'd be happier if this used the same idea as the original. > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator + () const > +{ > + return *this; > +} > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator - () const > +{ > + return D3DXVECTOR2(-x, -y); > +} > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator + (const D3DXVECTOR2& v) const > +{ > + return D3DXVECTOR2(x + v.x, y + v.y); > +} > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator - (const D3DXVECTOR2& v) const > +{ > + return D3DXVECTOR2(x - v.x, y - v.y); > +} > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator * (FLOAT f) const > +{ > + return D3DXVECTOR2(x * f, y * f); > +} > + > +inline D3DXVECTOR2 D3DXVECTOR2::operator / (FLOAT f) const > +{ > + return D3DXVECTOR2(x / f, y / f); > +} > + > +inline D3DXVECTOR2 operator * (FLOAT f, const D3DXVECTOR2& v) > +{ > + return D3DXVECTOR2(f * v.x, f * v.y); > +} > + > +inline BOOL D3DXVECTOR2::operator == (const D3DXVECTOR2& v) const > +{ > + return x == v.x && y == v.y; > +} > + > +inline BOOL D3DXVECTOR2::operator != (const D3DXVECTOR2& v) const > +{ > + return x != v.x || y != v.y; > +} > + > +inline D3DXVECTOR3::D3DXVECTOR3() > +{ > +} > + > +inline D3DXVECTOR3::D3DXVECTOR3(const FLOAT *pf) > +{ > + if(!pf) return; > + x = pf[0]; > + y = pf[1]; > + z = pf[2]; > +} > + > +inline D3DXVECTOR3::D3DXVECTOR3(const D3DVECTOR& v) > +{ > + x = v.x; > + y = v.y; > + z = v.z; > +} > + > +inline D3DXVECTOR3::D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz) > +{ > + x = fx; > + y = fy; > + z = fz; > +} > + > +inline D3DXVECTOR3::operator FLOAT* () > +{ > + return (FLOAT*)&x; > +} > + > +inline D3DXVECTOR3::operator const FLOAT* () const > +{ > + return (const FLOAT*)&x; > +} > + > +inline D3DXVECTOR3& D3DXVECTOR3::operator += (const D3DXVECTOR3& v) > +{ > + x += v.x; > + y += v.y; > + z += v.z; > + return *this; > +} > + > +inline D3DXVECTOR3& D3DXVECTOR3::operator -= (const D3DXVECTOR3& v) > +{ > + x -= v.x; > + y -= v.y; > + z -= v.z; > + return *this; > +} > + > +inline D3DXVECTOR3& D3DXVECTOR3::operator *= (FLOAT f) > +{ > + x *= f; > + y *= f; > + z *= f; > + return *this; > +} > + > +inline D3DXVECTOR3& D3DXVECTOR3::operator /= (FLOAT f) > +{ > + x /= f; > + y /= f; > + z /= f; > + return *this; > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator + () const > +{ > + return *this; > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator - () const > +{ > + return D3DXVECTOR3(-x, -y, -z); > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator + (const D3DXVECTOR3& v) const > +{ > + return D3DXVECTOR3(x + v.x, y + v.y, z + v.z); > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator - (const D3DXVECTOR3& v) const > +{ > + return D3DXVECTOR3(x - v.x, y - v.y, z - v.z); > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator * (FLOAT f) const > +{ > + return D3DXVECTOR3(x * f, y * f, z * f); > +} > + > +inline D3DXVECTOR3 D3DXVECTOR3::operator / (FLOAT f) const > +{ > + return D3DXVECTOR3(x / f, y / f, z / f); > +} > + > +inline D3DXVECTOR3 operator * (FLOAT f, const D3DXVECTOR3& v) > +{ > + return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); > +} > + > +inline BOOL D3DXVECTOR3::operator == (const D3DXVECTOR3& v) const > +{ > + return x == v.x && y == v.y && z == v.z; > +} > + > +inline BOOL D3DXVECTOR3::operator != (const D3DXVECTOR3& v) const > +{ > + return x != v.x || y != v.y || z != v.z; > +} > + > +inline D3DXVECTOR4::D3DXVECTOR4() > +{ > +} > + > +inline D3DXVECTOR4::D3DXVECTOR4(const FLOAT *pf) > +{ > + if(!pf) return; > + x = pf[0]; > + y = pf[1]; > + z = pf[2]; > + w = pf[3]; > +} > + > +inline D3DXVECTOR4::D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw) > +{ > + x = fx; > + y = fy; > + z = fz; > + w = fw; > +} > + > +inline D3DXVECTOR4::operator FLOAT* () > +{ > + return (FLOAT*)&x; > +} > + > +inline D3DXVECTOR4::operator const FLOAT* () const > +{ > + return (const FLOAT*)&x; > +} > + > +inline D3DXVECTOR4& D3DXVECTOR4::operator += (const D3DXVECTOR4& v) > +{ > + x += v.x; > + y += v.y; > + z += v.z; > + w += v.w; > + return *this; > +} > + > +inline D3DXVECTOR4& D3DXVECTOR4::operator -= (const D3DXVECTOR4& v) > +{ > + x -= v.x; > + y -= v.y; > + z -= v.z; > + w -= v.w; > + return *this; > +} > + > +inline D3DXVECTOR4& D3DXVECTOR4::operator *= (FLOAT f) > +{ > + x *= f; > + y *= f; > + z *= f; > + w *= f; > + return *this; > +} > + > +inline D3DXVECTOR4& D3DXVECTOR4::operator /= (FLOAT f) > +{ > + x /= f; > + y /= f; > + z /= f; > + w /= f; > + return *this; > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator + () const > +{ > + return *this; > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator - () const > +{ > + return D3DXVECTOR4(-x, -y, -z, -w); > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator + (const D3DXVECTOR4& v) const > +{ > + return D3DXVECTOR4(x + v.x, y + v.y, z + v.z, w + v.w); > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator - (const D3DXVECTOR4& v) const > +{ > + return D3DXVECTOR4(x - v.x, y - v.y, z - v.z, w - v.w); > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator * (FLOAT f) const > +{ > + return D3DXVECTOR4(x * f, y * f, z * f, w * f); > +} > + > +inline D3DXVECTOR4 D3DXVECTOR4::operator / (FLOAT f) const > +{ > + return D3DXVECTOR4(x / f, y / f, z / f, w / f); > +} > + > +inline D3DXVECTOR4 operator * (FLOAT f, const D3DXVECTOR4& v) > +{ > + return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w); > +} > + > +inline BOOL D3DXVECTOR4::operator == (const D3DXVECTOR4& v) const > +{ > + return x == v.x && y == v.y && z == v.z && w == v.w; > +} > + > +inline BOOL D3DXVECTOR4::operator != (const D3DXVECTOR4& v) const > +{ > + return x != v.x || y != v.y || z != v.z || w != v.w; > +} > + > +inline D3DXMATRIX::D3DXMATRIX() > +{ > +} > + > +inline D3DXMATRIX::D3DXMATRIX(const FLOAT *pf) > +{ > + if(!pf) return; > + memcpy(&_11, pf, sizeof(D3DXMATRIX)); > +} > + > +inline D3DXMATRIX::D3DXMATRIX(const D3DMATRIX& mat) > +{ > + memcpy(&_11, &mat, sizeof(D3DXMATRIX)); > +} > + > +inline D3DXMATRIX::D3DXMATRIX(FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, > + FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, > + FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, > + FLOAT f41, FLOAT f42, FLOAT f43, FLOAT f44) > +{ > + _11 = f11; _12 = f12; _13 = f13; _14 = f14; > + _21 = f21; _22 = f22; _23 = f23; _24 = f24; > + _31 = f31; _32 = f32; _33 = f33; _34 = f34; > + _41 = f41; _42 = f42; _43 = f43; _44 = f44; > +} > + > +inline FLOAT& D3DXMATRIX::operator () (UINT row, UINT col) > +{ > + return m[row][col]; > +} > + > +inline FLOAT D3DXMATRIX::operator () (UINT row, UINT col) const > +{ > + return m[row][col]; > +} > + > +inline D3DXMATRIX::operator FLOAT* () > +{ > + return (FLOAT*)&_11; > +} > + > +inline D3DXMATRIX::operator const FLOAT* () const > +{ > + return (const FLOAT*)&_11; > +} > + > +inline D3DXMATRIX& D3DXMATRIX::operator *= (const D3DXMATRIX& mat) > +{ > + D3DXMatrixMultiply(this, this, &mat); > + return *this; > +} > + > +inline D3DXMATRIX& D3DXMATRIX::operator += (const D3DXMATRIX& mat) > +{ > + _11 += mat._11; _12 += mat._12; _13 += mat._13; _14 += mat._14; > + _21 += mat._21; _22 += mat._22; _23 += mat._23; _24 += mat._24; > + _31 += mat._31; _32 += mat._32; _33 += mat._33; _34 += mat._34; > + _41 += mat._41; _42 += mat._42; _43 += mat._43; _44 += mat._44; > + return *this; > +} > + > +inline D3DXMATRIX& D3DXMATRIX::operator -= (const D3DXMATRIX& mat) > +{ > + _11 -= mat._11; _12 -= mat._12; _13 -= mat._13; _14 -= mat._14; > + _21 -= mat._21; _22 -= mat._22; _23 -= mat._23; _24 -= mat._24; > + _31 -= mat._31; _32 -= mat._32; _33 -= mat._33; _34 -= mat._34; > + _41 -= mat._41; _42 -= mat._42; _43 -= mat._43; _44 -= mat._44; > + return *this; > +} > + > +inline D3DXMATRIX& D3DXMATRIX::operator *= (FLOAT f) > +{ > + _11 *= f; _12 *= f; _13 *= f; _14 *= f; > + _21 *= f; _22 *= f; _23 *= f; _24 *= f; > + _31 *= f; _32 *= f; _33 *= f; _34 *= f; > + _41 *= f; _42 *= f; _43 *= f; _44 *= f; > + return *this; > +} > + > +inline D3DXMATRIX& D3DXMATRIX::operator /= (FLOAT f) > +{ > + FLOAT inv = 1.0f / f; > + _11 *= inv; _12 *= inv; _13 *= inv; _14 *= inv; > + _21 *= inv; _22 *= inv; _23 *= inv; _24 *= inv; > + _31 *= inv; _32 *= inv; _33 *= inv; _34 *= inv; > + _41 *= inv; _42 *= inv; _43 *= inv; _44 *= inv; > + return *this; > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator + () const > +{ > + return *this; > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator - () const > +{ > + return D3DXMATRIX(-_11, -_12, -_13, -_14, > + -_21, -_22, -_23, -_24, > + -_31, -_32, -_33, -_34, > + -_41, -_42, -_43, -_44); > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator * (const D3DXMATRIX& mat) const > +{ > + D3DXMATRIX buf; > + D3DXMatrixMultiply(&buf, this, &mat); > + return buf; > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator + (const D3DXMATRIX& mat) const > +{ > + return D3DXMATRIX(_11 + mat._11, _12 + mat._12, _13 + mat._13, _14 + mat._14, > + _21 + mat._21, _22 + mat._22, _23 + mat._23, _24 + mat._24, > + _31 + mat._31, _32 + mat._32, _33 + mat._33, _34 + mat._34, > + _41 + mat._41, _42 + mat._42, _43 + mat._43, _44 + mat._44); > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator - (const D3DXMATRIX& mat) const > +{ > + return D3DXMATRIX(_11 - mat._11, _12 - mat._12, _13 - mat._13, _14 - mat._14, > + _21 - mat._21, _22 - mat._22, _23 - mat._23, _24 - mat._24, > + _31 - mat._31, _32 - mat._32, _33 - mat._33, _34 - mat._34, > + _41 - mat._41, _42 - mat._42, _43 - mat._43, _44 - mat._44); > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator * (FLOAT f) const > +{ > + return D3DXMATRIX(_11 * f, _12 * f, _13 * f, _14 * f, > + _21 * f, _22 * f, _23 * f, _24 * f, > + _31 * f, _32 * f, _33 * f, _34 * f, > + _41 * f, _42 * f, _43 * f, _44 * f); > +} > + > +inline D3DXMATRIX D3DXMATRIX::operator / (FLOAT f) const > +{ > + FLOAT inv = 1.0f / f; > + return D3DXMATRIX(_11 * inv, _12 * inv, _13 * inv, _14 * inv, > + _21 * inv, _22 * inv, _23 * inv, _24 * inv, > + _31 * inv, _32 * inv, _33 * inv, _34 * inv, > + _41 * inv, _42 * inv, _43 * inv, _44 * inv); > +} > + > +inline D3DXMATRIX operator * (FLOAT f, const D3DXMATRIX& mat) > +{ > + return D3DXMATRIX(f * mat._11, f * mat._12, f * mat._13, f * mat._14, > + f * mat._21, f * mat._22, f * mat._23, f * mat._24, > + f * mat._31, f * mat._32, f * mat._33, f * mat._34, > + f * mat._41, f * mat._42, f * mat._43, f * mat._44); > +} > + > +inline BOOL D3DXMATRIX::operator == (const D3DXMATRIX& mat) const > +{ > + return (memcmp(this, &mat, sizeof(D3DXMATRIX)) == 0); > +} Just use !memcmp(...) I'd say. > + > +inline BOOL D3DXMATRIX::operator != (const D3DXMATRIX& mat) const > +{ > + return (memcmp(this, &mat, sizeof(D3DXMATRIX)) != 0); > +} > + > +inline D3DXQUATERNION::D3DXQUATERNION() > +{ > +} > + > +inline D3DXQUATERNION::D3DXQUATERNION(const FLOAT *pf) > +{ > + if(!pf) return; > + x = pf[0]; > + y = pf[1]; > + z = pf[2]; > + w = pf[3]; > +} > + > +inline D3DXQUATERNION::D3DXQUATERNION(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw) > +{ > + x = fx; > + y = fy; > + z = fz; > + w = fw; > +} > + > +inline D3DXQUATERNION::operator FLOAT* () > +{ > + return (FLOAT*)&x; > +} > + > +inline D3DXQUATERNION::operator const FLOAT* () const > +{ > + return (const FLOAT*)&x; > +} > + > +inline D3DXQUATERNION& D3DXQUATERNION::operator += (const D3DXQUATERNION& quat) > +{ > + x += quat.x; > + y += quat.y; > + z += quat.z; > + w += quat.w; > + return *this; > +} > + > +inline D3DXQUATERNION& D3DXQUATERNION::operator -= (const D3DXQUATERNION& quat) > +{ > + x -= quat.x; > + y -= quat.y; > + z -= quat.z; > + w -= quat.w; > + return *this; > +} > + > +inline D3DXQUATERNION& D3DXQUATERNION::operator *= (const D3DXQUATERNION& quat) > +{ > + D3DXQuaternionMultiply(this, this, &quat); > + return *this; > +} > + > +inline D3DXQUATERNION& D3DXQUATERNION::operator *= (FLOAT f) > +{ > + x *= f; > + y *= f; > + z *= f; > + w *= f; > + return *this; > +} > + > +inline D3DXQUATERNION& D3DXQUATERNION::operator /= (FLOAT f) > +{ > + FLOAT inv = 1.0f / f; > + x *= inv; > + y *= inv; > + z *= inv; > + w *= inv; > + return *this; > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator + () const > +{ > + return *this; > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator - () const > +{ > + return D3DXQUATERNION(-x, -y, -z, -w); > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator + (const D3DXQUATERNION& quat) const > +{ > + return D3DXQUATERNION(x + quat.x, y + quat.y, z + quat.z, w + quat.w); > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator - (const D3DXQUATERNION& quat) const > +{ > + return D3DXQUATERNION(x - quat.x, y - quat.y, z - quat.z, w - quat.w); > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator * (const D3DXQUATERNION& quat) const > +{ > + D3DXQUATERNION buf; > + D3DXQuaternionMultiply(&buf, this, &quat); > + return buf; > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator * (FLOAT f) const > +{ > + return D3DXQUATERNION(x * f, y * f, z * f, w * f); > +} > + > +inline D3DXQUATERNION D3DXQUATERNION::operator / (FLOAT f) const > +{ > + FLOAT inv = 1.0f / f; > + return D3DXQUATERNION(x * inv, y * inv, z * inv, w * inv); > +} > + > +inline D3DXQUATERNION operator * (FLOAT f, const D3DXQUATERNION& quat) > +{ > + return D3DXQUATERNION(f * quat.x, f * quat.y, f * quat.z, f * quat.w); > +} > + > +inline BOOL D3DXQUATERNION::operator == (const D3DXQUATERNION& quat) const > +{ > + return x == quat.x && y == quat.y && z == quat.z && w == quat.w; > +} > + > +inline BOOL D3DXQUATERNION::operator != (const D3DXQUATERNION& quat) const > +{ > + return x != quat.x || y != quat.y || z != quat.z || w != quat.w; > +} > + > +inline D3DXPLANE::D3DXPLANE() > +{ > +} > + > +inline D3DXPLANE::D3DXPLANE(const FLOAT *pf) > +{ > + if(!pf) return; > + a = pf[0]; > + b = pf[1]; > + c = pf[2]; > + d = pf[3]; > +} > + > +inline D3DXPLANE::D3DXPLANE(FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd) > +{ > + a = fa; > + b = fb; > + c = fc; > + d = fd; > +} > + > +inline D3DXPLANE::operator FLOAT* () > +{ > + return (FLOAT*)&a; > +} > + > +inline D3DXPLANE::operator const FLOAT* () const > +{ > + return (const FLOAT*)&a; > +} > + > +inline D3DXPLANE D3DXPLANE::operator + () const > +{ > + return *this; > +} > + > +inline D3DXPLANE D3DXPLANE::operator - () const > +{ > + return D3DXPLANE(-a, -b, -c, -d); > +} > + > +inline BOOL D3DXPLANE::operator == (const D3DXPLANE& pl) const > +{ > + return a == pl.a && b == pl.b && c == pl.c && d == pl.d; > +} > + > +inline BOOL D3DXPLANE::operator != (const D3DXPLANE& pl) const > +{ > + return a != pl.a || b != pl.b || c != pl.c || d != pl.d; > +} > + > +inline D3DXCOLOR::D3DXCOLOR() > +{ > +} > + > +inline D3DXCOLOR::D3DXCOLOR(DWORD col) > +{ > + const FLOAT f = 1.0f / 255.0f; > + r = f * (FLOAT)(unsigned char)(col >> 16); > + g = f * (FLOAT)(unsigned char)(col >> 8); > + b = f * (FLOAT)(unsigned char)col; > + a = f * (FLOAT)(unsigned char)(col >> 24); > +} I'm pretty sure the cast to float is unnecessary. The cast to unsigned char could be replaced by masking the value with 0xff. > + > +inline D3DXCOLOR::D3DXCOLOR(const FLOAT *pf) > +{ > + if(!pf) return; > + r = pf[0]; > + g = pf[1]; > + b = pf[2]; > + a = pf[3]; > +} > + > +inline D3DXCOLOR::D3DXCOLOR(const D3DCOLORVALUE& col) > +{ > + r = col.r; > + g = col.g; > + b = col.b; > + a = col.a; > +} > + > +inline D3DXCOLOR::D3DXCOLOR(FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa) > +{ > + r = fr; > + g = fg; > + b = fb; > + a = fa; > +} > + > +inline D3DXCOLOR::operator DWORD () const > +{ > + DWORD _r = r >= 1.0f ? 0xff : r <= 0.0f ? 0x00 : (DWORD)(r * 255.0f + 0.5f); > + DWORD _g = g >= 1.0f ? 0xff : g <= 0.0f ? 0x00 : (DWORD)(g * 255.0f + 0.5f); > + DWORD _b = b >= 1.0f ? 0xff : b <= 0.0f ? 0x00 : (DWORD)(b * 255.0f + 0.5f); > + DWORD _a = a >= 1.0f ? 0xff : a <= 0.0f ? 0x00 : (DWORD)(a * 255.0f + 0.5f); > + > + return (_a << 24) | (_r << 16) | (_g << 8) | _b; > +} This is way too similar to the original header for my taste. > + > +inline D3DXCOLOR::operator FLOAT * () > +{ > + return (FLOAT*)&r; > +} > + > +inline D3DXCOLOR::operator const FLOAT * () const > +{ > + return (const FLOAT*)&r; > +} > + > +inline D3DXCOLOR::operator D3DCOLORVALUE * () > +{ > + return (D3DCOLORVALUE*)&r; > +} > + > +inline D3DXCOLOR::operator const D3DCOLORVALUE * () const > +{ > + return (const D3DCOLORVALUE*)&r; > +} > + > +inline D3DXCOLOR::operator D3DCOLORVALUE& () > +{ > + return *((D3DCOLORVALUE*)&r); > +} > + > +inline D3DXCOLOR::operator const D3DCOLORVALUE& () const > +{ > + return *((const D3DCOLORVALUE*)&r); > +} These were dropped in d3dx10 and need to go. > + > +inline D3DXCOLOR& D3DXCOLOR::operator += (const D3DXCOLOR& col) > +{ > + r += col.r; > + g += col.g; > + b += col.b; > + a += col.a; > + return *this; > +} > + > +inline D3DXCOLOR& D3DXCOLOR::operator -= (const D3DXCOLOR& col) > +{ > + r -= col.r; > + g -= col.g; > + b -= col.b; > + a -= col.a; > + return *this; > +} > + > +inline D3DXCOLOR& D3DXCOLOR::operator *= (FLOAT f) > +{ > + r *= f; > + g *= f; > + b *= f; > + a *= f; > + return *this; > +} > + > +inline D3DXCOLOR& D3DXCOLOR::operator /= (FLOAT f) > +{ > + FLOAT inv = 1.0f / f; > + r *= inv; > + g *= inv; > + b *= inv; > + a *= inv; > + return *this; > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator + () const > +{ > + return *this; > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator - () const > +{ > + return D3DXCOLOR(-r, -g, -b, -a); > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator + (const D3DXCOLOR& col) const > +{ > + return D3DXCOLOR(r + col.r, g + col.g, b + col.b, a + col.a); > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator - (const D3DXCOLOR& col) const > +{ > + return D3DXCOLOR(r - col.r, g - col.g, b - col.b, a - col.a); > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator * (FLOAT f) const > +{ > + return D3DXCOLOR(r * f, g * f, b * f, a * f); > +} > + > +inline D3DXCOLOR D3DXCOLOR::operator / (FLOAT f) const > +{ > + FLOAT inv = 1.0f / f; > + return D3DXCOLOR(r * inv, g * inv, b * inv, a * inv); > +} > + > +inline D3DXCOLOR operator * (FLOAT f, const D3DXCOLOR& col) > +{ > + return D3DXCOLOR(f * col.r, f * col.g, f * col.b, f * col.a); > +} > + > +inline BOOL D3DXCOLOR::operator == (const D3DXCOLOR& col) const > +{ > + return r == col.r && g == col.g && b == col.b && a == col.a; > +} > + > +inline BOOL D3DXCOLOR::operator != (const D3DXCOLOR& col) const > +{ > + return r != col.r || g != col.g || b != col.b || a != col.a; > +} > + > +inline D3DXFLOAT16::D3DXFLOAT16() > +{ > +} > + > +inline D3DXFLOAT16::D3DXFLOAT16(FLOAT f) > +{ > + D3DXFloat32To16Array(this, &f, 1); > +} > + > +inline D3DXFLOAT16::D3DXFLOAT16(const D3DXFLOAT16 &f) > +{ > + value = f.value; > +} > + > +inline D3DXFLOAT16::operator FLOAT () > +{ > + FLOAT f; > + D3DXFloat16To32Array(&f, this, 1); > + return f; > +} > + > +inline BOOL D3DXFLOAT16::operator == (const D3DXFLOAT16 &f) const > +{ > + return value == f.value; > +} > + > +inline BOOL D3DXFLOAT16::operator != (const D3DXFLOAT16 &f) const > +{ > + return value != f.value; > +} These changed with d3dx10 to handle NaN and +/-0 comparisons correctly. > + > +#endif /* __cplusplus */ > + > +/*_______________D3DXCOLOR_____________________*/ > + > +static inline D3DXCOLOR* D3DXColorAdd(D3DXCOLOR *pout, const D3DXCOLOR *pc1, const D3DXCOLOR *pc2) > +{ > + if ( !pout || !pc1 || !pc2 ) return NULL; Whitespace inside the parentheses, here and below a number of times. > + pout->r = (pc1->r) + (pc2->r); > + pout->g = (pc1->g) + (pc2->g); > + pout->b = (pc1->b) + (pc2->b); > + pout->a = (pc1->a) + (pc2->a); > + return pout; > +} I guess those extra parentheses are just to make the code somewhat different from the original. I would remove them and also remove the 'p' prefix from the parameters. > + > +static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, const D3DXCOLOR *pc1, const D3DXCOLOR *pc2, FLOAT s) > +{ > + if ( !pout || !pc1 || !pc2 ) return NULL; > + pout->r = (1-s) * (pc1->r) + s *(pc2->r); > + pout->g = (1-s) * (pc1->g) + s *(pc2->g); > + pout->b = (1-s) * (pc1->b) + s *(pc2->b); > + pout->a = (1-s) * (pc1->a) + s *(pc2->a); > + return pout; > +} This one is also slightly changed, probably to make it different from the original but it won't give exactly the same results. Again, it does hardly matter, but... > + > +static inline D3DXCOLOR* D3DXColorModulate(D3DXCOLOR *pout, const D3DXCOLOR *pc1, const D3DXCOLOR *pc2) > +{ > + if ( !pout || !pc1 || !pc2 ) return NULL; > + pout->r = (pc1->r) * (pc2->r); > + pout->g = (pc1->g) * (pc2->g); > + pout->b = (pc1->b) * (pc2->b); > + pout->a = (pc1->a) * (pc2->a); > + return pout; > +} > + > +static inline D3DXCOLOR* D3DXColorNegative(D3DXCOLOR *pout, const D3DXCOLOR *pc) > +{ > + if ( !pout || !pc ) return NULL; > + pout->r = 1.0f - pc->r; > + pout->g = 1.0f - pc->g; > + pout->b = 1.0f - pc->b; > + pout->a = pc->a; > + return pout; > +} > + > +static inline D3DXCOLOR* D3DXColorScale(D3DXCOLOR *pout, const D3DXCOLOR *pc, FLOAT s) > +{ > + if ( !pout || !pc ) return NULL; > + pout->r = s* (pc->r); > + pout->g = s* (pc->g); > + pout->b = s* (pc->b); > + pout->a = s* (pc->a); > + return pout; > +} Whitespaces. > + > +static inline D3DXCOLOR* D3DXColorSubtract(D3DXCOLOR *pout, const D3DXCOLOR *pc1, const D3DXCOLOR *pc2) > +{ > + if ( !pout || !pc1 || !pc2 ) return NULL; > + pout->r = (pc1->r) - (pc2->r); > + pout->g = (pc1->g) - (pc2->g); > + pout->b = (pc1->b) - (pc2->b); > + pout->a = (pc1->a) - (pc2->a); > + return pout; > +} > + > +/*_______________D3DXVECTOR2________________________*/ > + > +static inline D3DXVECTOR2* D3DXVec2Add(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x + pv2->x; > + pout->y = pv1->y + pv2->y; > + return pout; > +} > + > +static inline FLOAT D3DXVec2CCW(const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pv1 || !pv2) return 0.0f; > + return ( (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x) ); > +} > + > +static inline FLOAT D3DXVec2Dot(const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pv1 || !pv2) return 0.0f; > + return ( (pv1->x * pv2->x + pv1->y * pv2->y) ); > +} > + > +static inline FLOAT D3DXVec2Length(const D3DXVECTOR2 *pv) > +{ > + if (!pv) return 0.0f; > + return sqrtf( pv->x * pv->x + pv->y * pv->y ); > +} > + > +static inline FLOAT D3DXVec2LengthSq(const D3DXVECTOR2 *pv) > +{ > + if (!pv) return 0.0f; > + return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); > +} > + > +static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2, FLOAT s) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = (1-s) * (pv1->x) + s * (pv2->x); > + pout->y = (1-s) * (pv1->y) + s * (pv2->y); > + return pout; > +} > + > +static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; > + return pout; > +} > + > +static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; > + return pout; > +} > + > +static inline D3DXVECTOR2* D3DXVec2Scale(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv, FLOAT s) > +{ > + if ( !pout || !pv) return NULL; > + pout->x = s * (pv->x); > + pout->y = s * (pv->y); > + return pout; > +} > + > +static inline D3DXVECTOR2* D3DXVec2Subtract(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv1, const D3DXVECTOR2 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x - pv2->x; > + pout->y = pv1->y - pv2->y; > + return pout; > +} > + > +/*__________________D3DXVECTOR3_______________________*/ > + > +static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x + pv2->x; > + pout->y = pv1->y + pv2->y; > + pout->z = pv1->z + pv2->z; > + return pout; > +} > + > +static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + D3DXVECTOR3 temp; > + > + if ( !pout || !pv1 || !pv2) return NULL; > + temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); > + temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); > + temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); > + *pout = temp; > + return pout; > +} > + > +static inline FLOAT D3DXVec3Dot(const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + if ( !pv1 || !pv2 ) return 0.0f; > + return (pv1->x) * (pv2->x) + (pv1->y) * (pv2->y) + (pv1->z) * (pv2->z); > +} > + > +static inline FLOAT D3DXVec3Length(const D3DXVECTOR3 *pv) > +{ > + if (!pv) return 0.0f; > + return sqrtf( pv->x * pv->x + pv->y * pv->y + pv->z * pv->z ); > +} > + > +static inline FLOAT D3DXVec3LengthSq(const D3DXVECTOR3 *pv) > +{ > + if (!pv) return 0.0f; > + return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z); > +} > + > +static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2, FLOAT s) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = (1-s) * (pv1->x) + s * (pv2->x); > + pout->y = (1-s) * (pv1->y) + s * (pv2->y); > + pout->z = (1-s) * (pv1->z) + s * (pv2->z); > + return pout; > +} > + > +static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; > + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; > + return pout; > +} > + > +static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; > + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; > + return pout; > +} > + > +static inline D3DXVECTOR3* D3DXVec3Scale(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv, FLOAT s) > +{ > + if ( !pout || !pv) return NULL; > + pout->x = s * (pv->x); > + pout->y = s * (pv->y); > + pout->z = s * (pv->z); > + return pout; > +} > + > +static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, const D3DXVECTOR3 *pv1, const D3DXVECTOR3 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x - pv2->x; > + pout->y = pv1->y - pv2->y; > + pout->z = pv1->z - pv2->z; > + return pout; > +} > +/*__________________D3DXVECTOR4_______________________*/ > + > +static inline D3DXVECTOR4* D3DXVec4Add(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x + pv2->x; > + pout->y = pv1->y + pv2->y; > + pout->z = pv1->z + pv2->z; > + pout->w = pv1->w + pv2->w; > + return pout; > +} > + > +static inline FLOAT D3DXVec4Dot(const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2) > +{ > + if (!pv1 || !pv2 ) return 0.0f; > + return (pv1->x) * (pv2->x) + (pv1->y) * (pv2->y) + (pv1->z) * (pv2->z) + (pv1->w) * (pv2->w); > +} > + > +static inline FLOAT D3DXVec4Length(const D3DXVECTOR4 *pv) > +{ > + if (!pv) return 0.0f; > + return sqrtf( pv->x * pv->x + pv->y * pv->y + pv->z * pv->z + pv->w * pv->w ); > +} > + > +static inline FLOAT D3DXVec4LengthSq(const D3DXVECTOR4 *pv) > +{ > + if (!pv) return 0.0f; > + return (pv->x) * (pv->x) + (pv->y) * (pv->y) + (pv->z) * (pv->z) + (pv->w) * (pv->w); > +} > + > +static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2, FLOAT s) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = (1-s) * (pv1->x) + s * (pv2->x); > + pout->y = (1-s) * (pv1->y) + s * (pv2->y); > + pout->z = (1-s) * (pv1->z) + s * (pv2->z); > + pout->w = (1-s) * (pv1->w) + s * (pv2->w); > + return pout; > +} > + > + > +static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; > + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; > + pout->w = pv1->w > pv2->w ? pv1->w : pv2->w; > + return pout; > +} > + > +static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; > + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; > + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; > + pout->w = pv1->w < pv2->w ? pv1->w : pv2->w; > + return pout; > +} > + > +static inline D3DXVECTOR4* D3DXVec4Scale(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv, FLOAT s) > +{ > + if ( !pout || !pv) return NULL; > + pout->x = s * (pv->x); > + pout->y = s * (pv->y); > + pout->z = s * (pv->z); > + pout->w = s * (pv->w); > + return pout; > +} > + > +static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, const D3DXVECTOR4 *pv1, const D3DXVECTOR4 *pv2) > +{ > + if ( !pout || !pv1 || !pv2) return NULL; > + pout->x = pv1->x - pv2->x; > + pout->y = pv1->y - pv2->y; > + pout->z = pv1->z - pv2->z; > + pout->w = pv1->w - pv2->w; > + return pout; > +} > + > +/*__________________D3DXMatrix____________________*/ > +#ifdef NONAMELESSUNION > +# define D3DX_U(x) (x).u > +#else > +# define D3DX_U(x) (x) > +#endif > + > +static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout) > +{ > + if ( !pout ) return NULL; > + D3DX_U(*pout).m[0][1] = 0.0f; > + D3DX_U(*pout).m[0][2] = 0.0f; > + D3DX_U(*pout).m[0][3] = 0.0f; > + D3DX_U(*pout).m[1][0] = 0.0f; > + D3DX_U(*pout).m[1][2] = 0.0f; > + D3DX_U(*pout).m[1][3] = 0.0f; > + D3DX_U(*pout).m[2][0] = 0.0f; > + D3DX_U(*pout).m[2][1] = 0.0f; > + D3DX_U(*pout).m[2][3] = 0.0f; > + D3DX_U(*pout).m[3][0] = 0.0f; > + D3DX_U(*pout).m[3][1] = 0.0f; > + D3DX_U(*pout).m[3][2] = 0.0f; > + D3DX_U(*pout).m[0][0] = 1.0f; > + D3DX_U(*pout).m[1][1] = 1.0f; > + D3DX_U(*pout).m[2][2] = 1.0f; > + D3DX_U(*pout).m[3][3] = 1.0f; > + return pout; > +} > + > +static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm) > +{ > + int i,j; > + D3DXMATRIX testmatrix; > + > + if ( !pm ) return FALSE; > + D3DXMatrixIdentity(&testmatrix); > + for (i=0; i<4; i++) > + { > + for (j=0; j<4; j++) > + { > + if ( D3DX_U(*pm).m[i][j] != D3DX_U(testmatrix).m[i][j] ) return FALSE; > + } > + } > + return TRUE; > +} > +#undef D3DX_U > + > +/*__________________D3DXPLANE____________________*/ > + > +static inline FLOAT D3DXPlaneDot(const D3DXPLANE *pp, const D3DXVECTOR4 *pv) > +{ > + if ( !pp || !pv ) return 0.0f; > + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) * (pv->w) ); > +} > + > +static inline FLOAT D3DXPlaneDotCoord(const D3DXPLANE *pp, const D3DXVECTOR4 *pv) > +{ > + if ( !pp || !pv ) return 0.0f; > + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) + (pp->d) ); > +} > + > +static inline FLOAT D3DXPlaneDotNormal(const D3DXPLANE *pp, const D3DXVECTOR4 *pv) > +{ > + if ( !pp || !pv ) return 0.0f; > + return ( (pp->a) * (pv->x) + (pp->b) * (pv->y) + (pp->c) * (pv->z) ); > +} D3DXPlaneScale() is missing. > + > +/*__________________D3DXQUATERNION____________________*/ > + > +static inline D3DXQUATERNION* D3DXQuaternionConjugate(D3DXQUATERNION *pout, const D3DXQUATERNION *pq) > +{ > + if ( !pout || !pq) return NULL; > + pout->x = -pq->x; > + pout->y = -pq->y; > + pout->z = -pq->z; > + pout->w = pq->w; > + return pout; > +} > + > +static inline FLOAT D3DXQuaternionDot(const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2) > +{ > + if ( !pq1 || !pq2 ) return 0.0f; > + return (pq1->x) * (pq2->x) + (pq1->y) * (pq2->y) + (pq1->z) * (pq2->z) + (pq1->w) * (pq2->w); > +} > + > +static inline D3DXQUATERNION* D3DXQuaternionIdentity(D3DXQUATERNION *pout) > +{ > + if ( !pout) return NULL; > + pout->x = 0.0f; > + pout->y = 0.0f; > + pout->z = 0.0f; > + pout->w = 1.0f; > + return pout; > +} > + > +static inline BOOL D3DXQuaternionIsIdentity(D3DXQUATERNION *pq) > +{ > + if ( !pq) return FALSE; > + return ( (pq->x == 0.0f) && (pq->y == 0.0f) && (pq->z == 0.0f) && (pq->w == 1.0f) ); > +} > + > +static inline FLOAT D3DXQuaternionLength(const D3DXQUATERNION *pq) > +{ > + if (!pq) return 0.0f; > + return sqrtf( pq->x * pq->x + pq->y * pq->y + pq->z * pq->z + pq->w * pq->w ); > +} > + > +static inline FLOAT D3DXQuaternionLengthSq(const D3DXQUATERNION *pq) > +{ > + if (!pq) return 0.0f; > + return (pq->x) * (pq->x) + (pq->y) * (pq->y) + (pq->z) * (pq->z) + (pq->w) * (pq->w); > +} > + > +#endif > -- > 1.9.1 General comment (already hinted above), I'd drop all the 'p's prefixed to pointer function argument names. Many of the issues of this patch come from our current d3dx9 headers. It might be a good idea to fix some of the worst offenders there before adding the d3dx10math.* files. Since formatting-only patches are generally not allowed, you might for example write a patch adding the missing D3DXVECTOR4 constructor and fix up the ID3DXMatrixStack interface at the same time. If someone disagrees with this kind of plan just speak up. There is more stuff missing I haven't mentioned above, e.g. aligned matrices defines and structs. It's probably fine to leave those out for the time being.

2 1

Re: [PATCH v2 2/6] wined3d: Add a real implementation of wined3d_check_device_multisample_type().
by Henri Verbeet 25 Jan '16

25 Jan '16

I finally had a look at D3D FSAAViewer on Windows, and I think this makes sense in general. On 14 January 2016 at 00:00, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static inline unsigned int popcount(unsigned int v) > +{ > + v -= v >> 1 & 0x55555555; > + v = (v & 0x33333333) + (v >> 2 & 0x33333333); > + return ((v + (v >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; > +} > + This is probably at least as good as the existing count_bits(), but it does duplicate that function. GCC's __builtin_popcount() may also be worth a look. I'd probably call it wined3d_popcount() for consistency with e.g. wined3d_log2i().

2 2

Re: [PATCH v2 2/8] wined3d: Add support for WINED3DFMT_R8G8B8A8_UINT textures.
by Matteo Bruni 25 Jan '16

25 Jan '16

2016-01-25 10:57 GMT+01:00 Józef Kucia <jkucia(a)codeweavers.com>: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > Version 2: Do not check post-pixel shader blending for integer texture formats. > --- > @@ -1087,6 +1088,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = > | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE > | WINED3DFMT_FLAG_VTF, > WINED3D_GL_EXT_NONE, NULL}, > + {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI_EXT, GL_RGBA8UI_EXT, 0, > + GL_RGBA_INTEGER_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, 0, > + WINED3DFMT_FLAG_TEXTURE, > + EXT_TEXTURE_INTEGER, NULL}, Just a nitpick but when you resend this patch you could use the non-_EXT internal format / format defines. Not a big deal by any means, they are defined to the same values anyway...

1 0

Attn Packagers: Dependency change from gstreamer-0.10 to gstreamer >= 1.0
by Andrew Eikum 25 Jan '16

25 Jan '16

Hi all, The next release of Wine will include a commit which changes our winegstreamer dshow module to use the modern gstreamer 1.0 API instead of the long-deprecated gstreamer 0.10 API. dshow is used by some games and applications, including Microsoft Office, to display videos and play audio. Wine's winegstreamer allows applications that use dshow to support a wide variety of media through gstreamer. winegstreamer has been broken for a long time (see Bug 30557), and many distros disable the DLL when shipping Wine. If your distro provides 32-bit gstreamer libraries, then you can now re-enable winegstreamer and expect it to work. Thanks, Andrew

6 11

Re: [PATCH] d3dx9/tests: Fix some test failures
by Matteo Bruni 25 Jan '16

25 Jan '16

2016-01-19 22:17 GMT+01:00 Nikolay Sivov <nsivov(a)codeweavers.com>: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/d3dx9_36/tests/mesh.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 7c86190..1afba18 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -11109,21 +11109,25 @@ static void D3DXCreateAnimationControllerTest(void) > hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > > + animation = (void*)0xdeadbeef; > hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > - ok(!animation, "Got unexpected animation %p.\n", animation); > + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); > > + animation = (void*)0xdeadbeef; > hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > - ok(!animation, "Got unexpected animation %p.\n", animation); > + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); > > + animation = (void*)0xdeadbeef; > hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > - ok(!animation, "Got unexpected animation %p.\n", animation); > + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); > > + animation = (void*)0xdeadbeef; > hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > - ok(!animation, "Got unexpected animation %p.\n", animation); > + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); > > hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation); > ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); > -- > 2.7.0.rc3 Ugh. I'm late to the signoff party but thanks for the patch.

1 0

Re: [PATCH v2 2/8] wined3d: Add support for WINED3DFMT_R8G8B8A8_UINT textures.
by Henri Verbeet 25 Jan '16

25 Jan '16

On 25 January 2016 at 10:57, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI_EXT, GL_RGBA8UI_EXT, 0, > + GL_RGBA_INTEGER_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, 0, > + WINED3DFMT_FLAG_TEXTURE, > + EXT_TEXTURE_INTEGER, NULL}, Actually, you can't use GL_UNSIGNED_INT_8_8_8_8_REV with integer formats unless you also have ARB_texture_rgb10_a2ui. (Although usually you do.) The corresponding test is also still failing for me, although in a different way. It works when replacing GL_UNSIGNED_INT_8_8_8_8_REV with either GL_UNSIGNED_INT_8_8_8_8 or GL_UNSIGNED_BYTE, which seems to hint at a driver issue. I'm looking into that.

1 0

RE: [PATCH 1/2] user32: Use correct values to deselect combo box text with EM_SETSEL
by Hugh McMaster 25 Jan '16

25 Jan '16

> On Mon, 25 Jan 2016 19:42:13 +0800, Dmitry Timoshkov wrote: >> Hugh McMaster wrote: >> >>>>> diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c >>>>> index c744ee5..4c57b72 100644 >>>>> --- a/dlls/user32/combo.c >>>>> +++ b/dlls/user32/combo.c >>>>> @@ -1189,6 +1189,8 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc ) >>>>> { >>>>> if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) >>>>> SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); >>>>> + else >>>>> + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, 0); >>>> >>>> The message test doesn't confirm that this is a correct solution. >>> >>> I tested the sequence from WM_KILLFOCUS twice in dlls/user32/tests/msg.c. >>> >>> [snip] >>> >>> In both sequences, the expected value of EM_SETSEL is 0, 0. >>> >>> Perhaps I'm not understanding what you mean in this case. >> >> I mean that adding a SendMessage() call should fix the message sequence >> if that's how it's supposed to work, and as a result you would remove TRUE >> as an indicator of todo_wine for fixed sequences. I can't remove TRUE from those message tests yet, as the message sequence fails. It seems some messages are not implemented or perhaps being sent in the wrong order. So, for SetFocusButtonSeq, the output is: msg.c:6165: Test failed: SetFocus on a Button: 3: the msg 0x0202 was expected, but got msg 0x0111 instead Is each message from the relevant sequence implemented in one file, e.g. user32/combo.c, or are they spread into multiple files?

2 1

Re: [PATCH] olepro32: Add typelib resource (resend)
by Huw Davies 25 Jan '16

25 Jan '16

On Thu, Jan 07, 2016 at 06:15:52PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/olepro32/olepro.idl b/dlls/olepro32/olepro.idl > new file mode 100644 > index 0000000..a34822d > --- /dev/null > +++ b/dlls/olepro32/olepro.idl > @@ -0,0 +1,358 @@ > +/* > + * Copyright (C) 2015 Alistair Leslie-Hughes > + * This appears to be a stripped down copy of std_ole_v1.idl, which is fine; what's not fine is stripping out the copyright and replacing it with your own. What should happen here is that this typelib should importlib("stdole32.tlb") and not have the IUnknown or IDispatch definitions. This will mean adding stdole32.tlb to the include directory. Huw.

1 0

Re: [PATCH 1/2] user32: Use correct values to deselect combo box text with EM_SETSEL
by Dmitry Timoshkov 25 Jan '16

25 Jan '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/user32/combo.c | 2 ++ > dlls/user32/tests/combo.c | 4 ++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c > index c744ee5..4c57b72 100644 > --- a/dlls/user32/combo.c > +++ b/dlls/user32/combo.c > @@ -1189,6 +1189,8 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc ) > { > if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) > SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); > + else > + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, 0); The message test doesn't confirm that this is a correct solution. -- Dmitry.

2 2

Re: [PATCH 2/2 v3] user32: Test error returned in out of timers case
by Marvin 25 Jan '16

25 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19942 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 === w1064 (64 bit msg) === msg.c:6903: Test failed: WmParentPaint: 2: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 2/2 v2] user32: Test error returned in out of timers case
by Sebastian Lackner 25 Jan '16

25 Jan '16

On 22.01.2016 16:10, Piotr Caban wrote: > + if (i == sizeof(ids)/sizeof(ids[0])) > + ok(0, "all timers were created successfully\n"); Why don't you use ok() directly to check the condition?

2 1

Re: advapi32/tests: Trace the SIDs if they are not as expected.
by Marvin 24 Jan '16

24 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19941 Your paranoid android. === w864 (32 bit security) === security.c:3774: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). === w1064 (32 bit security) === security.c:3774: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3815: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3819: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3828: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH v4] ntoskrnl.exe: Implement ZwLoadDriver and ZwUnloadDriver
by Sebastian Lackner 24 Jan '16

24 Jan '16

On 22.01.2016 19:15, Aric Stewart wrote: > Code is mostly moved from winedevice.exe > winedevice.exe now uses these functions > v3: No longer use advapi32 Registry functions > v4: Fix FALSE return code (thanks to Huw Davies for spotting this one) > Remove WINE_ from debuging macros > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 306 ++++++++++++++++++++++++++++++++++++ > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- > programs/winedevice/device.c | 243 +--------------------------- > 3 files changed, 313 insertions(+), 240 deletions(-) > I don't think moving the loader code from winedevice to ntoskrnl.exe is a good idea, at least not without further changes, because: * We should not initialize the same driver twice, the second initialization could fail because of namespace collisions. * Drivers should be properly uninitialized, no matter how they were loaded. * In theory, all drivers should be loaded into the same address space. This means, winedevice and the wineserver has to keep track of them, and its not sufficient to maintain a list in ntoskrnl.exe. Besides those design issues, I've marked a couple of other issues in the patch below. > > 0001-ntoskrnl.exe-Implement-ZwLoadDriver-and-ZwUnloadDriver.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 04f0198..032ab21 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -72,6 +72,18 @@ static DWORD request_thread; > static DWORD client_tid; > static DWORD client_pid; > > +/* Loaded driver list */ > +typedef struct _loaded_driver { > + struct list entry; > + > + UNICODE_STRING name; > + HMODULE module; > + DRIVER_OBJECT driver_obj; > + DRIVER_EXTENSION driver_extension; > +} loaded_driver; > + > +struct list loaded_drivers = LIST_INIT(loaded_drivers); It wouldn't hurt to add locking for such a global list. > + > #ifdef __i386__ > #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ > __ASM_STDCALL_FUNC( name, 4, \ > @@ -2407,3 +2419,297 @@ NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) > FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); > return STATUS_NOT_IMPLEMENTED; > } > + > + > +/* find the LDR_MODULE corresponding to the driver module */ > +static LDR_MODULE *find_ldr_module( HMODULE module ) > +{ > + LIST_ENTRY *entry, *list = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; > + > + for (entry = list->Flink; entry != list; entry = entry->Flink) > + { > + LDR_MODULE *ldr = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); > + if (ldr->BaseAddress == module) return ldr; > + if (ldr->BaseAddress > (void *)module) break; > + } The loader lock should be acquired while iterating through this list. (Yes, this is an existing issue, but before it was less critical because the code was single-threaded.) > + return NULL; > +} > + > +/* load the driver module file */ > +static HMODULE load_driver_module( const WCHAR *name ) > +{ > + IMAGE_NT_HEADERS *nt; > + const IMAGE_IMPORT_DESCRIPTOR *imports; > + SYSTEM_BASIC_INFORMATION info; > + int i; > + INT_PTR delta; > + ULONG size; > + HMODULE module = LoadLibraryW( name ); > + > + if (!module) return NULL; > + nt = RtlImageNtHeader( module ); > + > + if (!(delta = (char *)module - (char *)nt->OptionalHeader.ImageBase)) return module; > + > + /* the loader does not apply relocations to non page-aligned binaries or executables, > + * we have to do it ourselves */ > + > + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); > + if (nt->OptionalHeader.SectionAlignment < info.PageSize || > + !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) > + { > + DWORD old; > + IMAGE_BASE_RELOCATION *rel, *end; > + > + if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) > + { > + TRACE( "%s: relocating from %p to %p\n", > + wine_dbgstr_w(name), (char *)module - delta, module ); > + end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); > + while (rel < end && rel->SizeOfBlock) > + { > + void *page = (char *)module + rel->VirtualAddress; > + VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); > + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), > + (USHORT *)(rel + 1), delta ); > + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); > + if (!rel) goto error; > + } > + /* make sure we don't try again */ > + size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; > + VirtualProtect( nt, size, PAGE_READWRITE, &old ); > + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; > + VirtualProtect( nt, size, old, &old ); > + } > + } > + > + /* make sure imports are relocated too */ > + > + if ((imports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) > + { > + for (i = 0; imports[i].Name && imports[i].FirstThunk; i++) > + { > + char *name = (char *)module + imports[i].Name; > + WCHAR buffer[32], *p = buffer; > + > + while (p < buffer + 32) if (!(*p++ = *name++)) break; > + if (p <= buffer + 32) FreeLibrary( load_driver_module( buffer ) ); > + } > + } > + > + return module; > + > +error: > + FreeLibrary( module ); > + return NULL; > +} > + > +/* call the driver init entry point */ > +static NTSTATUS init_driver( const WCHAR *driver_name, UNICODE_STRING *keyname, loaded_driver *driver ) > +{ > + unsigned int i; > + NTSTATUS status; > + const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( driver->module ); > + > + if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > + > + driver->driver_obj.Size = sizeof(driver->driver_obj); > + driver->driver_obj.DriverSection = find_ldr_module( driver->module ); > + driver->driver_obj.DriverInit = (PDRIVER_INITIALIZE)((char *)driver->module + nt->OptionalHeader.AddressOfEntryPoint); > + driver->driver_obj.DriverExtension = &driver->driver_extension; > + > + driver->driver_obj.DriverExtension->DriverObject = &driver->driver_obj; > + driver->driver_obj.DriverExtension->ServiceKeyName = *keyname; > + > + if (TRACE_ON(relay)) > + DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > + driver->driver_obj.DriverInit, &driver->driver_obj, wine_dbgstr_w(keyname->Buffer) ); > + > + status = driver->driver_obj.DriverInit( &driver->driver_obj, keyname ); > + > + if (TRACE_ON(relay)) > + DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > + driver->driver_obj.DriverInit, &driver->driver_obj, wine_dbgstr_w(keyname->Buffer), status ); > + > + TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), &driver->driver_obj ); > + TRACE( "- DriverInit = %p\n", driver->driver_obj.DriverInit ); > + TRACE( "- DriverStartIo = %p\n", driver->driver_obj.DriverStartIo ); > + TRACE( "- DriverUnload = %p\n", driver->driver_obj.DriverUnload ); > + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > + TRACE( "- MajorFunction[%d] = %p\n", i, driver->driver_obj.MajorFunction[i] ); > + > + return status; > +} > + > +/*********************************************************************** > + * ZwLoadDriver (NTOSKRNL.EXE.@) > + */ > +NTSTATUS WINAPI ZwLoadDriver(const UNICODE_STRING *DriverServiceName) Both the Nt* and Zw* function should do the same, so I would suggest to implement Nt* instead and forward Zw*, like its done in ntdll. > +{ > + static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > + static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0}; > + static const WCHAR postfixW[] = {'.','s','y','s',0}; > + static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; > + static const WCHAR ImagePathW[] = {'I','m','a','g','e','P','a','t','h',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}; > + > + UNICODE_STRING keypath, reg_str; > + HMODULE module; > + LPWSTR path = NULL, str; > + DWORD size; > + HANDLE driver_hkey; > + OBJECT_ATTRIBUTES attr; > + NTSTATUS status; > + char buffer[256]; > + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; The initialization here looks unnecessary. > + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); > + loaded_driver *driver; > + > + /* Check if driver is already loaded */ > + LIST_FOR_EACH_ENTRY(driver, &loaded_drivers, loaded_driver, entry) > + { > + if (RtlEqualUnicodeString(DriverServiceName, &driver->name, FALSE)) > + return ERROR_SUCCESS; > + } > + > + str = HeapAlloc(GetProcessHeap(), 0, sizeof(servicesW) + DriverServiceName->Length*sizeof(WCHAR)); Length is the length in bytes, so the calculation above is wrong. > + lstrcpyW(str, servicesW); > + lstrcatW(str, DriverServiceName->Buffer); I don't think you can assume a terminating NULL character. > + > + attr.Length = sizeof(attr); > + attr.RootDirectory = 0; > + attr.ObjectName = &reg_str; > + attr.Attributes = 0; > + attr.SecurityDescriptor = NULL; > + attr.SecurityQualityOfService = NULL; > + > + RtlInitUnicodeString(&reg_str, str); > + > + status = NtCreateKey(&driver_hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); > + if (status != STATUS_SUCCESS) > + { > + ERR("cannot open key %s, err=0x%x\n", wine_dbgstr_w(str), status); > + HeapFree(GetProcessHeap(), 0, str); > + return status; > + } > + RtlInitUnicodeString(&keypath, str); > + > + /* read the executable path from memory */ > + size = 0; > + RtlInitUnicodeString(&reg_str, ImagePathW); > + > + status = NtQueryValueKey(driver_hkey, &reg_str, KeyValuePartialInformation, buffer, info_size, &size); > + if (status == STATUS_BUFFER_OVERFLOW) > + { > + str = HeapAlloc(GetProcessHeap(), 0, size); str was already set before, so this might leak memory, at least on some exit paths. > + info = (KEY_VALUE_PARTIAL_INFORMATION *) str; > + status = NtQueryValueKey(driver_hkey, &reg_str, KeyValuePartialInformation, str, size, &size); > + > + if (status == STATUS_SUCCESS) > + { > + size = ExpandEnvironmentStringsW((LPCWSTR)info->Data,NULL,0); > + path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); > + ExpandEnvironmentStringsW((LPCWSTR)info->Data,path,size); > + } > + HeapFree(GetProcessHeap(), 0, str); > + if (!path) > + { > + TRACE("Failed to load driver path(0x%x): %s\n", status, > + wine_dbgstr_w((LPCWSTR)info->Data)); info->Data points into str, which was deallocated just before. > + NtClose(driver_hkey); > + return status; > + } > + > + if (!strncmpiW(path, systemrootW, 12)) > + { > + WCHAR buffer[MAX_PATH]; The variable name is the same as above, which might be misleading. > + > + GetWindowsDirectoryW(buffer, MAX_PATH); > + > + str = HeapAlloc(GetProcessHeap(), 0, (size -11 + strlenW(buffer)) > + * sizeof(WCHAR)); > + lstrcpyW(str, buffer); > + lstrcatW(str, path + 11); > + HeapFree(GetProcessHeap(), 0, path); > + path = str; > + } > + else if (!strncmpW(path, ntprefixW, 4)) > + str = path + 4; > + else > + str = path; > + } > + else > + { > + /* default is to use the driver name + ".sys" */ > + WCHAR buffer[MAX_PATH]; > + GetSystemDirectoryW(buffer, MAX_PATH); > + path = HeapAlloc(GetProcessHeap(),0, > + (strlenW(buffer) + strlenW(driversW) + DriverServiceName->Length + strlenW(postfixW) + 1) > + *sizeof(WCHAR)); Similar to above, ->Length is the length in bytes. > + lstrcpyW(path, buffer); > + lstrcatW(path, driversW); > + lstrcatW(path, DriverServiceName->Buffer); > + lstrcatW(path, postfixW); > + str = path; > + } > + NtClose(driver_hkey); > + > + TRACE("loading driver %s\n", wine_dbgstr_w(str)); > + > + module = load_driver_module(str); > + HeapFree(GetProcessHeap(), 0, path); > + > + if (!module) > + return STATUS_NOT_FOUND; > + > + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)); > + driver->module = module; > + RtlDuplicateUnicodeString(1, DriverServiceName, &driver->name); > + > + init_driver(DriverServiceName->Buffer, &keypath, driver); > + > + list_add_tail(&loaded_drivers, &driver->entry); > + > + return STATUS_SUCCESS; > +} > + > +/*********************************************************************** > + * ZwUnloadDriver (NTOSKRNL.EXE.@) > + */ > +NTSTATUS WINAPI ZwUnloadDriver(const UNICODE_STRING *DriverServiceName) > +{ > + loaded_driver *driver, *ptr; > + > + LIST_FOR_EACH_ENTRY_SAFE(driver, ptr, &loaded_drivers, loaded_driver, entry) > + { > + if (RtlEqualUnicodeString(DriverServiceName, &driver->name, FALSE)) > + { > + list_remove(&driver->entry); > + > + if (driver->driver_obj.DriverUnload) > + { > + if (TRACE_ON(relay)) > + DPRINTF("%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver->driver_obj.DriverUnload, &driver->driver_obj ); > + > + driver->driver_obj.DriverUnload( &driver->driver_obj); > + > + if (TRACE_ON(relay)) > + DPRINTF("%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver->driver_obj.DriverUnload, &driver->driver_obj); > + } > + > + RtlFreeUnicodeString(&driver->name); > + RtlFreeUnicodeString(&driver->driver_extension.ServiceKeyName); > + FreeLibrary(driver->module); > + HeapFree(GetProcessHeap(), 0, driver); > + return STATUS_SUCCESS; > + } > + } > + > + return STATUS_NOT_FOUND; > +} > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 1319ada..a98a523 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -1314,7 +1314,7 @@ > @ stdcall ZwFsControlFile(long long long long long long long long long long) ntdll.ZwFsControlFile > @ stdcall ZwInitiatePowerAction(long long long long) ntdll.ZwInitiatePowerAction > @ stdcall ZwIsProcessInJob(long long) ntdll.ZwIsProcessInJob > -@ stdcall ZwLoadDriver(ptr) ntdll.ZwLoadDriver > +@ stdcall ZwLoadDriver(ptr) > @ stdcall ZwLoadKey(ptr ptr) ntdll.ZwLoadKey > @ stdcall ZwMakeTemporaryObject(long) ntdll.ZwMakeTemporaryObject > @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) ntdll.ZwMapViewOfSection > @@ -1384,7 +1384,7 @@ > @ stdcall ZwTerminateJobObject(long long) ntdll.ZwTerminateJobObject > @ stdcall ZwTerminateProcess(long long) ntdll.ZwTerminateProcess > @ stub ZwTranslateFilePath > -@ stdcall ZwUnloadDriver(ptr) ntdll.ZwUnloadDriver > +@ stdcall ZwUnloadDriver(ptr) > @ stdcall ZwUnloadKey(long) ntdll.ZwUnloadKey > @ stdcall ZwUnmapViewOfSection(long ptr) ntdll.ZwUnmapViewOfSection > @ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) ntdll.ZwWaitForMultipleObjects > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index ef1e1ef..cb6a6ba 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -25,253 +25,19 @@ > > #include "ntstatus.h" > #define WIN32_NO_STATUS > -#include "windef.h" > -#include "winbase.h" > #include "winternl.h" > -#include "winreg.h" > -#include "winnls.h" > #include "winsvc.h" > #include "ddk/wdm.h" > #include "wine/unicode.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(winedevice); > -WINE_DECLARE_DEBUG_CHANNEL(relay); > > extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > > static WCHAR *driver_name; > static SERVICE_STATUS_HANDLE service_handle; > -static HKEY driver_hkey; > static HANDLE stop_event; > -static DRIVER_OBJECT driver_obj; > -static DRIVER_EXTENSION driver_extension; > - > -/* find the LDR_MODULE corresponding to the driver module */ > -static LDR_MODULE *find_ldr_module( HMODULE module ) > -{ > - LIST_ENTRY *entry, *list = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; > - > - for (entry = list->Flink; entry != list; entry = entry->Flink) > - { > - LDR_MODULE *ldr = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); > - if (ldr->BaseAddress == module) return ldr; > - if (ldr->BaseAddress > (void *)module) break; > - } > - return NULL; > -} > - > -/* load the driver module file */ > -static HMODULE load_driver_module( const WCHAR *name ) > -{ > - IMAGE_NT_HEADERS *nt; > - const IMAGE_IMPORT_DESCRIPTOR *imports; > - SYSTEM_BASIC_INFORMATION info; > - int i; > - INT_PTR delta; > - ULONG size; > - HMODULE module = LoadLibraryW( name ); > - > - if (!module) return NULL; > - nt = RtlImageNtHeader( module ); > - > - if (!(delta = (char *)module - (char *)nt->OptionalHeader.ImageBase)) return module; > - > - /* the loader does not apply relocations to non page-aligned binaries or executables, > - * we have to do it ourselves */ > - > - NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); > - if (nt->OptionalHeader.SectionAlignment < info.PageSize || > - !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) > - { > - DWORD old; > - IMAGE_BASE_RELOCATION *rel, *end; > - > - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) > - { > - WINE_TRACE( "%s: relocating from %p to %p\n", > - wine_dbgstr_w(name), (char *)module - delta, module ); > - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); > - while (rel < end && rel->SizeOfBlock) > - { > - void *page = (char *)module + rel->VirtualAddress; > - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); > - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), > - (USHORT *)(rel + 1), delta ); > - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); > - if (!rel) goto error; > - } > - /* make sure we don't try again */ > - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; > - VirtualProtect( nt, size, PAGE_READWRITE, &old ); > - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; > - VirtualProtect( nt, size, old, &old ); > - } > - } > - > - /* make sure imports are relocated too */ > - > - if ((imports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) > - { > - for (i = 0; imports[i].Name && imports[i].FirstThunk; i++) > - { > - char *name = (char *)module + imports[i].Name; > - WCHAR buffer[32], *p = buffer; > - > - while (p < buffer + 32) if (!(*p++ = *name++)) break; > - if (p <= buffer + 32) FreeLibrary( load_driver_module( buffer ) ); > - } > - } > - > - return module; > - > -error: > - FreeLibrary( module ); > - return NULL; > -} > - > -/* call the driver init entry point */ > -static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) > -{ > - unsigned int i; > - NTSTATUS status; > - const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); > - > - if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > - > - driver_obj.Size = sizeof(driver_obj); > - driver_obj.DriverSection = find_ldr_module( module ); > - driver_obj.DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); > - driver_obj.DriverExtension = &driver_extension; > - > - driver_extension.DriverObject = &driver_obj; > - driver_extension.ServiceKeyName = *keyname; > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer) ); > - > - status = driver_obj.DriverInit( &driver_obj, keyname ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer), status ); > - > - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), &driver_obj ); > - WINE_TRACE( "- DriverInit = %p\n", driver_obj.DriverInit ); > - WINE_TRACE( "- DriverStartIo = %p\n", driver_obj.DriverStartIo ); > - WINE_TRACE( "- DriverUnload = %p\n", driver_obj.DriverUnload ); > - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_obj.MajorFunction[i] ); > - > - return status; > -} > - > -/* call the driver unload function */ > -static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) > -{ > - if (driver_obj->DriverUnload) > - { > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - > - driver_obj->DriverUnload( driver_obj ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - } > - FreeLibrary( module ); > -} > - > -/* load the .sys module for a device driver */ > -static HMODULE load_driver(void) > -{ > - static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > - static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0}; > - static const WCHAR postfixW[] = {'.','s','y','s',0}; > - static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; > - static const WCHAR ImagePathW[] = {'I','m','a','g','e','P','a','t','h',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}; > - > - UNICODE_STRING keypath; > - HMODULE module; > - LPWSTR path = NULL, str; > - DWORD type, size; > - > - str = HeapAlloc( GetProcessHeap(), 0, sizeof(servicesW) + strlenW(driver_name)*sizeof(WCHAR) ); > - lstrcpyW( str, servicesW ); > - lstrcatW( str, driver_name ); > - > - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, str + 18 /* skip \registry\machine */, &driver_hkey )) > - { > - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); > - HeapFree( GetProcessHeap(), 0, str); > - return FALSE; > - } > - RtlInitUnicodeString( &keypath, str ); > - > - /* read the executable path from memory */ > - size = 0; > - if (!RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, NULL, &size )) > - { > - str = HeapAlloc( GetProcessHeap(), 0, size ); > - if (!RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, (LPBYTE)str, &size )) > - { > - size = ExpandEnvironmentStringsW(str,NULL,0); > - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); > - ExpandEnvironmentStringsW(str,path,size); > - } > - HeapFree( GetProcessHeap(), 0, str ); > - if (!path) return FALSE; > - > - if (!strncmpiW( path, systemrootW, 12 )) > - { > - WCHAR buffer[MAX_PATH]; > - > - GetWindowsDirectoryW(buffer, MAX_PATH); > - > - str = HeapAlloc(GetProcessHeap(), 0, (size -11 + strlenW(buffer)) > - * sizeof(WCHAR)); > - lstrcpyW(str, buffer); > - lstrcatW(str, path + 11); > - HeapFree( GetProcessHeap(), 0, path ); > - path = str; > - } > - else if (!strncmpW( path, ntprefixW, 4 )) > - str = path + 4; > - else > - str = path; > - } > - else > - { > - /* default is to use the driver name + ".sys" */ > - WCHAR buffer[MAX_PATH]; > - GetSystemDirectoryW(buffer, MAX_PATH); > - path = HeapAlloc(GetProcessHeap(),0, > - (strlenW(buffer) + strlenW(driversW) + strlenW(driver_name) + strlenW(postfixW) + 1) > - *sizeof(WCHAR)); > - lstrcpyW(path, buffer); > - lstrcatW(path, driversW); > - lstrcatW(path, driver_name); > - lstrcatW(path, postfixW); > - str = path; > - } > - > - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); > - > - module = load_driver_module( str ); > - HeapFree( GetProcessHeap(), 0, path ); > - if (!module) return NULL; > - > - init_driver( module, &keypath ); > - return module; > -} > > static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) > { > @@ -305,7 +71,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ > static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > { > SERVICE_STATUS status; > - HMODULE driver_module; > + UNICODE_STRING DriverName; > > WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); > > @@ -324,15 +90,16 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > status.dwWaitHint = 10000; > SetServiceStatus( service_handle, &status ); > > - driver_module = load_driver(); > - if (driver_module) > + RtlInitUnicodeString( &DriverName, driver_name ); > + > + if ( ZwLoadDriver( &DriverName ) == ERROR_SUCCESS ) > { > status.dwCurrentState = SERVICE_RUNNING; > status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; > SetServiceStatus( service_handle, &status ); > > wine_ntoskrnl_main_loop( stop_event ); > - unload_driver( driver_module, &driver_obj ); > + ZwUnloadDriver( &DriverName ); > } > else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); > > > >

3 7

Re: [PATCH v3] mscoree: Implement VTable fixup for x86_64 architecture.
by Sebastian Lackner 23 Jan '16

23 Jan '16

On 22.01.2016 23:24, Paul Gofman wrote: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/mscoree/corruntimehost.c | 91 +++++++++++++++++++++++++++++++++++++------ > 1 file changed, 79 insertions(+), 12 deletions(-) > > diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c > index e437cc2..05ac9c9 100644 > --- a/dlls/mscoree/corruntimehost.c > +++ b/dlls/mscoree/corruntimehost.c > @@ -919,7 +919,68 @@ static const struct vtable_fixup_thunk thunk_template = { > > #include "poppack.h" > > -#else /* !defined(__i386__) */ > +#elif __x86_64__ /* !__i386__ */ > + > +# define CAN_FIXUP_VTABLE 1 > + > +#include "pshpack1.h" > + > +struct vtable_fixup_thunk > +{ > + /* push %rcx; push %rdx; push %r8; push %r9 */ I think it would be better to allocate a proper stack frame (pushq %rbp, movq %rsp, %rbp, subq ...,%rsp) and then use movq instructions. > + BYTE i1[6]; > + /* sub $0x68, %rsp ; 0x10*4 + 0x20 + 0x8 (align stack for subsequent func call) > + movups %xmm0,0x28(%esp); ...; movups %xmm5,0x58(%esp) Shouldn't it be %rsp ? Same for the precompiled assembler code below. Also, its theoretically safe to use movdqa like done in various other wine functions. > + > + ReallyFixupVTable will crash if we are called with unaligned stack There is no need to add a comment for that, its expected to crash when misaligning the stack. > + */ > + BYTE i2[28]; > + /* mov function,%eax */ > + BYTE i3[2]; > + void (CDECL *function)(struct dll_fixup *); > + /* mov fixup,%rcx */ > + BYTE i4[2]; > + struct dll_fixup *fixup; > + /* call *%eax */ > + BYTE i5[2]; > + /* > + movups 0x28(%esp),xmm0; ...; movups 0x58(%esp),xmm3 > + add $0x68, %rsp > + */ > + BYTE i6[28]; > + /* pop %r9; pop %r8; pop %rdx; pop %rcx */ > + BYTE i7[6]; > + /* mov vtable_entry, %rax */ > + BYTE i8[2]; > + void *vtable_entry; > + /* mov [%rax],%rax > + jmp %rax */ > + BYTE i9[5]; > +}; > + > +static const struct vtable_fixup_thunk thunk_template = { > + {0x51,0x52,0x41,0x50,0x41,0x51}, > + {0x48,0x83,0xEC,0x68, > + 0x67,0x0F,0x11,0x44,0x24,0x28, 0x67,0x0F,0x11,0x4C,0x24,0x38, > + 0x67,0x0F,0x11,0x54,0x24,0x48, 0x67,0x0F,0x11,0x5C,0x24,0x58, > + }, > + {0x48,0xB8}, > + NULL, > + {0x48,0xB9}, > + NULL, > + {0xFF,0xD0}, > + {0x67,0x0F,0x10,0x44,0x24,0x28, 0x67,0x0F,0x10,0x4C,0x24,0x38, > + 0x67,0x0F,0x10,0x54,0x24,0x48, 0x67,0x0F,0x10,0x5C,0x24,0x58, > + 0x48,0x83,0xC4,0x68}, > + {0x41,0x59,0x41,0x58,0x5A,0x59}, > + {0x48,0xB8}, > + NULL, > + {0x48,0x8B,0x00,0xFF,0xE0} > +}; > + > +#include "poppack.h" > + > +#else /* !__i386__ && !__x86_64__ */ > > # define CAN_FIXUP_VTABLE 0 > > @@ -982,15 +1043,19 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) > /* Mono needs an image that belongs to an assembly. */ > image = mono_assembly_get_image(assembly); > > +#if __x86_64__ > + if (fixup->fixup->type & COR_VTABLE_64BIT) > +#else > if (fixup->fixup->type & COR_VTABLE_32BIT) > +#endif > { > - DWORD *vtable = fixup->vtable; > - DWORD *tokens = fixup->tokens; > + void **vtable = fixup->vtable; > + ULONG_PTR *tokens = fixup->tokens; > for (i=0; i<fixup->fixup->count; i++) > { > - TRACE("%x\n", tokens[i]); > - vtable[i] = PtrToUint(mono_marshal_get_vtfixup_ftnptr( > - image, tokens[i], fixup->fixup->type)); > + TRACE("%#lx\n", tokens[i]); > + vtable[i] = mono_marshal_get_vtfixup_ftnptr( > + image, tokens[i], fixup->fixup->type); I would suggest to move those changes and some of the changes below into a separate patch. They can easily be reviewed separately and using PtrToUint() instead of pointer types wasn't even a good idea on 32-bit. ;) > } > } > > @@ -1029,16 +1094,18 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) > fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; > fixup->done = FALSE; > > + TRACE("vtable_fixup->type=0x%x\n",vtable_fixup->type); > +#if __x86_64__ > + if (vtable_fixup->type & COR_VTABLE_64BIT) > +#else > if (vtable_fixup->type & COR_VTABLE_32BIT) > +#endif > { > - DWORD *vtable = fixup->vtable; > - DWORD *tokens; > + void **vtable = fixup->vtable; > + ULONG_PTR *tokens; > int i; > struct vtable_fixup_thunk *thunks = fixup->thunk_code; > > - if (sizeof(void*) > 4) > - ERR("32-bit fixup in 64-bit mode; broken image?\n"); > - > tokens = fixup->tokens = HeapAlloc(GetProcessHeap(), 0, sizeof(*tokens) * vtable_fixup->count); > memcpy(tokens, vtable, sizeof(*tokens) * vtable_fixup->count); > for (i=0; i<vtable_fixup->count; i++) > @@ -1047,7 +1114,7 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) > thunks[i].fixup = fixup; > thunks[i].function = ReallyFixupVTable; > thunks[i].vtable_entry = &vtable[i]; > - vtable[i] = PtrToUint(&thunks[i]); > + vtable[i] = &thunks[i]; > } > } > else >

3 3

Re: [PATCH 3/3] mpr: Implement WNetUseConnectionA(). (try 4)
by Alexandre Julliard 23 Jan '16

23 Jan '16

Pierre Schweitzer <pierre(a)reactos.org> writes: > + ret = WNetUseConnectionW(hwndOwner, pRes, passW, userIDW, dwFlags, > + accessNameW, lpBufferSize, lpResult); > + if (lpAccessName && lpBufferSize && *lpBufferSize && accessNameW) > + { > + len = WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, NULL, 0, NULL, NULL); > + if (len && len <= *lpBufferSize) > + WideCharToMultiByte(CP_ACP, 0, accessNameW, -1, lpAccessName, len, NULL, NULL); > + } You need to handle failures, and a possibly different lpBufferSize for the W function. It could also use some test cases, which would probably require the W function to do something useful first. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH v2 3/3] shell32/tests: Trace the association properties for the DDE tests.
by Marvin 22 Jan '16

22 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19922 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1610: Test failed: WaitForSingleObject returned 258 shlexec.c:1639: Test failed: argvA3 expected 'QuotedLowerL', got 'Open' shlexec.c:1647: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDA95.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtDA95.tmp\test file.noassoc.shlexec' === w1064 (32 bit shlexec) === shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2368: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt4F7B.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt4F7B.tmp\test file.sde")]' shlexec.c:2356: Test failed: failed: rc=29 err=2 shlexec.c:2356: Test failed: failed: rc=29 err=2

2 1

Re: [PATCH] mscoree: Implement VTable fixup for x86_64 architecture.
by Vincent Povirk 22 Jan '16

22 Jan '16

I don't see anything obviously wrong here, but I also have no way of testing it, since we can't compile methods without loading the class library dll's. > +#elif __x86_64__ /* !defined(__i386__) */ Later in the patch it says defined(__x86_64__). I have no idea whether this distinction matters.

3 19

Re: [PATCH v2] mscoree: Implement VTable fixup for x86_64 architecture.
by Vincent Povirk 22 Jan '16

22 Jan '16

So, I'm trying to understand which registers we need to preserve, and I found some pages on MSDN. register usage: https://msdn.microsoft.com/en-us/library/9z1stfyw.aspx parameter passing: https://msdn.microsoft.com/en-us/library/zthk2dkh.aspx I think we need to preserve all parameter registers and can freely use any scratch registers that are not parameter registers, and that we only need to worry about the 64-bit Windows ABI. MSDN seems to say that only XMM0 through XMM3 are used for parameter passing, and that the extra bits in YMM0 through YMM3 are scratch registers. I think that means we can ignore XMM4, XMM5, and AVX extensions. The requirements may be different for the non-Windows ABI, but I hope we can trust the compiler to take care of that as long as we're not calling such a function directly. I'm not sure if we can use __attribute__((force_align_arg_pointer)) directly in this way, but I will defer to others on that question.

2 5

Re: [PATCH v2 2/3] shell32/tests: Call okShell() after a shell_execute{_ex}() test.
by Marvin 22 Jan '16

22 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19921 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1583: Test failed: WaitForSingleObject returned 258 shlexec.c:1612: Test failed: argvA3 expected 'QuotedLowerL', got 'Open' shlexec.c:1620: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDD63.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtDD63.tmp\test file.noassoc.shlexec' === w1064 (32 bit shlexec) === shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2341: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt14C3.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt14C3.tmp\test file.sde")]' shlexec.c:2329: Test failed: failed: rc=29 err=2 shlexec.c:2329: Test failed: failed: rc=29 err=2

1 0

Re: [PATCH v2 1/3] shell32/tests: Trace the last ShellExecute command whenever a corresponding test fails.
by Marvin 22 Jan '16

22 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19920 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2348: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde")]' shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt39FF.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt29CA.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt29CA.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt29CA.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2336: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt29CA.tmp\test file.sde") failed: rc=29 err=2

1 0

Re: include: Create todo_wine_if.
by Sebastian Lackner 22 Jan '16

22 Jan '16

On 22.01.2016 17:50, Bernhard Übelacker wrote: > +#define todo_if(is_todo, platform) for (winetest_start_todo_if(is_todo, platform); \ > + winetest_loop_todo(); \ > + winetest_end_todo_if(is_todo, platform)) There is a high risk of corrupting todo_level if is_todo changes in the meantime. Nevertheless, I like the general idea of introducing such a command, it would make some tests much easier and avoid duplicated checks.

1 0

Re: [PATCH 2/2 v2] user32: Test error returned in out of timers case
by Marvin 22 Jan '16

22 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19916 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 === w7pro64 (64 bit msg) === msg.c:15113: Test failed: wrong status 00400040

2 1

Re: shell32/tests: Fix a couple of okChildString()/okChildPath() mixups.
by Marvin 22 Jan '16

22 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19918 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/7] wined3d: Add support for WINED3DFMT_R8G8B8A8_UINT textures.
by Henri Verbeet 22 Jan '16

22 Jan '16

This introduces GL errors: err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 err:d3d:check_fbo_compat >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Post-pixelshader blending check @ utils.c / 1905 I didn't check if that's the issue here, but in the longer term we'll probably need to add channel type information to the formats[] table. E.g. look at places that currently use WINED3DFMT_FLAG_FLOAT.

2 1

Re: [1/2] shell32/tests: Trace the last ShellExecute command whenever a corresponding test fails.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Francois Gouget <fgouget(a)codeweavers.com> writes: > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> > --- > dlls/shell32/tests/shlexec.c | 75 ++++++++++++++++++++++++++++++-------------- > 1 file changed, 52 insertions(+), 23 deletions(-) > > diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c > index 8f03799..360fb2b 100644 > --- a/dlls/shell32/tests/shlexec.c > +++ b/dlls/shell32/tests/shlexec.c > @@ -94,6 +94,28 @@ static int _todo_wait = 0; > #define todo_wait for (_todo_wait = 1; _todo_wait; _todo_wait = 0) > > static char shell_call[2048]=""; > +static char last_shell_call[2048]=""; > +static void WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) > +{ > + va_list valist; > + > + /* Note: if winetest_debug > 1 the ShellExecute() command has already been > + * traced. > + */ > + if (winetest_debug <= 1 && !condition && strcmp(last_shell_call, shell_call)) > + { > + winetest_trace("Called %s\n", shell_call); > + strcpy(last_shell_call, shell_call); > + } > + > + va_start(valist, msg); > + winetest_vok(condition, msg, valist); > + va_end(valist); > +} Why is that better than always printing it in the failing calls? -- Alexandre Julliard julliard(a)winehq.org

2 5

MSSQL ODBC as describesd in 4.3.6.2 4.3.6.2. Using Windows ODBC drivers
by Olaf Schumann 22 Jan '16

22 Jan '16

Hi, This works fine, but if the MSSQL-Server needs SSL the connection fails. To Test it, install MDAC_TYP.EXE from Microsoft (winetricks: win2k and native_mdac) Control Panel->Data Sources(ODBC)->SystemDSN->Add->SQL Server Configure a Server without SSL: Everything's fine. Configure a Server with SSL: Connection fails. I cross-checked this with a Windows 2k VM. Installing MDAC_TYP.EXE. Configuring the above SQL Servers: Connection to a SSL encryption enabled SQL Server works. Best regards, Olaf Olaf Schumann Product Manager ___________________ Logo_email dataplan GmbH Stahltwiete 23 22761 Hamburg, Germany CEO: Dr. Wolfgang Zetsche Comm. Reg.: HRB 31 083 Venue: Hamburg VAT ID No.: DE118540281 Phone +49 40 398 44 20 Fax: +49 40 390 26 39 www.dataplan.de <mailto:oschumann@dataplan.de> mailto:oschumann@dataplan.de

1 0

Re: [2/2] user32: Use IsTextUnicode instead of a helper.
by Nikolay Sivov 22 Jan '16

22 Jan '16

On 22.01.2016 10:11, Jactry Zeng wrote: > - if (!data_looks_unicode( ptr, size )) > + if (!IsTextUnicode((WCHAR *)ptr, sizeof((WCHAR *)ptr), NULL)) Why it's sizeof() now instead of 'size' ? Also why do you need a cast to (WCHAR*)?

2 1

Re: [PATCH v2] server: Implement serial port read interval timeouts.
by Alexandre Julliard 22 Jan '16

22 Jan '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39875 > > There is a test program attached to the bug report. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > server/async.c | 14 ++++++++++++++ > server/fd.c | 12 ++++++++++++ > server/file.h | 3 +++ > server/serial.c | 13 ++++++++++++- > 4 files changed, 41 insertions(+), 1 deletion(-) > > diff --git a/server/async.c b/server/async.c > index d2da976..e718462 100644 > --- a/server/async.c > +++ b/server/async.c > @@ -216,6 +216,20 @@ void free_async_queue( struct async_queue *queue ) > release_object( queue ); > } > > +/* set the timeout of the async queue head if the new timeout is shorter than the current one */ > +/* only pass negative timeouts (i.e. timeouts relative to the current time) to this function */ > +void async_queue_set_shorter_timeout( struct async_queue *queue, timeout_t timeout, unsigned int status ) > +{ > + struct list *ptr; > + struct async *async; > + > + if (!(ptr = list_head( &queue->queue ))) return; > + async = LIST_ENTRY( ptr, struct async, queue_entry ); > + > + if (!async->timeout || -timeout < get_timeout_user_remaining( async->timeout )) > + async_set_timeout( async, timeout, status ); > +} You should be able to do this in the serial code, probably by using absolute timeouts. Note that you also need to preserve the original timeout, you can't simply replace it by the interval timeout. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: server: Avoid infinite loop when we're out of timers in set_win_timer server call
by Alexandre Julliard 22 Jan '16

22 Jan '16

Piotr Caban <piotr(a)codeweavers.com> writes: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > server/queue.c | 12 ++++++++++-- > server/trace.c | 1 + > 2 files changed, 11 insertions(+), 2 deletions(-) A test case would be nice. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] winebuild: Added support for entry points generated in runtime.
by Sebastian Lackner 22 Jan '16

22 Jan '16

On 19.01.2016 12:20, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > tools/winebuild/build.h | 1 + > tools/winebuild/parser.c | 1 + > tools/winebuild/spec32.c | 59 > ++++++++++++++++++++++++++++++++++++++++ > tools/winebuild/winebuild.man.in | 3 ++ > 4 files changed, 64 insertions(+) > I would also like to get this issue fixed, so I wouldn't complain if Alexandre really prefers the JIT approach, but I personally still do not really see a big advantage compared to static code generation. Let me quickly explain again why. I'll also send another mail to point a couple of issues with the current patch, but here again first the general discussion. * We have no way to implement support for 64-bit because SYSCALL instructions are directly part of the thunk. Unless we want to remove the "not" in the definition of "Wine is not an emulator", its technically impossible to intercept those Syscalls and we cannot implement it. * 32-bit Windows 8 thunks also cannot be implemented, with the same reason as 64-bit thunks. To see that, just take a look at the expected opcodes: // 00 b825000000 mov eax,25h // 05 e803000000 call eip+3 // 0a c22c00 ret 2Ch // 0d 8bd4 mov edx,esp // 0f 0f34 sysenter // 11 c3 ret // 12 8bff mov edi,edi And at the very strict verification: [...] CallEip != function_code.call_eip || function_code.call_offset != 3 [...] kSysenter != function_code.sysenter * Based on my knowledge, implementing WOW64 doesn't help much because we have no app which relies on it. Although their code technically would support it, it seems like Chromium and Steam never uses it in practice. At least during our testing so far, we haven't found a way to fix that. * Last but not least, one of the reasons why I haven't submitted my own approach so far: The whole idea only works reliable as long as we do NOT forward Ldr* functions to syscall thunks. If we do, like it should work on Windows, and like it is most likely required by other apps, there are race conditions all over the place and Steam webstore only works with a probability of about 50% or less. I haven't figured out what causes it yet. @ Alexandre: Do you have a preferrence? Suggestions we had so far: - JIT compilation of thunks (only x86) - Winebuild generated static thunks (see http://ix.io/nxT ) - Macro-generated thunks (see staging repo) To my knowledge, all have the same limitations: x86, non-wow64 and race-conditions when forwarding Ldr* functions through the syscall thunks. Best regards, Sebastian

6 15

Status of patch #118257
by Pierre Schweitzer 21 Jan '16

21 Jan '16

Hi, Is there anything wrong I can fix about patch #118257? Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

Re: [PATCH 1/2] dwrite: Ask freetype once about kerning pairs support and monospaced property
by Alexandre Julliard 21 Jan '16

21 Jan '16

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/dwrite/font.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so font && touch font.ok font.c:3088: Test failed: got 0 font.c:3095: Test failed: got 0 font.c:5059: Tests skipped: Segoe UI Emoji font not found. font.c:5165: Tests skipped: Segoe UI Emoji font not found. Makefile:212: recipe for target 'font.ok' failed make[1]: *** [font.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v2 1/1] ddraw/tests: Port test_lockrect_invalid to other versions.
by Marvin 21 Jan '16

21 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19881 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 4/8] d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion().
by Henri Verbeet 21 Jan '16

21 Jan '16

On 19 January 2016 at 22:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -4002,15 +4002,25 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev > } > src_surface = surface_from_resource(tmp); > > + if (src_box) > + { > + src_rect.left = src_box->left; > + src_rect.top = src_box->top; > + src_rect.right = src_box->right; > + src_rect.bottom = src_box->bottom; > + } > + else > + { > + src_rect.left = 0; > + src_rect.top = 0; > + src_rect.right = src_surface->resource.width; > + src_rect.bottom = src_surface->resource.height; > + } That's mostly what surface_get_rect() does, except that it doesn't take a wined3d_box structure, of course. wined3d_surface_blt() can handle a NULL src_rect though, so you don't need to do it here. It may make sense to require callers to pass a non-NULL wined3d_box to wined3d_texture_blt(). I think that everything that calls wined3d_surface_blt() or wined3d_texture_blt() should have easy access to the surface dimensions. That's a bit more involved because there are callers outside wined3d though.

2 2

Re: [PATCH 2/3] oleaut32: BSTRs should have 8 byte alignment on 64 bits.
by Jacek Caban 21 Jan '16

21 Jan '16

On 01/21/16 11:29, Huw Davies wrote: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/oleaut32/oleaut.c | 3 +++ > dlls/oleaut32/tests/vartype.c | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c > index 8a22c2e..07db9ff 100644 > --- a/dlls/oleaut32/oleaut.c > +++ b/dlls/oleaut32/oleaut.c > @@ -84,6 +84,9 @@ static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = > static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; > > typedef struct { > +#ifdef _WIN64 > + DWORD pad; > +#endif > DWORD size; > union { > char ptr[1]; How about changing size type to SIZE_T instead? This should have the same effect. Thanks, Jacek

2 1

Re: [PATCH] server: Implement serial port read interval timeouts.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Cc: Sebastian Lackner <sebastian(a)fds-team.de> > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39875 > > There is a test program attached to the bug report. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > server/async.c | 13 +++++++++++++ > server/fd.c | 6 ++++++ > server/file.h | 2 ++ > server/serial.c | 3 +++ > 4 files changed, 24 insertions(+) That's a good start, but I think you should be able to do it through the reselect_async fd operation, without making changes to the generic async code. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] ddraw/tests: Port test_lockrect_invalid to other versions (v2).
by Marvin 21 Jan '16

21 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19863 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: Updated WineHQ.org
by Theodore Dubois 20 Jan '16

20 Jan '16

You are allowed to use table layout (i.e: display: table, display: table-cell, etc.) Just not <table> tags. ~Theodore > On Jan 20, 2016, at 11:53 AM, Jeremy Newman <jnewman(a)codeweavers.com> wrote: > > This is why I miss using tables for HTML layout. This kind of problem was easy to solve with tables. But Nooooo tables are bad now. :-| > > I only applied my resize handler to the right side. I could apply it to the left side as well, but I think that will cause issues as the two sides fight over who should be the correct height. > > On 01/20/2016 01:44 PM, Ruslan Kabatsayev wrote: >> On Wed, Jan 20, 2016 at 10:19 PM, Jeremy Newman <jnewman(a)codeweavers.com> wrote: >>> On 01/20/2016 12:10 AM, Ruslan Kabatsayev wrote: >>>> >>>> Current version makes the Download/Support/Development/Donate block >>>> have twice the needed height with my 782px wide Chromium window, i.e. >>>> has empty space under the links. >>> >>> >>> This is by design. I added some jquery-fu to make sure that box was the same >>> height as the two boxes to the left of it. I think this looks better than a >>> larger empty black space under it. >>> >>> I do notice that at that width that the Development link does get a bit too >>> close to the edge of the box. Perhaps I should shrink down the font size by >>> a couple of px. >> >> OK, that thing was due my too old Chromium, it appears not >> reproducible with current versions. >> >> The jquery-fu though seems to not always work, namely with zoomed out >> page, see "zoomed" attachment (zoom is 50% there). This remains true >> with up-to-date Chromium and Firefox. >> >>> >>> -N > >

1 0

Updated WineHQ.org
by Jeremy Newman 20 Jan '16

20 Jan '16

I have updated the WineHQ.org main website with a new mobile friendly (bootstrap based) theme. The goal was the preserve the old look somewhat, while bringing it up to modern standards. I've ported most of the existing translations for the home page. Sub-pages will need to be updated. Translators, please update your sub-pages. Please update download.template first. -N

3 6

WWN?
by André Hentschel 20 Jan '16

20 Jan '16

Hi, As you might have noticed, I lost time and motivation to do WWN. Someone out there to continue it? Then I would cleanup the tools for it and guide her/him into using them.

1 0

Re: [PATCH 1/2] d3drm: Fix QueryInterface for IDirect3DRMTexture* (v2).
by Henri Verbeet 20 Jan '16

20 Jan '16

On 19 January 2016 at 15:29, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); > - return E_NOINTERFACE; > + return CLASS_E_CLASSNOTAVAILABLE; I missed this in the original patch as well, but now the message doesn't match the return value. These two patches seem fine otherwise.

2 1

Re: [2/2] comctl32: Don't update the status if the item is no longer valid.
by Nikolay Sivov 20 Jan '16

20 Jan '16

On 19.01.2016 17:45, Akihiro Sagawa wrote: > > This fixes https://bugs.winehq.org/show_bug.cgi?id=39677 > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/comctl32/listview.c | 2 +- > dlls/comctl32/tests/listview.c | 22 ++++++++++++++++++++++ > 2 files changed, 23 insertions(+), 1 deletion(-) > I think this is correct, but to make sure I fully understand what's going on. The idea is to return early from _SetItemT() for the case when old focused item index is larger than current number items in a list? >From reading surrounding code, it looks like application will receive state notifications for item number that's no longer valid, am I right? > + /* The focused item isn't updated after the invalidation */ The opposite is true, focused item is updated in this new test, from 0 to -1 (nothing focused), please fix this comment to reflect that. > comctl32: Don't update the status if the item is no longer valid. Subject needs some adjusting to, something like "Prevent invalid focuse change notifications from LVS_OWNERDATA lists", or similar. Right now it's not clear what 'status' and 'item' mean in this context. Thanks for debugging this.

2 1

Re: [PATCH] ntoskrnl.exe: Implement ZwLoadDriver and ZwUnloadDriver
by Dmitry Timoshkov 20 Jan '16

20 Jan '16

Aric Stewart <aric(a)codeweavers.com> wrote: > Code is mostly moved from winedevice.exe > winedevice.exe now uses these functions > > With consultation and help from Damjan Jovanovic This code is broken in so many ways, so I woudn't bother listing them all. -- Dmitry.

2 1

Re: [PATCH] d2d1: Don't update target dpi if only one SetDpi() argument is zero
by Henri Verbeet 20 Jan '16

20 Jan '16

On 19 January 2016 at 22:43, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -1436,6 +1436,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if > dpi_x = 96.0f; > dpi_y = 96.0f; > } > + else if (dpi_x == 0.0f || dpi_y == 0.0f) > + return; > Should this affect rendertarget creation (i.e., d2d_d3d_render_target_init()) as well? What about bitmap creation?

2 1

Re: [PATCH 1/8] wined3d: Do not update surface when empty box is passed.
by Henri Verbeet 20 Jan '16

20 Jan '16

On 19 January 2016 at 22:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > if (box->left >= box->right || box->right > sub_resource->width > - || box->top >= box->bottom || box->bottom > sub_resource->height) > + || box->top >= box->bottom || box->bottom > sub_resource->height > + || box->front >= box->back) It seems likely that you'll need to validate box->back against sub_resource->depth as well, although you may need 3D textures for a reliable test.

1 0

Re: [PATCH 1/3] msvcrt: Fix size test of structure returned by _Gettnames
by Marvin 20 Jan '16

20 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19825 Your paranoid android. === w1064 (32 bit locale) === locale.c:461: Test failed: ret = Norwegian Bokmål_Norway.1252 locale.c:468: Test failed: ret = Norwegian Bokmål_Norway.1252

2 1

Re: winspool.drv: add EnumPrinterKeyA/W stubs (try 2)
by Huw Davies 20 Jan '16

20 Jan '16

On Tue, Jan 19, 2016 at 03:45:32PM -0600, Austin English wrote: > diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c > index 04def86..06fa2a2 100644 > --- a/dlls/winspool.drv/info.c > +++ b/dlls/winspool.drv/info.c > @@ -7527,6 +7527,26 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName > } > > /***************************************************************************** > + * EnumPrinterKeyA [WINSPOOL.@] > + * > + */ > +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *ret) 'needed' is probably better than 'ret'. > +{ > + FIXME("%p %s %s %x %p\n", printer, debugstr_a(key), debugstr_a(subkey), size, ret); subkey is an [out] param, so just print the ptr. Same goes for the spec file. Huw.

1 0

Re: hidclass.sys: Properly quit hid_device_thread when both completion event and halt event are signaled (try 3)
by Aric Stewart 20 Jan '16

20 Jan '16

Sorry for the late reply, I have lost this e-mail as well. + rc = WaitForSingleObject(ext->halt_event, 0) You appear to be missing a ; This does not compile. did you even test that before sending in the patch? Otherwise the patch looks fine. -aric

2 1

Re: [2/2] shell32/tests: Call okShell() after a shell_execute{_ex}() test.
by Marvin 20 Jan '16

20 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19814 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2333: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt206D.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt206D.tmp\test file.sde")]' shlexec.c:2321: Test failed: failed: rc=29 err=2 shlexec.c:2321: Test failed: failed: rc=29 err=2

1 0

Re: [1/2] shell32/tests: Trace the last ShellExecute command whenever a corresponding test fails.
by Marvin 20 Jan '16

20 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19813 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2340: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde")]' shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtFF1B.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt1298.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt1298.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt1298.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2328: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt1298.tmp\test file.sde") failed: rc=29 err=2

1 0

Re: [PATCH v2] ole32: The type of the size of IMalloc'ed blocks is SIZE_T.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Huw Davies <huw(a)codeweavers.com> writes: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/ole32/ifs.c | 48 +++++++++++++++++++++++++----------------------- > include/objbase.h | 4 ++-- > include/objidl.idl | 18 +++++++++--------- > 3 files changed, 36 insertions(+), 34 deletions(-) There are more interfaces like IMimeAllocator that derive from IMalloc that need fixing too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ole32: The type of the size of IMalloc'ed blocks is SIZE_T.
by Dmitry Timoshkov 19 Jan '16

19 Jan '16

Huw Davies <huw(a)codeweavers.com> wrote: > -static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) { > - > +static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) > +{ Since basically every method entry is being changed, why not get rid of LPMALLOC as well? -- Dmitry.

2 1

Re: [PATCH 2/3] winex11: Don't recompute string length in remove_startup_notification.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > The string length was computed during the loop earlier in the function. > There is no need to call the O(n) strlen function to compute it again. Saving a couple of cycles in a function that is executed at most once is irrelevant, and not worth the code churn. Please avoid such "optimizations". -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] winebuild: Added support for entry points generated in runtime.
by Sebastian Lackner 19 Jan '16

19 Jan '16

On 19.01.2016 12:20, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > tools/winebuild/build.h | 1 + > tools/winebuild/parser.c | 1 + > tools/winebuild/spec32.c | 59 > ++++++++++++++++++++++++++++++++++++++++ > tools/winebuild/winebuild.man.in | 3 ++ > 4 files changed, 64 insertions(+) > > > > 0001-winebuild-Added-support-for-entry-points-generated-in.diff > > > diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h > index e32e7a9..2d5a162 100644 > --- a/tools/winebuild/build.h > +++ b/tools/winebuild/build.h > @@ -171,6 +171,7 @@ struct strarray > #define FLAG_REGISTER 0x10 /* use register calling convention */ > #define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ > #define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ > +#define FLAG_JIT 0x80 /* function is generated at runtime */ > > #define FLAG_FORWARD 0x100 /* function is a forwarded name */ > #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ > diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c > index 1d7b84e..c42fceb 100644 > --- a/tools/winebuild/parser.c > +++ b/tools/winebuild/parser.c > @@ -69,6 +69,7 @@ static const char * const FlagNames[] = > "register", /* FLAG_REGISTER */ > "private", /* FLAG_PRIVATE */ > "ordinal", /* FLAG_ORDINAL */ > + "jit", /* FLAG_JIT */ > NULL > }; > > diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c > index cb56abe..ebce6b4 100644 > --- a/tools/winebuild/spec32.c > +++ b/tools/winebuild/spec32.c > @@ -270,6 +270,60 @@ static void output_relay_debug( DLLSPEC *spec ) > } > } > > +static void output_jit_descs( DLLSPEC *spec ) > +{ > + int i, emited_descs = 0, jit_cnt = 0; No native english speaker here, but shouldn't it be "emitted" ? > + char **jit_entries, *sym_name; > + ORDDEF *odp; > + > + if (target_cpu != CPU_x86) > + return; > + > + for (odp = spec->entry_points; odp < spec->entry_points + spec->nb_entry_points; odp++) > + if (odp->flags & FLAG_JIT) > + jit_cnt++; This code should probably ignore spec entries with FLAG_FORWARD. Generating thunks wouldn't make sense then. Also, winebuild should probably complain when non-stdcall functions use -jit. > + if (!jit_cnt) > + return; > + > + jit_entries = xmalloc( jit_cnt*sizeof(*jit_entries) ); > + > + output( "\t.data\n" ); > + output( "%s\n", asm_globl("__wine_jit_descs") ); > + > + for (odp = spec->entry_points; odp < spec->entry_points + spec->nb_entry_points; odp++) { Minor issue, but coding style in winebuild usually has "{" on the next line. There are a couple more minor style issues in the next lines, like missing space inbetween of "(...)" and arguments. > + if (!(odp->flags & FLAG_JIT)) > + continue; > + > + for (i=0; i < emited_descs; i++) { > + if (!strcmp(odp->link_name, jit_entries[i])) > + break; > + } > + if (i < emited_descs) > + continue; /* already emited */ > + jit_entries[emited_descs] = odp->link_name; > + > + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); > + output( "\t.long %u\n", get_args_size(odp) ); > + emited_descs++; > + } > + > + output( "\t%s 0\n", get_asm_ptr_keyword() ); > + output( "\t.long 0\n" ); You should use .previous here to restore the previous section. > + > + output("\t.text\n" ); > + output( "%s\n", asm_globl("__wine_jit_entries") ); > + > + for (i=0; i < emited_descs; i++) { > + sym_name = strmake( "__jit_%s", jit_entries[i] ); > + output( "%s\n", asm_globl(sym_name) ); > + free( sym_name ); > + > + output( "\t.long 0\n\t.long 0\n\t.long 0\n\t.long 0\n" ); You might want to to emit .cfi_startproc and .cgi_endproc CFI directives here, to ensure debuggers and unwinding code can split it into separate functions. Also, you might want to use output_function_size(). > + } Same as above, you should add a ".restore" here. > + > + free(jit_entries); > +} > + > /******************************************************************* > * output_exports > * > @@ -332,6 +386,10 @@ void output_exports( DLLSPEC *spec ) > output( "\t%s %s_%s\n", > get_asm_ptr_keyword(), asm_name("__wine_spec_ext_link"), odp->link_name ); > } > + else if (target_cpu == CPU_x86 && (odp->flags & FLAG_JIT)) > + { > + output( "\t%s %s_%s\n", get_asm_ptr_keyword(), asm_name("__jit"), odp->link_name ); > + } > else > { > output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); > @@ -622,6 +680,7 @@ void BuildSpec32File( DLLSPEC *spec ) > output_stubs( spec ); > output_exports( spec ); > output_imports( spec ); > + output_jit_descs( spec ); > if (is_undefined( "__wine_call_from_regs" )) output_asm_relays(); > output_resources( spec ); > output_gnu_stack_note(); > diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in > index 2063738..2905bac 100644 > --- a/tools/winebuild/winebuild.man.in > +++ b/tools/winebuild/winebuild.man.in > @@ -299,6 +299,9 @@ accessed through GetProcAddress. > The entry point will be imported by ordinal instead of by name. The > name is still exported. > .TP > +.B -jit > +The function body will be generated in runtime. For internal Wine usage only. > +.TP > .BI -arch= cpu\fR[\fB,\fIcpu\fR] > The entry point is only available on the specified CPU > architecture(s). The names \fBwin32\fR and \fBwin64\fR match all > > >

1 0

Re: [PATCH 1/3] winebuild: Added support for entry points generated in runtime.
by Marcus Meissner 19 Jan '16

19 Jan '16

On Tue, Jan 19, 2016 at 12:20:30PM +0100, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> I am curious ... for what is this needed? Ciao, Marcus

2 1

Re: [PATCH] winex11: Avoid inefficiency and overflow in remove_startup_notification.
by Alex Henrie 19 Jan '16

19 Jan '16

Could I get some feedback on this patch? I'd rather not have it drop off the list a second time, especially since Vincent already signed off on it: https://www.winehq.org/pipermail/wine-patches/2015-November/144119.html -Alex

2 1

Re: [PATCH 2/2] d3drm/tests: Add QueryInterface tests for IDirect3DRMTexture*.
by Henri Verbeet 19 Jan '16

19 Jan '16

On 18 January 2016 at 19:57, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > + char *file = NULL; Why do you initialize this to NULL? > + BOOL check; > + > + > + hr = Direct3DRMCreate(&d3drm1); The extra empty line is weird. Is that intentional? > + file = create_bitmap(1, 1, TRUE); > + hr = IDirect3DRM_LoadTexture(d3drm1, file, &texture1); I think "file" is a bad name. I'd expect that to be a file handle or descriptor, not a string. > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", hr); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); This looks like it was leftover from somewhere, but in either case it doesn't test what the message says it's testing. It's fairly harmless here, but %x is a bad format in most cases. E.g., is "1000" decimal 4096 or decimal 1000? Just use %#x. Ideally you'd also use the same message format as the other D3D tests. > + check = DeleteFileA(file); > + ok(check, "Cannot delete image stored in %s (error = %d).\n", file, GetLastError()); > +} You're leaking "file".

2 1

Re: [PATCH 1/2] d3drm: Fix QueryInterface for IDirect3DRMTexture*.
by Henri Verbeet 19 Jan '16

19 Jan '16

On 18 January 2016 at 19:57, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) > - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) > + if (IsEqualGUID(riid, &IID_IDirect3DRMTexture) > + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) > + || IsEqualGUID(riid, &IID_IDirect3DRMObject) > || IsEqualGUID(riid, &IID_IUnknown)) > { > + *out = &texture->IDirect3DRMTexture_iface; This isn't necessarily wrong, but it does seem weird. You return &texture->IDirect3DRMTexture_iface here for e.g. IUnknown, but the implementation then forwards to &texture->IDirect3DRMTexture3_iface. It seems more logical to return the IDirect3DRMTexture3 interface here directly. We also tend to check the "newest" IID first, in D3D code at least. I.e., IID_IDirect3DRMTexture3 before IID_IDirect3DRMTexture.

2 1

Re: winspool.drv: add EnumPrinterKeyA/W stubs
by Dmitry Timoshkov 19 Jan '16

19 Jan '16

Austin English <austinenglish(a)gmail.com> wrote: > +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *ret); > +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *ret); > +#define EnumPrinterKey WINELIB_NAME_AW(EnumPrinterKey) This doesn't look right. -- Dmitry.

2 1

Re: [PATCH 5/5] d3d8/tests: Block validation checks the surface size too.
by Marvin 18 Jan '16

18 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19764 Your paranoid android. === w1064 (32 bit device) === device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2618: Test failed: The focus window is active. device.c:2626: Test failed: Got unexpected hr 0x88760869. device.c:2632: Test failed: Got unexpect screen size 800x600. device.c:2647: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2656: Test failed: Got unexpect screen size 800x600. device.c:2669: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2677: Test failed: Got unexpect width 640. device.c:2678: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 4/5] ddraw/tests: Port test_lockrect_invalid to other versions.
by Marvin 18 Jan '16

18 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19763 Your paranoid android. === wxppro (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === w2003std (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === wvistau64 (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === w2008s64 (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === w7u (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === w7pro64 (32 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00461957 === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === wvistau64 (64 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 0000000000457AC7 === w2008s64 (64 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 0000000000457AC7 === w7pro64 (64 bit ddraw4) === ddraw4.c:10352: Test failed: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 0000000000457AC7 === wxppro (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === w2003std (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === wvistau64 (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === w2008s64 (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === w7u (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === w7pro64 (32 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 0043A6FE === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === wvistau64 (64 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00000000004356FB === w2008s64 (64 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00000000004356FB === w7pro64 (64 bit ddraw2) === ddraw2.c:9182: Test failed: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00000000004356FB === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === wxppro (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === w2003std (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === wvistau64 (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === w2008s64 (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === w7u (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === w7pro64 (32 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 004147C8 === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === wvistau64 (64 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0000000000413727 === w2008s64 (64 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0000000000413727 === w7pro64 (64 bit ddraw1) === ddraw1.c:8079: Test failed: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0000000000413727 === wxppro (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === w2003std (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === wvistau64 (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === w2008s64 (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === w7u (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === w7pro64 (32 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 004985FD === w8 (32 bit ddraw7) === ddraw7.c:10650: Test failed: Lock returned 0 for rect [68, 60]->[60, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 68]->[68, 60], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-8, 60]->[0, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -8]->[68, 0], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-16, 60]->[-8, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -16]->[68, -8], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[136, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[68, 136], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [136, 60]->[144, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 136]->[68, 144], type managed texture. === w864 (32 bit ddraw7) === ddraw7.c:10650: Test failed: Lock returned 0 for rect [68, 60]->[60, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 68]->[68, 60], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-8, 60]->[0, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -8]->[68, 0], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-16, 60]->[-8, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -16]->[68, -8], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[136, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[68, 136], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [136, 60]->[144, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 136]->[68, 144], type managed texture. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:10650: Test failed: Lock returned 0 for rect [68, 60]->[60, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 68]->[68, 60], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-8, 60]->[0, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -8]->[68, 0], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-16, 60]->[-8, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -16]->[68, -8], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[136, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[68, 136], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [136, 60]->[144, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 136]->[68, 144], type managed texture. === wvistau64 (64 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 000000000048753F === w2008s64 (64 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 000000000048753F === w7pro64 (64 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 000000000048753F === w864 (64 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10650: Test failed: Lock returned 0 for rect [68, 60]->[60, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 68]->[68, 60], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-8, 60]->[0, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -8]->[68, 0], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-16, 60]->[-8, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -16]->[68, -8], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[136, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[68, 136], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [136, 60]->[144, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 136]->[68, 144], type managed texture. === w1064 (64 bit ddraw7) === ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10616: Test failed: Failed to create surface, hr 0x80004002. ddraw7.c:10650: Test failed: Lock returned 0 for rect [68, 60]->[60, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 68]->[68, 60], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-8, 60]->[0, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -8]->[68, 0], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [-16, 60]->[-8, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, -16]->[68, -8], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[136, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 60]->[68, 136], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [136, 60]->[144, 68], type managed texture. ddraw7.c:10650: Test failed: Lock returned 0 for rect [60, 136]->[68, 144], type managed texture.

1 0

Re: [PATCH 6/7] wined3d: Recognize SM4 _sat instruction modifier.
by Henri Verbeet 18 Jan '16

18 Jan '16

On 18 January 2016 at 21:16, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -909,6 +919,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi > ins->handler_idx = WINED3DSIH_TABLE_SIZE; > return; > } > + priv->dst_param[i].modifiers |= instruction_dst_modifier; This is fine, although I wonder if you considered making saturation an instruction modifier on the wined3d_shader_instruction side instead?

2 1

steam web browsing on OS X
by Theodore Dubois 18 Jan '16

18 Jan '16

Wine Staging includes some patches to fix Steam web browsing, but they are deactivated on Mac because they apparently require special build flags. Does anyone know what this refers to? ~Theodore

5 15

Re: [PATCH] user32: Allow WM_CAPTURECHANGE indicating SetCapture() parameter.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Christopher Thielen <cthielen(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=13683 > > A window may be notified with WM_CAPTURECHANGED about itself > gaining mouse capture if it calls SetCapture() twice. You'd need to review all places where we handle that message, I don't think we've taken that behavior into account. Because of this risk, I'm afraid it will have to wait until after code freeze. -- Alexandre Julliard julliard(a)winehq.org

4 7

Re: [PATCH v3] usp10: rewrite ScriptXtoCP
by Marvin 18 Jan '16

18 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19751 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1244: Test failed: 0: uJustification incorrect (0) usp10.c:1244: Test failed: 1: uJustification incorrect (0) usp10.c:1244: Test failed: 2: uJustification incorrect (0) usp10.c:1244: Test failed: 3: uJustification incorrect (0) usp10.c:1244: Test failed: 4: uJustification incorrect (0) usp10.c:1244: Test failed: 5: uJustification incorrect (0) usp10.c:1244: Test failed: 6: uJustification incorrect (0) usp10.c:1244: Test failed: 7: uJustification incorrect (0) usp10.c:1244: Test failed: 8: uJustification incorrect (0) usp10.c:1244: Test failed: 9: uJustification incorrect (0) usp10.c:1260: Test failed: 3: uJustification incorrect (0) usp10.c:1260: Test failed: 5: fDiacritic incorrect (1) usp10.c:1260: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1260: Test failed: 15: fDiacritic incorrect (1) usp10.c:1260: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH v2] usp10: rewrite ScriptXtoCP
by Huw Davies 18 Jan '16

18 Jan '16

On Fri, Jan 15, 2016 at 07:14:48AM -0600, Aric Stewart wrote: > diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c > index f0bbafe..f6bfcbf 100644 > --- a/dlls/usp10/usp10.c > +++ b/dlls/usp10/usp10.c > + > +/* > + To handle multi-glyph clusters we need to find all the glyphs that are > + represented in the cluster. This involves finding the glyph whose > + index is the cluster index as well as whose glyph indices are greater than > + our cluster index but not part of a new cluster. > + > + Then we sum all those glyphs' advances. > +*/ > +static inline int get_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *psva, const WORD *pwLogClust, int cGlyphs, int cChars, int cluster, int direction) I still think this line could do with wrapping. > HRESULT WINAPI ScriptXtoCP(int iX, > int cChars, > @@ -2587,16 +2663,10 @@ HRESULT WINAPI ScriptXtoCP(int iX, > int *piCP, > int *piTrailing) > { > - int item; > - float iPosX; > - float iLastPosX; > - int iSpecial = -1; > - int iCluster = -1; > - int clust_size = 1; > - int cjump = 0; > - int advance; > - float special_size = 0.0; > int direction = 1; > + int iPosX; > + int i; > + int glyph_index, cluster_index; > > TRACE("(%d,%d,%d,%p,%p,%p,%p,%p,%p)\n", > iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, > @@ -2605,6 +2675,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, > if (psa->fRTL && ! psa->fLogicalOrder) > direction = -1; > > + /* Looking for non-reversed clusters in a reversed string */ > if (direction<0) > { > int max_clust = pwLogClust[0]; > @@ -2616,14 +2687,15 @@ HRESULT WINAPI ScriptXtoCP(int iX, > return S_OK; > } > > - for (item=0; item < cChars; item++) > - if (pwLogClust[item] > max_clust) > + for (i=0; i< cChars; i++) > + if (pwLogClust[i] > max_clust) > { > ERR("We do not handle non reversed clusters properly\n"); > break; > } > } > > + /* Handle an iX < 0 */ > if (iX < 0) > { > *piCP = -1; I know most of this code was already like this, but since we're rewriting it anyway, I think it would be much clearer thus: /* Handle an iX < 0 */ if (iX < 0) { if (direction < 0) { *piCP = cChars; *piTrailing = 0; } else { *piCP = -1; *piTrailing = 1; } return S_OK; } /* Looking for non-reversed clusters in a reversed string */ if (direction < 0) { for (i=0; i< cChars; i++) if (pwLogClust[i] > max_clust) { FIXME("We do not handle non reversed clusters properly\n"); break; } } (I also changed the ERR -> FIXME). > @@ -2631,102 +2703,134 @@ HRESULT WINAPI ScriptXtoCP(int iX, > return S_OK; > } > > - iPosX = iLastPosX = 0; > + /* find the glyph_index based in iX */ > if (direction > 0) > - item = 0; > + { > + for (glyph_index = -1, iPosX = iX; iPosX >=0 && glyph_index < cGlyphs; iPosX -= piAdvance[glyph_index+1], glyph_index++) > + ; > + } > else > - item = cChars - 1; > - for (; iPosX <= iX && item < cChars && item >= 0; item+=direction) > - { > - iLastPosX = iPosX; > - if (iSpecial == -1 && > - (iCluster == -1 || > - (iCluster != -1 && > - ((direction > 0 && iCluster+clust_size <= item) || > - (direction < 0 && iCluster-clust_size >= item)) > - ) > - ) > - ) > + { > + for (glyph_index = -1, iPosX = iX; iPosX > 0 && glyph_index < cGlyphs; iPosX -= piAdvance[glyph_index+1], glyph_index++) > + ; > + } > + > + TRACE("iPosX %i -> glyph_index %i (%i)\n", iPosX, glyph_index, cGlyphs); > + > + *piTrailing = 0; > + if (glyph_index >= 0 && glyph_index < cGlyphs) > + { > + /* find the cluster */ > + if (direction > 0 ) > + for (i = 0, cluster_index = pwLogClust[0]; i < cChars && pwLogClust[i] <= glyph_index; cluster_index=pwLogClust[i++]) > + ; > + else > + for (i = 0, cluster_index = pwLogClust[0]; i < cChars && pwLogClust[i] >= glyph_index; cluster_index=pwLogClust[i++]) > + ; > + > + TRACE("cluster_index %i\n", cluster_index); > + > + if (direction < 0 && iPosX >= 0 && glyph_index != cluster_index) > { > - int check; > - int clust = pwLogClust[item]; > + /* We are off the end of the string */ > + *piCP = -1; > + *piTrailing = 1; > + return S_OK; > + } > > - iCluster = -1; > - cjump = 0; > - clust_size = get_cluster_size(pwLogClust, cChars, item, direction, > - &iCluster, &check); > - advance = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, clust, direction); > + /* find the first character of the cluster */ > + for (i = 0; i < cChars && pwLogClust[i] != cluster_index; i++) > + ; I'm wondering whether instead of the above loop, you could modify get_cluster_charsize() to return the start char as well as the size. Then you'd call it here and wouldn't need to call it later on (in the else block below). That would save an extra loop through the string. > > - if (check >= cChars && direction > 0) > - { > - int glyph; > - for (glyph = clust; glyph < cGlyphs; glyph++) > - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); > - iSpecial = item; > - special_size /= (cChars - item); > - iPosX += special_size; > - } > - else > + TRACE("first char index %i\n",i); > + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) > + { > + /* Check trailing */ > + if (glyph_index != cluster_index || > + (direction > 0 && abs(iPosX) <= (piAdvance[glyph_index] / 2)) || > + (direction < 0 && abs(iPosX) >= (piAdvance[glyph_index] / 2))) > + *piTrailing = get_cluster_charsize(pwLogClust,cChars,cluster_index); > + } > + else > + { > + int cluster_size; > + > + cluster_size = get_cluster_charsize(pwLogClust, cChars, cluster_index); > + > + if (cluster_size > 1) > { > - if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) > + /* Be part way through the glyph cluster based on size and position */ > + int cluster_advance = get_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, cluster_index, direction); > + double cluster_part_width = cluster_advance / (float)cluster_size; > + double adv; > + int part_index; > + > + /* back up to the beginning of the cluster */ > + for (adv = iPosX, part_index = cluster_index; part_index <= glyph_index; part_index++) > + adv += piAdvance[part_index]; > + if (adv > iX) adv = iX; > + > + TRACE("Multi-char cluster, no snap\n"); > + TRACE("cluster size %i, pre-cluster iPosX %f\n",cluster_size, adv); > + TRACE("advance %i divides into %f per char\n", cluster_advance, cluster_part_width); > + if (direction > 0) > { > - if (!cjump) > - iPosX += advance; > - cjump++; > + for (part_index = 0; adv >= 0; adv-=cluster_part_width, part_index++) > + ; > + if (part_index) part_index--; > } > else > - iPosX += advance / (float)clust_size; > + { > + for (part_index = 0; adv > 0; adv-=cluster_part_width, part_index++) > + ; > + if (part_index > cluster_size) > + { > + adv += cluster_part_width; > + part_index=cluster_size; > + } > + } > + > + TRACE("base_char %i part_index %i, leftover advance %f\n",i, part_index, adv); > + > + if (direction > 0) > + i += part_index; > + else > + i += (cluster_size - part_index); > + > + /* Check trailing */ > + if ((direction > 0 && fabs(adv) <= (cluster_part_width / 2.0)) || > + (direction < 0 && adv && fabs(adv) >= (cluster_part_width / 2.0))) > + *piTrailing = 1; > } > - } > - else if (iSpecial != -1) > - iPosX += special_size; > - else /* (iCluster != -1) */ > - { > - int adv = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, pwLogClust[iCluster], direction); > - if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) > + else > { > - if (!cjump) > - iPosX += adv; > - cjump++; > + /* Check trailing */ > + if ((direction > 0 && abs(iPosX) <= (piAdvance[glyph_index] / 2)) || > + (direction < 0 && abs(iPosX) >= (piAdvance[glyph_index] / 2))) > + *piTrailing = 1; > } > - else > - iPosX += adv / (float)clust_size; > - } > - } > - > - if (direction > 0) > - { > - if (iPosX > iX) > - item--; > - if (item < cChars && ((iPosX - iLastPosX) / 2.0) + iX >= iPosX) > - { > - if (scriptInformation[psa->eScript].props.fNeedsCaretInfo && clust_size > 1) > - item+=(clust_size-1); > - *piTrailing = 1; > } > - else > - *piTrailing = 0; > } > else > { > - if (iX == iLastPosX) > - item++; > - if (iX >= iLastPosX && iX <= iPosX) > - item++; > + TRACE("Point falls outside of string\n"); > + if (glyph_index < 0) > + i = cChars-1; > + else /* (glyph_index >= cGlyphs) */ > + i = cChars; > > - if (iLastPosX == iX) > - *piTrailing = 0; > - else if (item < 0 || ((iLastPosX - iPosX) / 2.0) + iX <= iLastPosX) > + /* If not snaping in the reverse direction (such as Hebrew) Then 0 > + point flow to the next character */ > + if (direction < 0) > { > - if (scriptInformation[psa->eScript].props.fNeedsCaretInfo && clust_size > 1) > - item-=(clust_size-1); > - *piTrailing = 1; > + if (!scriptInformation[psa->eScript].props.fNeedsCaretInfo && abs(iPosX) == piAdvance[glyph_index]) > + i++; > + else > + *piTrailing = 1; > } > - else > - *piTrailing = 0; > } > > - *piCP = item; > + *piCP = i; > > TRACE("*piCP=%d\n", *piCP); > TRACE("*piTrailing=%d\n", *piTrailing); > >

2 1

Re: bcrypt: Ensure we have gnutls_hash() available.
by Sebastian Lackner 18 Jan '16

18 Jan '16

On 18.01.2016 12:41, Huw Davies wrote: > Fixes compile failures with older versions of gnutls. > > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > configure.ac | 1 + > dlls/bcrypt/bcrypt_main.c | 10 +++++----- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 0766edf..0eedf43 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1270,6 +1270,7 @@ then > #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], > [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], > [GNUTLS_CFLAGS=""])]) > + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS]) > fi > WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], > [libgnutls ${notice_platform}development files not found, no schannel support.]) Wouldn't it be useful to warn a bit more explicit at compile-time? Otherwise packagers will have a hard time to find out if its supported by their build.

2 2

Re: shell32/tests: Model the okChildXxx() shlexec macros after the standard ok() macro.
by Marvin 18 Jan '16

18 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19704 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:141: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtE2DF.tmp\test file.noassoc.shlexec") WaitForSingleObject returned 258 shlexec.c:1576: Test failed: argvA3 expected 'QuotedUpperL', got 'Open' shlexec.c:1584: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtE2DF.tmp\test file.shlexec', got 'C:\Users\winetest\AppData\Local\Temp\wtE2DF.tmp\test file.noassoc.shlexec' === w1064 (32 bit shlexec) === shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt11AE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt11AE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt11AE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt11AE.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2311: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde")]' shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtC4FE.tmp\test file.sde") failed: rc=29 err=2

2 1

Re: shell32/tests: Use the shell_execute{_ex}() call site for its traces and error messages.
by Marvin 18 Jan '16

18 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19743 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2311: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde")]' shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt25AF.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt9B02.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt9B02.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt9B02.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wt9B02.tmp\test file.sde") failed: rc=29 err=2

2 1

Re: [PATCH] comctl32/trackbar: Update thumb immediately on key press (try 2)
by Nikolay Sivov 18 Jan '16

18 Jan '16

On 18.01.2016 11:43, Alistair Leslie-Hughes wrote: > From: Nikolay Sivov <nsivov(a)codeweavers.com> > > Changed the key press to use VK_END, since moving one value may not > change the thumb position on screen. > That makes sense, thanks.

1 0

compile wine problem
by SMLR 17 Jan '16

17 Jan '16

configure: WARNING: gst/gstpad.h: present but cannot be compiled configure: WARNING: gst/gstpad.h: check for missing prerequisite headers? configure: WARNING: gst/gstpad.h: see the Autoconf documentation configure: WARNING: gst/gstpad.h: section "Present But Cannot Be Compiled" configure: WARNING: gst/gstpad.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------ ## configure: WARNING: ## Report this to wine-devel(a)winehq.org ## configure: WARNING: ## ------------------------------------ ## help solve the problem. if you need any of the files - write and I will send them.

3 2

Re: [2/2] kernel32: add tests for GetSystemPreferredUILanguages (try2)
by Marvin 17 Jan '16

17 Jan '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19735 Your paranoid android. === w1064 (32 bit locale) === locale.c:2339: Test failed: LCMapStringEx should fail with bad locale name locale.c:2340: Test failed: unexpected error code -559038737 locale.c:2431: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4156: Test failed: IsValidLocaleName should have failed locale.c:4521: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4523: Test failed: For id 7, Expected IVC, got ''

1 0

Re: user32: add DisplayConfigGetDeviceInfo stub
by Alexandre Julliard 17 Jan '16

17 Jan '16

Austin English <austinenglish(a)gmail.com> writes: > diff --git a/include/winuser.h b/include/winuser.h > index 50821f4..189953b 100644 > --- a/include/winuser.h > +++ b/include/winuser.h > @@ -30,6 +30,7 @@ > #endif > #include <winuser.rh> > > +#include <wingdi.h> You can't do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] mpr: Implement WNetUseConnectionA(). (resend)
by Nikolay Sivov 16 Jan '16

16 Jan '16

On 16.01.2016 12:19, Pierre Schweitzer wrote: > This just implements WNetUseConnectionA() by forwarding it to > WNetUseConnectionW() using appropriate conversions when required. > > > +static PWSTR convert_stringa_to_w( LPCSTR strA ) > +{ > + int len; > + PWSTR strW; > + > + if (!strA) > + return NULL; > + > + len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); > + if (!len) > + return NULL; > + > + strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + if (!strW) > + return NULL; > + > + if (MultiByteToWideChar(CP_ACP, 0, strA, len, strW, len)) > + return strW; > + > + HeapFree(GetProcessHeap(), 0, strW); > + return NULL; > +} Second mbtowc is wrong - you're using 'len' as strA length, and it should be -1 like on first call. Also it's safe to assume that second call never fails it first one returned non-zero length. Take a look how it's done it more compact way in various dlls, search for strdupWtoA names (and probably for mpr.dll it should use similar name for consistency).

1 0

Re: USER32: Remove unused variables xoffset, yoffset in SCROLL_TrackScrollBar
by Carlo Bramini 16 Jan '16

16 Jan '16

Hi, thank you very much for your courtesy! I do not know why the bits changed... I remember that I modified the source with Pelles C and not with a native editor, perhaps it could have some connections with that. Sincerely, Carlo Bramini. >----Messaggio originale---- >Da: Nikolay Sivov <bunglehead(a)gmail.com> >Data: 16/01/2016 13.16 >A: <wine-devel(a)winehq.org> >Cc: <carlo.bramix(a)libero.it> >Ogg: Re: USER32: Remove unused variables xoffset, yoffset in SCROLL_TrackScrollBar > >On 16.01.2016 14:07, Carlo Bramini wrote: >> Hi dear friends, >> I'm replying here because I have not understood the assigned status as >> "Formatting" to the attached patch. >> Thank you very much for your time. > >Hi, Carlo. > >In your original patch you had this: > >--- >diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c >old mode 100644 >new mode 100755 >--- > >so scroll.c file was given exec bit for some reason, I don't know how >that happened, but it did happen on your side, and git picked that change. > >Next problem is missing Signed-of-by signature, you should have it for >all patches you send to wine-patches. No need to manually do so every >time, just configure git to include it automatically. > >At the end what happened is that I re-submitted your patch with those >things fixed under your name and mine. > >> >> Sincerely, >> >> Carlo Bramini. >> >>> ----Messaggio originale---- >>> Da: Marvin <testbot(a)winehq.org> >>> Data: 11/01/2016 15.22 >>> A: "Carlo Bramini"<carlo.bramix(a)libero.it> >>> Ogg: Re: USER32: Remove unused variables xoffset, yoffset in >> SCROLL_TrackScrollBar >>> >>> Thank you for your contribution to Wine! >>> >>> This is an automated notification to let you know that your patch has >>> been reviewed and its status set to "Formatting". >>> >>> This means that there are some formatting issues with your >>> patch. Either the author's full name, email address, or Signed-off-by >>> headers are missing, indentation is messed up (usually from editing >>> with a non-standard tab size), or there are gratuitous formatting >>> changes to the code. You need to resend a fixed patch. >>> >>> If you do not understand the reason for this status, disagree with our >>> assessment, or are simply not sure how to proceed next, please ask for >>> clarification by replying to this email. >> >> >> >> > >

1 0

Re: USER32: Remove unused variables xoffset, yoffset in SCROLL_TrackScrollBar
by Carlo Bramini 16 Jan '16

16 Jan '16

Hi dear friends, I'm replying here because I have not understood the assigned status as "Formatting" to the attached patch. Thank you very much for your time. Sincerely, Carlo Bramini. >----Messaggio originale---- >Da: Marvin <testbot(a)winehq.org> >Data: 11/01/2016 15.22 >A: "Carlo Bramini"<carlo.bramix(a)libero.it> >Ogg: Re: USER32: Remove unused variables xoffset, yoffset in SCROLL_TrackScrollBar > >Thank you for your contribution to Wine! > >This is an automated notification to let you know that your patch has >been reviewed and its status set to "Formatting". > >This means that there are some formatting issues with your >patch. Either the author's full name, email address, or Signed-off-by >headers are missing, indentation is messed up (usually from editing >with a non-standard tab size), or there are gratuitous formatting >changes to the code. You need to resend a fixed patch. > >If you do not understand the reason for this status, disagree with our >assessment, or are simply not sure how to proceed next, please ask for >clarification by replying to this email.

2 1

Re: [PATCH 1/1] d3drm/tests: Add texture loading tests.
by Aaryaman Vasishta 15 Jan '16

15 Jan '16

On Fri, Jan 15, 2016 at 5:25 PM, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > + for (i = 0; i < img->palette_size; ++i) > + { > + unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * > 2 : > How did you come up with that equation? Would be nice to know :) > > + > + hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); > + ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > + d3drm_img = IDirect3DRMTexture_GetImage(texture1); > + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > Why the '!!' ? How's that better than using a single negation? Other than all that, I've mostly understood the changes you made. Patch looks great :) I'll reply if I have any more queries on the same. Cheers, Aaryaman

2 1

Re: [PATCH] ddraw: Fix use of uninitialized memory.
by Stefan Dösinger 15 Jan '16

15 Jan '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-01-14 um 20:49 schrieb Thomas Faller: > + if ((desc->dwFlags & DDSD_LPSURFACE) > + && ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface)) > desc->dwFlags &= ~DDSD_LPSURFACE; I'd say report this to valgrind as well. If DDSD_LPSURFACE isn't set in the first place then randomly unsetting it doesn't really hurt. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWmBWcAAoJEN0/YqbEcdMwuuoP/R/psF/dtrnIb0tQH/JP9Ikg kbDNd1NUuwx8QEOKNevopq/ii24whN0VpgJRSKMslY3PvSH6WnWDq9VT3PxSECsc dhfESXJBPSHDfuyzRhVrtwNQvwKrotpUXQ1bIW3AKKsJRr8yOxS3QkYMbt9zMItO YMqy1MP1315Kp6o51LW3iMANipqpmSUfTIjPWrHj7nMKgNTcTbrqOpGHKezxw1u7 ox10hCEwVj5429drUej/Q/nQ1OoAluWAdH0hWZhAF4zi5O+1wwH7I+KwqbL6a/zK 7djvDv+V3EeHxuax3ljwtMoa6Vxwna1vpGSCTHN8N/gNZcFR5v2ne+i+rkGoFQ3V 8u5Lhb1CMaAsTrzBnw+jX2JKSsbpgzFO8nVlDEr2G/cSvf/wq1DaNRpjmFMCExYP 0fs1PzHf4jBubqVChycSbCT1AGEq29s2msn6ucomoTdM1kctRFKjoxPk76iJKE86 mSWBkcmjRSaDBuHt76xjpL9NPEO3CO6lJbtLslEo33kCbsdrv8i+AVGBBvWMf9Oj /bVieoGqk5djdi0bggrhspKGCsVZURYrfpgFv/FIq66Vs7SzEgZoXABoPkjugwtB DLPF2s1WjUqAq0CYWzgLOprvbFI2DPz/VtbaBoJ0GYr3bZJca+ZV8njXsQUMi52b PtFvXa2A4KJOm18CrCm4 =gjon -----END PGP SIGNATURE-----

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel