July 2015 - Wine-Devel - list.winehq.org

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

Nov. 22, 2020

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

1 1

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

Sept. 28, 2018

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

5 6

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

June 14, 2018

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

5 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

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

5 7

Speed of gdi vs opengl DirectDrawRenderer
by Jonas Maebe Oct. 11, 2015

Oct. 11, 2015

Hi, I had a problem with Majesty Gold HD running at glacial speed on my machine (quad Core i5 2.9GHz, NVidia GeForce GT 750M 1GB, OS X 10.9.5). I'm using wine 1.7.35, but I've had similar problems with older wine versions. It's a DirectDraw7 game that has been partially remastered to run on modern systems, but still uses DirectDraw7. This is a common problem on Windows too, but generally can be resolved by telling the game to use the DirectDraw blitter (instead of blitting itself). That didn't help on Wine though. I profiled wine (Instruments time profile) and noticed that most time was spent in wined3d's convert_r5g6b5_x8r8g8b8. Replacing that routine with an optimized sse2 version from pixman did not make much of a difference. Then I discovered that if I told the game to render to a 16 bit instead of to a 32 bit surface, wine would let OpenGL handle the colour conversion. Unfortunately, while this significantly reduced wine's cpu usage, it by no means made the game any faster. Looking at the OpenGL Driver Monitor stats, it seems the cpu was simply waiting all the time on the GPU, probably while it was blitting all of those 1920x1080 images to the screen. Reducing the resolution to the lowest supported by the game (800x600) made it slightly faster, but not much. Next, I added the DirectDrawRenderer registry key and set it to gdi. Now, while it's still slow at 1920x1080, the game runs much faster at 800x600 and even still at 1024x768. Profiling the gdi renderer shows that it has way higher cpu usage than the OpenGL renderer (virtually all in convert_to_8888), but it seems that for some reason it has causes much less traffic to the GPU. The wiki's wording suggests the gdi renderer is deprecated though. Does that mean this qualifies as a bug in the OpenGL renderer (maybe it tries to update the screen more often than necessary, saturating the bus that way?), and are there any things I can try to narrow down why the gdi renderer is so much faster? I didn't immediately see where it blits things actually to the screen. Thanks, Jonas

4 10

Migrating away from Sourceforge
by Austin English Sept. 29, 2015

Sept. 29, 2015

Howdy all, I noticed there was some discussion of this on #winehackers a week or two ago, but I haven't seen any formal discussion about it. Given SourceForge's recent activities [1] [2] with taking over open source projects for their own gain, I propose that we migrate away from SourceForge. The main uses for SourceForge is for mirroring tarballs, wine-gecko/wine-mono installers, and the wine-gecko git repository. @Jeremy, would it be feasible for winehq's (existing) servers to handle the additional load? [1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… [2] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… -- -Austin

14 22

Prep for Wineconf - testing
by Jeremy White Sept. 17, 2015

Sept. 17, 2015

Hi folks, Now that I have my room booked, my thoughts turn to what we'll actually do at Wineconf. And, of course, a Wineconf tradition is for me to lock everyone in the room, away from the bar, until the test situation improves. Sadly, despite the best efforts of some people (yay, Huw!), we are still staring at a range of test failures on Windows. It looks like we've got XP and 2003 starting to show green, and 2000 and 2008 look tantalizingly close. Looks like msi timeouts remain a problem. We had some discussion of throwing some hardware at the problem; I'm happy to do that, but, afair, it wasn't clear that it would help. Weren't we going to run an experiment by setting the run queue size to 1 to see if that prevented the msi timeout failures? If changing the run queue size from n to 1 and buying n machines will 'fix' this, maybe it's time to do that. I seem to recall that Francois needed cooperation from Alexandre to run that experiment - is that right? Once we think we've got robust Windows tests, then we move on to pursuit of the the holy grail - having at least two Linux machines capable of running make test cleanly. (I recall a glorious day when we achieved that; sadly, that moment didn't last :-/). So does it make sense to ask people to start daily winetest runs so we can populate a bit more data? Looks like we've got the CodeWeavers test boxes, and one from Austin. And I don't see any for Mac :-(. Cheers, Jeremy

7 16

Re: [website] Update Debian downloads info
by Jeremy Newman Sept. 12, 2015

Sept. 12, 2015

Patch looks good. We will also need to update all the other languages and put in a redirect for the /downloads/debian page to the regular downloads page. -N On 07/22/2015 01:43 PM, Rosanne DiMesio wrote: > Updates the Debian links on the Downloads page to point to packages.debian.org and deletes the obsolete WineHQ Debian downloads page. > > > >

8 18

D3DRM Implementation patches upto CreateDeviceFromSurface
by Aaryaman Vasishta Aug. 5, 2015

Aug. 5, 2015

CreateDeviceFromD3D will be pushed as soon as patch 9 is finalised. The main concern right now is the thunking of the Release methods of the device. This concern comes up from the fact that the CreateDeviceFromSurface methods from all 3 versions behave the same way except for one difference in version 3, which I mention below. When you create a device from IDirect3DRM3::CreateDeviceFromSurface and release it, native will also destroy the depth surface attached to it (if it created it internally), otherwise it'll let the application keep the reference to the depth surface it created. Other than the above peculiarity, the behaviour is identical. I've attached all the commits which lead to the point of implementing CreateDeviceFromSurface. Please, review the patches as much as you'd like and if possible, provide feedback and suggestions on any improvements that can be made, possible comments required, any stupid mistakes I made etc. :) Thank you! Aaryaman

2 20

Re: [PATCH 1/4] reg: Add path/key conversion functions
by Stefan Dösinger Aug. 3, 2015

Aug. 3, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Thanks for picking up this work! Please submit patches with your real name. We need this for proper copyright attribution. Since this is derived from Jonathan work please mention this as well. The patch doesn't apply for me, I suspect that this is because of the no-break spaces instead of normal spaces. I highly recommend to use git send-email to send the mail. I haven't looked at the code itself. I hope I get around to look at it later today or on Sunday and compare it to the last suggestions I gave Jonathan. If you don't hear from me by Monday please ping me again. Cheers, Stefan Am 2015-07-31 um 11:46 schrieb xantares 09: > --- programs/reg/reg.c | 166 > +++++++++++++++++++++++++++------------------------- 1 file > changed, 86 insertions(+), 80 deletions(-) > > diff --git a/programs/reg/reg.c b/programs/reg/reg.c index > 4ec25bc..cf6425e 100644 --- a/programs/reg/reg.c +++ > b/programs/reg/reg.c @@ -22,6 +22,32 @@ > > #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) > > +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static > const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR > short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[] > = {'H','K','U',0}; +static const WCHAR short_hkcc[] = > {'H','K','C','C',0}; +static const WCHAR long_hklm[] = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > +static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; > +static const WCHAR long_hkcr[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > +static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; > +static const WCHAR long_hkcc[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > + > +static const struct +{ + HKEY key; + const WCHAR > *short_name; + const WCHAR *long_name; +} +root_rels[] = +{ + > {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, + > {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, + > {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, + {HKEY_USERS, > short_hku, long_hku}, + {HKEY_CURRENT_CONFIG, short_hkcc, > long_hkcc}, +}; + static const WCHAR type_none[] = > {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] = > {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] = > {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51 > +121,56 @@ static int reg_message(int msg) return > reg_printfW(formatW, msg_buffer); } > > -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) > +static inline BOOL path_rootname_cmp(const WCHAR *input_path, > const WCHAR *rootkey_name) { - int i; + DWORD length = > strlenW(rootkey_name); > > - for (i = 0; i < len; i++) + return (!strncmpiW(input_path, > rootkey_name, length) && + (input_path[length] == 0 || > input_path[length] == '\\')); +} + +static HKEY > path_get_rootkey(const WCHAR *path) +{ + DWORD i; + + for (i > = 0; i < ARRAY_SIZE(root_rels); i++) { - if (!str[i]) - > { - len = i + 1; - break; - } + > if (path_rootname_cmp(path, root_rels[i].short_name) || + > path_rootname_cmp(path, root_rels[i].long_name)) + > return root_rels[i].key; } > > - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, > len) - CSTR_EQUAL; + return NULL; } > > -static HKEY get_rootkey(LPWSTR key) +static HKEY path_open(const > WCHAR *path, BOOL create) { - static const WCHAR szHKLM[] = > {'H','K','L','M',0}; - static const WCHAR szHKEY_LOCAL_MACHINE[] > = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > - - static const WCHAR szHKCU[] = {'H','K','C','U',0}; > - static const WCHAR szHKEY_CURRENT_USER[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0 }; > > - - static const WCHAR szHKCR[] = {'H','K','C','R',0}; > - static const WCHAR szHKEY_CLASSES_ROOT[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > - - static const WCHAR szHKU[] = {'H','K','U',0}; > - static const WCHAR szHKEY_USERS[] = > {'H','K','E','Y','_','U','S','E','R','S',0}; - static const > WCHAR szHKCC[] = {'H','K','C','C',0}; - static const WCHAR > szHKEY_CURRENT_CONFIG[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > - - > - if (!reg_StrCmpNIW(key, szHKLM, 4) || - > !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) - return > HKEY_LOCAL_MACHINE; - else if (!reg_StrCmpNIW(key, szHKCU, 4) > || - !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) - > return HKEY_CURRENT_USER; - else if (!reg_StrCmpNIW(key, szHKCR, > 4) || - !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) - > return HKEY_CLASSES_ROOT; - else if (!reg_StrCmpNIW(key, szHKU, > 3) || - !reg_StrCmpNIW(key, szHKEY_USERS, 10)) - > return HKEY_USERS; - else if (!reg_StrCmpNIW(key, szHKCC, 4) || > - !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) - > return HKEY_CURRENT_CONFIG; - else return NULL; + LONG err; + > HKEY k; + + k = path_get_rootkey(path); + if (!k) + { + > reg_message(STRING_INVALID_KEY); + return NULL; + } + + > path = strchrW(path, '\\'); + if (path) + path++; + + > if (create) + err = RegCreateKeyW(k, path, &k); + else + > err = RegOpenKeyW(k, path, &k); + + if (err != ERROR_SUCCESS) + > { + reg_message(STRING_CANNOT_FIND); + return NULL; + > } + + return k; } > > static DWORD wchar_get_type(const WCHAR *type_name) @@ -221,34 > +252,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, > BOOL value_empty, { static const WCHAR stubW[] = {'A','D','D',' > ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s',' > ','%','s',' ','%','d','\n',0}; - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; > > reg_printfW(stubW, key_name, value_name, value_empty, type, data, > force); > > if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > TRUE); + if (!subkey) return 1; - } - - > if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } > > if (value_name || data) { @@ -288,8 +301,8 @@ static int > reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL > value_empty, BOOL value_all, BOOL force) { - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; + LONG err; > > static const WCHAR stubW[] = {'D','E','L','E','T','E', ' ','-',' > ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' @@ > -299,20 +312,9 @@ static int reg_delete(WCHAR *key_name, WCHAR > *value_name, BOOL value_empty, if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > FALSE); + if (!subkey) return 1; - } > > if (value_name && value_empty) { @@ -334,7 +336,17 @@ static int > reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* > Delete subtree only if no /v* option is given */ if (!value_name && > !value_empty && !value_all) { - if > (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + static const WCHAR > empty_wstr[] = {0}; + + err = RegDeleteTreeW(subkey, NULL); > + if (err != ERROR_SUCCESS) + { + > reg_message(STRING_CANNOT_FIND); + return 1; + } > + + err = RegDeleteKeyW(subkey, empty_wstr); + if > (err != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return > 1; @@ -343,12 +355,6 @@ static int reg_delete(WCHAR *key_name, > WCHAR *value_name, BOOL value_empty, return 0; } > > - if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_CANNOT_FIND); - return 1; - } - if > (value_all) { LPWSTR szValue; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVu33xAAoJEN0/YqbEcdMw1MEP/RZYiu5ZzcuAxcOvzmu2LrqR siZmDtSFzd+KN40tHl8IgrFB2kX2RePc0i4cNZJ1EUeMReS84HXoXSzUtDil5oy8 g0J9jFaZVv3xtznxKtQZDur2v3t+IYicjquhfbj7szheLpRbnfULwk3cs825QN1k C/Nhpj9aeDST49fe/YSi84XC15n2OyVHcZtTRgd4IZFVgd76L5kQYKYzLmv4ttes Mm5LGn5No72nehefRkW9YaFv2JAddgM/2jgz48+nd/pFhCB1NyXL2K6c5WPxT1OT Ahyx3oatrP5vSgNDc1Q3g0qGgYlk+aJAfulbSYZ4aSxS/YFcVqMbjEqb8mpPGUzX 1viNVuxg4dcfxozINJYPLkyU/ef9DwlSLdG3HlN9HDy/WFK/0lW4L4TEV9DrPwA+ /OPB8I7Vkb3r6qjsBEH4c1yG9PVQ0TiP3vjpEZM20J/gsvlTnJ6g3PSm9hFjwBWH bv5eBKJMUJKYiEJSoamfnermKEcxBcdOKsGbMApvRyVifcuUpY45+zv4bH0iVnKM 6pxb0EhWfizzbsDItSLDYNJZj1/XgMisgoKwnfUyxdmzRuzW9SipFmFqU6v8Sxpd QQOFSVG0IzL1QED51V2rlS5H1kZxCjRp+mKAn0j6a6KGNuZHcSAqCanhkyVW8FY7 OiDRd7mrwc32lMRcxqS+ =Sn4W -----END PGP SIGNATURE-----

2 2

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin July 31, 2015

July 31, 2015

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=15677 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin July 31, 2015

July 31, 2015

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=15676 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin July 31, 2015

July 31, 2015

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=15675 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin July 31, 2015

July 31, 2015

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=15671 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin July 31, 2015

July 31, 2015

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=15670 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin July 31, 2015

July 31, 2015

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=15669 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ole32/tests: Fix new failures in CoWaitForMultipleHandles tests
by Marvin July 30, 2015

July 30, 2015

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=15660 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test (v2).
by Marvin July 30, 2015

July 30, 2015

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=15655 Your paranoid android. === w8 (32 bit visual) === visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 77. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 77. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 77. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 77. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 75. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 75. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 75. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 75. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 75.

1 0

Re: ole32: Don't pump all messages in CoWaitForMultipleHandles in threads without apartment window
by Marvin July 30, 2015

July 30, 2015

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=15654 Your paranoid android. === w8 (32 bit compobj) === compobj.c:2149: Test failed: expected index 0, got 3735928559 compobj.c:2157: Test failed: expected index 0, got 3735928559

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin July 30, 2015

July 30, 2015

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=15658 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin July 30, 2015

July 30, 2015

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=15657 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin July 30, 2015

July 30, 2015

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=15656 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test.
by Marvin July 30, 2015

July 30, 2015

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=15652 Your paranoid android. === w8 (32 bit visual) === visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 77. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 77. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 77. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 77. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 77.

1 0

Re: [4 PATCHES] reg.exe: implement query (bug #24017)
by Alex Henrie July 30, 2015

July 30, 2015

Xan, You will have to send these patches to the mailing list in separate emails. I strongly recommend using the `git send-email` command for this purpose. It would also be a good idea to ask for feedback on the #wine-staging IRC channel. -Alex

5 5

Re: [PATCH] ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS.
by Ken Thomases July 30, 2015

July 30, 2015

On Jul 30, 2015, at 1:38 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > @@ -4459,14 +4464,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID > fd = get_sock_fd(s, 0, NULL); > if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) > status = WSAEINVAL; > -#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) > +#if defined(TCP_KEEPIDLE) This could be an #ifdef, but see below. > /* these values need to be set only if SO_KEEPALIVE is enabled */ > else if(keepalive) > { > if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) > status = WSAEINVAL; > + /* TCP_KEEPINTVL was only introduced on Mac in 10.9 */ > +#ifdef TCP_KEEPINTVL > else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) > status = WSAEINVAL; > +#else > + else > + FIXME("ignoring keepalive interval\n"); > +#endif > } > #else > else The #ifdef's in the above don't seem quite right. If TCP_KEEPINTVL is a legitimate alternative to TCP_KEEPIDLE/TCP_KEEPALIVE, then why is the latter a precondition for trying the former? That is, if TCP_KEEPINTVL is defined but TCP_KEEPIDLE is not, we still don't try it. That's not something that you introduced, but might as well fix it. -Ken

1 0

HID work?
by Aric Stewart July 30, 2015

July 30, 2015

Hi, Just a poke around the HID patches I have submitted. After my last refactor they did not appear to get any review. I know that Alexandre has been off on a vacation so that is part of it. But I wanted to know what is next that I need to fix or if they can start getting in. thanks! -aric

1 0

Re: [PATCH 1/2] wined3d: Try to detect the polygon offset scale value.
by Henri Verbeet July 30, 2015

July 30, 2015

On 30 July 2015 at 12:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + if (depth->format_flags & WINED3DFMT_FLAG_FLOAT) > + scale = gl_info->float_polyoffset_scale; > + else > + scale = gl_info->fixed_polyoffset_scale; Ideally this would be a format property. In practice it probably works because we only use 24 and 32 bit depth formats, and the hardware probably either only distinguishes between 16 and 24/32, or just doesn't support 32. > + while(1) I would have preferred that as "for (;;)" > + return powf(2, cur); It seems the compiler is smart enough to work it out, but strictly speaking powf() takes floating point arguments.

2 1

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test.
by Henri Verbeet July 30, 2015

July 30, 2015

On 30 July 2015 at 12:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + static const D3DFORMAT formats[] = > + { > + D3DFMT_D16, D3DFMT_D24X8, D3DFMT_D32, > + > + /* The scaling factor detection function detects the wrong factor for > + * float formats on Nvidia, therefore the following tests are disabled. > + * The wined3d function detects 2^23 like for fixed point formats but > + * the test needs 2^22 to pass. > + * > + * AMD GPUs need a different scaling factor for float depth buffers > + * (2^24) than fixed point (2^23), but the wined3d detection function > + * works there, producing the right result in the test. > + * > + * D3DFMT_D32F_LOCKABLE, D3DFMT_D24FS8, > + */ > + }; > + No D24S8? I think that's one of the most common formats. (No INTZ either, but I suppose it's likely to behave like everything else.)

1 0

Re: ws2_32: socket keepalive for OSX
by Charles Davis July 30, 2015

July 30, 2015

> On Jul 29, 2015, at 7:30 PM, Matt Durgavich <mattdurgavich(a)gmail.com> wrote: > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -4468,6 +4468,15 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID […] > + else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, (void*)&keepintvl, sizeof(int)) == -1) > + status = WSAEINVAL; This isn’t correct. Not for Darwin, anyway. TCP_KEEPALIVE on Darwin corresponds to Linux TCP_KEEPIDLE, not TCP_KEEPINTVL. (I checked. I read the kernel source to make sure of this.) The easiest way to implement this is to define TCP_KEEPIDLE to TCP_KEEPALIVE if TCP_KEEPIDLE isn’t defined but TCP_KEEPALIVE is. As for the other BSD systems, I’m pretty sure they implement the Linux interface (if at all). I know FreeBSD does. Also, Darwin only grew support for TCP_KEEPINTVL in Darwin 13 (i.e. Mac OS 10.9), so even with my suggested change, the existing #ifdef block won’t get compiled in on lower than 10.9. If you want to support 10.6 (when TCP_KEEPALIVE was introduced) through 10.8, you might consider pulling the TCP_KEEPINTVL check into its own #ifdef block, and printing a FIXME if it isn’t defined. You know what? I already have a patch that does all these things. I think I’ll just send that. (I’ve really got to start sending more of my patches upstream…) Chip

1 0

Re: ws2_32: socket keepalive for OSX
by Bruno Jesus July 30, 2015

July 30, 2015

Hi, Matt, thanks for the patch, here is some feedback. Please use a 4 space identation like the code style in this function. > +#elif defined(SO_KEEPALIVE) && defined(TCP_KEEPALIVE) SO_KEEPALIVE is defined for sure (already used outside #ifdef) so there is no need to test. > + /* BSDish platforms like Darwin */ > + else if (keepalive) > + { > + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void*)&keepalive, sizeof(int)) == 1) > + status = WSAEINVAL; SO_KEEPALIVE value was already set by a previous call before the #ifdef. Is there a reason to repeat it? Also you are testing the return value for 1 instead of -1. > + else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, (void*)&keepintvl, sizeof(int)) == -1) > + status = WSAEINVAL; > + } Please note that in the rest of the code it is used (void *), not (void*). Best wishes, Bruno On Wed, Jul 29, 2015 at 10:30 PM, Matt Durgavich <mattdurgavich(a)gmail.com> wrote: > Set socket options for keepalive on OSX tcp connections. > No tests at this time. > > dlls/ws2_32/socket.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > > >

1 0

Re: [PATCH 5/5] d3dx9/tests: Add tests for normals computation.
by Matteo Bruni July 29, 2015

July 29, 2015

2015-07-25 11:23 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > --- > dlls/d3dx9_36/tests/mesh.c | 573 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 573 insertions(+) > > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 2da077a..a5b3c46 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -65,6 +65,11 @@ static BOOL compare_vec3(D3DXVECTOR3 u, D3DXVECTOR3 v) > return ( compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) ); > } > > +static BOOL compare_vec4(D3DXVECTOR4 u, D3DXVECTOR4 v) > +{ > + return compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) && compare(u.w, v.w); > +} > + > #define check_floats(got, exp, dim) check_floats_(__LINE__, "", got, exp, dim) > static void check_floats_(int line, const char *prefix, const float *got, const float *exp, int dim) > { > @@ -10373,6 +10378,573 @@ static void test_optimize_faces(void) > "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); > } > > +static HRESULT clear_normals(ID3DXMesh *mesh) > +{ > + HRESULT hr; > + BYTE *vertices; > + size_t normal_size; > + DWORD i, num_vertices, vertex_stride; > + const D3DXVECTOR4 normal = {NAN, NAN, NAN, NAN}; > + D3DVERTEXELEMENT9 *normal_declaration = NULL; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + > + if (FAILED(hr = mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + return hr; > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) > + { > + if (declaration[i].Usage == D3DDECLUSAGE_NORMAL && declaration[i].UsageIndex == 0) Style, lowercase hex literal and !var instead of var == 0 are usually preferred in d3d. > + { > + normal_declaration = &declaration[i]; > + break; > + } > + } > + > + if (!normal_declaration) > + return D3DERR_INVALIDCALL; > + > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + normal_size = sizeof(D3DXVECTOR3); > + } > + else if (normal_declaration->Type == D3DDECLTYPE_FLOAT4) > + { > + normal_size = sizeof(D3DXVECTOR4); > + } > + else > + { > + trace("Cannot clear normals\n"); > + return E_NOTIMPL; > + } > + > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + > + if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + return hr; > + > + vertices += normal_declaration->Offset; > + > + for (i = 0; i < num_vertices; i++, vertices += vertex_stride) > + memcpy(vertices, &normal, normal_size); > + > + return mesh->lpVtbl->UnlockVertexBuffer(mesh); > +} > + > +static void compare_normals(unsigned int line, const char *test_name, > + ID3DXMesh *mesh, const D3DXVECTOR3 *normals, unsigned int num_normals) > +{ > + unsigned int i; > + BYTE *vertices; > + DWORD num_vertices, vertex_stride; > + D3DVERTEXELEMENT9 *normal_declaration = NULL; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + > + if (FAILED(mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + { > + ok_(__FILE__, line)(0, "%s: Failed to get declaration\n", test_name); > + return; > + } > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) > + { > + if (declaration[i].Usage == D3DDECLUSAGE_NORMAL && declaration[i].UsageIndex == 0) > + { > + normal_declaration = &declaration[i]; > + break; > + } > + } > + > + if (!normal_declaration) > + { > + ok_(__FILE__, line)(0, "%s: Mesh has no normals\n", test_name); > + return; > + } > + > + if (normal_declaration->Type != D3DDECLTYPE_FLOAT3 && normal_declaration->Type != D3DDECLTYPE_FLOAT4) > + { > + ok_(__FILE__, line)(0, "%s: Mesh has invalid normals type\n", test_name); > + return; > + } > + > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + > + ok_(__FILE__, line)(num_vertices == num_normals, "%s: Expected %u vertices, got %u\n", test_name, > + num_normals, num_vertices); > + > + if (FAILED(mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + { > + ok_(__FILE__, line)(0, "%s: Failed to compare normals\n", test_name); > + return; > + } > + > + vertices += normal_declaration->Offset; > + > + for (i = 0; i < min(num_vertices, num_normals); i++, vertices += vertex_stride) > + { > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + const D3DXVECTOR3 *n = (D3DXVECTOR3 *)vertices; > + ok_(__FILE__, line)(compare_vec3(*n, normals[i]), > + "%s: normal %2u, expected (%f, %f, %f), got (%f, %f, %f)\n", > + test_name, i, normals[i].x, normals[i].y, normals[i].z, n->x, n->y, n->z); > + } > + else > + { > + const D3DXVECTOR4 *n = (D3DXVECTOR4 *)vertices; > + const D3DXVECTOR4 normal = {normals[i].x, normals[i].y, normals[i].z, 1.0f}; > + ok_(__FILE__, line)(compare_vec4(*n, normal), > + "%s: normal %2u, expected (%f, %f, %f, %f), got (%f, %f, %f, %f)\n", > + test_name, i, normals[i].x, normals[i].y, normals[i].z, 1.0f, > + n->x, n->y, n->z, n->w); > + } > + } > + > + mesh->lpVtbl->UnlockVertexBuffer(mesh); > +} > + > +static HRESULT compute_normals_D3DXComputeNormals(ID3DXMesh *mesh, const DWORD *adjacency) > +{ > + return D3DXComputeNormals((ID3DXBaseMesh *)mesh, adjacency); > +} > + > +static HRESULT compute_normals_D3DXComputeTangentFrameEx(ID3DXMesh *mesh, const DWORD *adjacency) > +{ > + return D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); > +} > + > +static void test_compute_normals(void) > +{ > + HRESULT hr; > + ULONG refcount; > + ID3DXMesh *mesh, *cloned_mesh; > + ID3DXBuffer *adjacency; > + IDirect3DDevice9 *device; > + struct test_context *test_context; > + unsigned int i; > + > + static const struct compute_normals_func > + { > + const char *name; > + HRESULT (*apply)(ID3DXMesh *mesh, const DWORD *adjacency); > + } > + compute_normals_funcs[] = > + { > + {"D3DXComputeNormals", compute_normals_D3DXComputeNormals }, > + {"D3DXComputeTangentFramEx", compute_normals_D3DXComputeTangentFrameEx} Typo. BTW, I feel like you could push this kind of table-based test organization further. E.g. also add a couple more variants for D3DXTANGENT_WEIGHT_BY_AREA and D3DXTANGENT_WEIGHT_EQUAL. You might have to store the expected results for box and sphere normals in the table. Doing that might be more messy than it looks like though, so I'm okay if you think that's not worth it. > + }; > + > + static const D3DXVECTOR3 box_normals[24] = > + { > + {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, > + { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, > + { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, > + { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, > + { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, > + { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f} > + }; > + float box_normal_component = 1.0f / sqrtf(3.0f); > + D3DXVECTOR3 box_normals_adjacency[24] = I think you can still make this const. > + { > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component} > + }; > + static const D3DXVECTOR3 box_normals_adjacency_area[24] = > + { > + {-0.666667f, -0.333333f, -0.666667f}, {-0.333333f, -0.666667f, 0.666667f}, > + {-0.816496f, 0.408248f, 0.408248f}, {-0.408248f, 0.816496f, -0.408248f}, > + {-0.408248f, 0.816496f, -0.408248f}, {-0.816496f, 0.408248f, 0.408248f}, > + { 0.333333f, 0.666667f, 0.666667f}, { 0.666667f, 0.333333f, -0.666667f}, > + { 0.666667f, 0.333333f, -0.666667f}, { 0.333333f, 0.666667f, 0.666667f}, > + { 0.816496f, -0.408248f, 0.408248f}, { 0.408248f, -0.816496f, -0.408248f}, > + {-0.333333f, -0.666667f, 0.666667f}, {-0.666667f, -0.333333f, -0.666667f}, > + { 0.408248f, -0.816496f, -0.408248f}, { 0.816496f, -0.408248f, 0.408248f}, > + {-0.333333f, -0.666667f, 0.666667f}, { 0.816497f, -0.408248f, 0.408248f}, > + { 0.333333f, 0.666667f, 0.666667f}, {-0.816497f, 0.408248f, 0.408248f}, > + {-0.666667f, -0.333333f, -0.666667f}, {-0.408248f, 0.816497f, -0.408248f}, > + { 0.666667f, 0.333333f, -0.666667f}, { 0.408248f, -0.816496f, -0.408248f} > + }; > + static const D3DXVECTOR3 box_normals_position1f[24] = {{0}}; > + static const D3DXVECTOR3 box_normals_position2f[24] = > + { > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f} > + }; > + > + static const D3DXVECTOR3 sphere_normals[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, { 0.000000f, 0.582244f, 0.813014f}, > + { 0.582244f, -0.000000f, 0.813014f}, {-0.000000f, -0.582244f, 0.813014f}, > + {-0.582244f, 0.000000f, 0.813014f}, {-0.000000f, 0.890608f, 0.454772f}, > + { 0.890608f, 0.000000f, 0.454772f}, { 0.000000f, -0.890608f, 0.454772f}, > + {-0.890608f, -0.000000f, 0.454772f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.000000f, 0.890608f, -0.454773f}, > + { 0.890608f, -0.000000f, -0.454772f}, {-0.000000f, -0.890608f, -0.454773f}, > + {-0.890608f, 0.000000f, -0.454773f}, { 0.000000f, 0.582244f, -0.813015f}, > + { 0.582244f, -0.000000f, -0.813015f}, { 0.000000f, -0.582244f, -0.813015f}, > + {-0.582243f, 0.000000f, -0.813015f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + static const D3DXVECTOR3 sphere_normals_area[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, {-0.215311f, 0.554931f, 0.803550f}, > + { 0.554931f, 0.215311f, 0.803550f}, { 0.215311f, -0.554931f, 0.803550f}, > + {-0.554931f, -0.215311f, 0.803550f}, {-0.126638f, 0.872121f, 0.472618f}, > + { 0.872121f, 0.126638f, 0.472618f}, { 0.126638f, -0.872121f, 0.472618f}, > + {-0.872121f, -0.126637f, 0.472618f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.126638f, 0.872121f, -0.472618f}, > + { 0.872121f, -0.126638f, -0.472618f}, {-0.126638f, -0.872121f, -0.472618f}, > + {-0.872121f, 0.126638f, -0.472618f}, { 0.215311f, 0.554931f, -0.803550f}, > + { 0.554931f, -0.215311f, -0.803550f}, {-0.215311f, -0.554931f, -0.803550f}, > + {-0.554931f, 0.215311f, -0.803550f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + static const D3DXVECTOR3 sphere_normals_equal[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, {-0.134974f, 0.522078f, 0.842150f}, > + { 0.522078f, 0.134974f, 0.842150f}, { 0.134974f, -0.522078f, 0.842150f}, > + {-0.522078f, -0.134974f, 0.842150f}, {-0.026367f, 0.857121f, 0.514440f}, > + { 0.857121f, 0.026367f, 0.514440f}, { 0.026367f, -0.857121f, 0.514440f}, > + {-0.857121f, -0.026367f, 0.514440f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.026367f, 0.857121f, -0.514440f}, > + { 0.857121f, -0.026367f, -0.514440f}, {-0.026367f, -0.857121f, -0.514440f}, > + {-0.857121f, 0.026367f, -0.514440f}, { 0.134975f, 0.522078f, -0.842150f}, > + { 0.522078f, -0.134975f, -0.842150f}, {-0.134974f, -0.522078f, -0.842150f}, > + {-0.522078f, 0.134974f, -0.842150f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + > + static const D3DVERTEXELEMENT9 position3f_normal1f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR3), D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position3f_normal2f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR3), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 normal4f_position3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + {0, sizeof(D3DXVECTOR4), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + D3DDECL_END() > + }; Can you check that a 4-component normal placed after the position gives the same results? It doesn't need to be in the patch if there are no surprises (and there shouldn't be, this is me being paranoid). > + static const D3DVERTEXELEMENT9 position1f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(float), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position2f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR2), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position4f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR4), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + hr = compute_normals_funcs[i].apply(NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", compute_normals_funcs[i].name, hr); > + } > + > + if (!(test_context = new_test_context())) > + { > + skip("Couldn't create test context\n"); > + return; > + } > + device = test_context->device; > + > + hr = D3DXCreateBox(device, 1.0f, 1.0f, 1.0f, &mesh, &adjacency); > + ok(SUCCEEDED(hr), "D3DXCreateBox failed %#x\n", hr); > + > + /* Check wrong input */ > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE, NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DDECLUSAGE_NORMAL, 0, > + D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, 0, NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 1, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DX_DEFAULT, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + const struct compute_normals_func *func = &compute_normals_funcs[i]; > + > + /* Mesh without normals */ > + hr = mesh->lpVtbl->CloneMeshFVF(mesh, 0, D3DFVF_XYZ, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMeshFVF failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh without positions */ > + hr = mesh->lpVtbl->CloneMeshFVF(mesh, 0, D3DFVF_NORMAL, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMeshFVF failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT1 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position3f_normal1f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT2 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position3f_normal2f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh without adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, NULL); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + /* Mesh with adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + /* Mesh with custom vertex format, D3DDECLTYPE_FLOAT4 normals and adjacency */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, normal4f_position3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT1 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position1f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_position1f, ARRAY_SIZE(box_normals_position1f)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT2 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position2f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_position2f, ARRAY_SIZE(box_normals_position2f)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT4 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position4f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + } > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals_adjacency_area, ARRAY_SIZE(box_normals_adjacency_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals_adjacency_area, ARRAY_SIZE(box_normals_adjacency_area)); > + > + refcount = mesh->lpVtbl->Release(mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + refcount = ID3DXBuffer_Release(adjacency); > + ok(!refcount, "Buffer has %u references left\n", refcount); > + > + hr = D3DXCreateSphere(device, 1.0f, 4, 6, &mesh, &adjacency); > + ok(SUCCEEDED(hr), "D3DXCreateSphere failed %#x\n", hr); > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + const struct compute_normals_func *func = &compute_normals_funcs[i]; > + > + /* Sphere without adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, NULL); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, sphere_normals, ARRAY_SIZE(sphere_normals)); > + > + /* Sphere with adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, sphere_normals, ARRAY_SIZE(sphere_normals)); > + } > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_area, ARRAY_SIZE(sphere_normals_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_area, ARRAY_SIZE(sphere_normals_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_equal, ARRAY_SIZE(sphere_normals_equal)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_equal, ARRAY_SIZE(sphere_normals_equal)); > + > + refcount = mesh->lpVtbl->Release(mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + refcount = ID3DXBuffer_Release(adjacency); > + ok(!refcount, "Buffer has %u references left\n", refcount); > + > + free_test_context(test_context); > +} > + > START_TEST(mesh) > { > D3DXBoundProbeTest(); > @@ -10401,4 +10973,5 @@ START_TEST(mesh) > test_clone_mesh(); > test_valid_mesh(); > test_optimize_faces(); > + test_compute_normals(); > } > -- > 2.3.6 Looking good otherwise, thanks!

2 1

Re: gdi32: Simplify bitwise and and xor with 0 (PVS-Studio)
by Huw Davies July 29, 2015

July 29, 2015

On 29 Jul 2015, at 12:32, Michael Stefaniuc wrote: > --- > Same sha1 for primitives.o with and without patch. > > > > dlls/gdi32/dibdrv/primitives.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c > index c7b48ed..9da08ad 100644 > --- a/dlls/gdi32/dibdrv/primitives.c > +++ b/dlls/gdi32/dibdrv/primitives.c > @@ -5655,8 +5655,8 @@ static void create_dither_masks_1(const dib_info *dib, int rop2, COLORREF color, > } > else > { > - rop_mask.and = (0x00 & codes.a1) ^ codes.a2; > - rop_mask.xor = (0x00 & codes.x1) ^ codes.x2; > + rop_mask.and = codes.a2; > + rop_mask.xor = codes.x2; > } > *and_bits |= (rop_mask.and & pixel_masks_1[x]); > *xor_bits |= (rop_mask.xor & pixel_masks_1[x]); It's clearer as it was, especially given the lines just above this hunk. Huw.

2 2

Re: [PATCH 4/5] amstream: Zero-initialize DirectDraw surface desc. (Valgrind)
by Henri Verbeet July 29, 2015

July 29, 2015

On 28 July 2015 at 23:14, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c > index 947be1e..3725c68 100644 > --- a/dlls/amstream/mediastream.c > +++ b/dlls/amstream/mediastream.c > @@ -991,6 +991,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD > return hr; > } > > + memset(&desc, 0, sizeof(desc)); > desc.dwSize = sizeof(desc); > desc.dwFlags = DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT; > desc.dwHeight = 100; This should not be needed. If this is for bug 38911, that's a duplicate of bug 36383, and sort of a false positive. ddraw_surface_create() clears DDSD_LPSURFACE if desc->lpSurface is NULL. The issue is that desc->lpSurface may be uninitialized if DDSD_LPSURFACE is not set, but in that case clearing the flag also wouldn't make a difference. If we want to do something about the false positive that should happen in ddraw_surface_create(). I don't personally feel strongly about it one way or the other.

1 0

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin July 28, 2015

July 28, 2015

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=15616 Your paranoid android. === w2000pro (32 bit shlfileop) === shlfileop.c:1833: Test failed: Expected ERROR_SUCCESS, got 6 === wvistau64 (32 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

1 0

Re: [1/2] ntdll/tests: Add basic tests for RtlQueueWorkItem.
by Marvin July 28, 2015

July 28, 2015

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=15580 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:763: Test failed: WaitForSingleObject returned 258 threadpool.c:777: Test failed: WaitForSingleObject returned 0 threadpool.c:779: Test failed: threadpool.c:715: Running timer callback

3 3

Re: odbccp32: Implement SQLGetPrivateProfileString/W (try 9)
by Nikolay Sivov July 28, 2015

July 28, 2015

On 28.07.2015 12:55, Alistair Leslie-Hughes wrote: > + if(!defvalue) > + buff[0] = 0; > + > + if (!section || !defvalue || !buff) > + return 0; > + > + if (buff) > + buff[0] = 0; This makes no sense.

1 0

Re: [PATCH] gdi32: check for NULL pointer in GetOutlineTextMetrics (try 2)
by Marvin July 27, 2015

July 27, 2015

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=15598 Your paranoid android. === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

2 1

Re: [PATCH 3/5] d3dx9: Partially implement D3DXComputeTangentFrameEx().
by Matteo Bruni July 27, 2015

July 27, 2015

Hi, I've got a number of nitpicks but these patches are essentially okay with me. 2015-07-25 11:23 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > --- > dlls/d3dx9_36/mesh.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 232 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c > index 4aeac26..1558b17 100644 > --- a/dlls/d3dx9_36/mesh.c > +++ b/dlls/d3dx9_36/mesh.c > @@ -7235,6 +7235,41 @@ error: > return hr; > } > > +static inline D3DXVECTOR3 *vertex_element_vec3(BYTE *vertices, > + const D3DVERTEXELEMENT9 *declaration, DWORD vertex_stride, DWORD index) Better not to include the "inline" specifier, the compiler will inline the function anyway if it thinks it's a good idea. > +{ > + return (D3DXVECTOR3 *)(vertices + declaration->Offset + index * vertex_stride); > +} > + > +static inline D3DXVECTOR3 read_vec3(BYTE *vertices, const D3DVERTEXELEMENT9 *declaration, > + DWORD vertex_stride, DWORD index) > +{ > + D3DXVECTOR3 vec3 = {0}; > + const float *src = (float *)(vertices + declaration->Offset + index * vertex_stride); You can just use vertex_element_vec3() here, like e.g. const D3DXVECTOR3 *src = vertex_element_vec3(vertices, declaration, vertex_stride, index); although the source data isn't necessarily a full vec3. Your call. > + > + switch (declaration->Type) > + { > + case D3DDECLTYPE_FLOAT1: > + vec3.x = src[0]; > + break; > + case D3DDECLTYPE_FLOAT2: > + vec3.x = src[0]; > + vec3.y = src[1]; > + break; > + case D3DDECLTYPE_FLOAT3: > + case D3DDECLTYPE_FLOAT4: > + vec3.x = src[0]; > + vec3.y = src[1]; > + vec3.z = src[2]; > + break; > + default: > + ERR("Cannot read vec3\n"); > + break; > + } You could sort the cases the other way around and fallthrough to make this part shorter. Again, this is also fine and it's up to you. > + > + return vec3; > +} > + > /************************************************************************* > * D3DXComputeTangentFrameEx (D3DX9_36.@) > */ > @@ -7244,15 +7279,209 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh, DWORD texture_in_seman > const DWORD *adjacency, float partial_edge_threshold, float singular_point_threshold, > float normal_edge_threshold, ID3DXMesh **mesh_out, ID3DXBuffer **vertex_mapping) > { > - FIXME("mesh %p, texture_in_semantic %u, texture_in_index %u, u_partial_out_semantic %u, u_partial_out_index %u, " > + HRESULT hr; > + void *indices = NULL; > + BYTE *vertices = NULL; > + DWORD *point_reps = NULL; > + size_t normal_size; > + BOOL indices_are_32bit; > + DWORD i, j, num_faces, num_vertices, vertex_stride; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + D3DVERTEXELEMENT9 *position_declaration = NULL, *normal_declaration = NULL; > + > + TRACE("mesh %p, texture_in_semantic %u, texture_in_index %u, u_partial_out_semantic %u, u_partial_out_index %u, " > "v_partial_out_semantic %u, v_partial_out_index %u, normal_out_semantic %u, normal_out_index %u, " > "options %#x, adjacency %p, partial_edge_threshold %f, singular_point_threshold %f, " > - "normal_edge_threshold %f, mesh_out %p, vertex_mapping %p stub!\n", > + "normal_edge_threshold %f, mesh_out %p, vertex_mapping %p\n", > mesh, texture_in_semantic, texture_in_index, u_partial_out_semantic, u_partial_out_index, > v_partial_out_semantic, v_partial_out_index, normal_out_semantic, normal_out_index, options, adjacency, > partial_edge_threshold, singular_point_threshold, normal_edge_threshold, mesh_out, vertex_mapping); > > - return E_NOTIMPL; > + if (!mesh) > + { > + WARN("mesh is NULL\n"); > + return D3DERR_INVALIDCALL; > + } > + > + if ((options & (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) == (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) I would store the result of "options & (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)" in a variable and use it here and below. > + { > + WARN("D3DXTANGENT_WEIGHT_BY_AREA and D3DXTANGENT_WEIGHT_EQUAL are mutally exclusive\n"); > + return D3DERR_INVALIDCALL; > + } > + > + if (u_partial_out_semantic != D3DX_DEFAULT) > + { > + FIXME("tangent vectors computation is not supported\n"); > + return E_NOTIMPL; > + } > + > + if (v_partial_out_semantic != D3DX_DEFAULT) > + { > + FIXME("binormal vectors computation is not supported\n"); > + return E_NOTIMPL; > + } > + > + if (options & ~(D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) > + { > + FIXME("unsupported options %#x\n", options); > + return E_NOTIMPL; > + } > + > + if (!(options & D3DXTANGENT_CALCULATE_NORMALS)) > + { > + FIXME("only normals computation is supported\n"); > + return E_NOTIMPL; > + } > + > + if (!(options & D3DXTANGENT_GENERATE_IN_PLACE) || mesh_out || vertex_mapping) > + { > + FIXME("only D3DXTANGENT_GENERATE_IN_PLACE is supported\n"); > + return E_NOTIMPL; > + } > + > + if (FAILED(hr = mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + return hr; > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) Lowercase is preferred for hex literals. > + { > + if (declaration[i].Usage == D3DDECLUSAGE_POSITION && declaration[i].UsageIndex == 0) > + position_declaration = &declaration[i]; > + if (declaration[i].Usage == normal_out_semantic && declaration[i].UsageIndex == normal_out_index) > + normal_declaration = &declaration[i]; > + } > + > + if (!position_declaration || !normal_declaration) > + return D3DERR_INVALIDCALL; > + > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + normal_size = sizeof(D3DXVECTOR3); > + } > + else if (normal_declaration->Type == D3DDECLTYPE_FLOAT4) > + { > + normal_size = sizeof(D3DXVECTOR4); > + } > + else > + { > + WARN("unsupported normals type %u\n", normal_declaration->Type); > + return D3DERR_INVALIDCALL; > + } > + > + num_faces = mesh->lpVtbl->GetNumFaces(mesh); > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + indices_are_32bit = mesh->lpVtbl->GetOptions(mesh) & D3DXMESH_32BIT; > + > + point_reps = HeapAlloc(GetProcessHeap(), 0, num_vertices * sizeof(*point_reps)); > + if (!point_reps) > + { > + hr = E_OUTOFMEMORY; > + goto done; > + } > + > + if (adjacency) > + { > + if (FAILED(hr = mesh->lpVtbl->ConvertAdjacencyToPointReps(mesh, adjacency, point_reps))) > + goto done; > + } > + else > + { > + for (i = 0; i < num_vertices; i++) > + point_reps[i] = i; > + } > + > + if (FAILED(hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, &indices))) > + goto done; > + > + if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + goto done; > + > + for (i = 0; i < num_vertices; i++) > + { > + const D3DXVECTOR4 zero = {0.0f, 0.0f, 0.0f, 1.0f}; That's a weird zero :) Not sure about a better name though, maybe "default_vector"? Also, please make it static. > + void *normal = vertices + normal_declaration->Offset + i * vertex_stride; > + > + memcpy(normal, &zero, normal_size); > + } > + > + for (i = 0; i < num_faces; i++) > + { > + float weights[3]; > + D3DXVECTOR3 a, b, cross, face_normal; > + const DWORD face_indices[3] = > + { > + read_ib(indices, indices_are_32bit, 3 * i + 0), > + read_ib(indices, indices_are_32bit, 3 * i + 1), > + read_ib(indices, indices_are_32bit, 3 * i + 2) > + }; > + const D3DXVECTOR3 v0 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[0]); > + const D3DXVECTOR3 v1 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[1]); > + const D3DXVECTOR3 v2 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[2]); > + > + D3DXVec3Cross(&cross, D3DXVec3Subtract(&a, &v0, &v1), D3DXVec3Subtract(&b, &v0, &v2)); > + > + switch (options & (D3DXTANGENT_WEIGHT_BY_AREA | D3DXTANGENT_WEIGHT_EQUAL)) > + { > + case D3DXTANGENT_WEIGHT_EQUAL: > + weights[0] = weights[1] = weights[2] = 1.0f; > + break; > + case D3DXTANGENT_WEIGHT_BY_AREA: > + weights[0] = weights[1] = weights[2] = D3DXVec3Length(&cross); > + break; > + default: > + weights[0] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + D3DXVec3Subtract(&a, &v1, &v0); > + D3DXVec3Subtract(&b, &v1, &v2); > + weights[1] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + D3DXVec3Subtract(&a, &v2, &v0); > + D3DXVec3Subtract(&b, &v2, &v1); > + weights[2] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + if (isnan(weights[0])) weights[0] = 1.0f; > + if (isnan(weights[1])) weights[1] = 1.0f; > + if (isnan(weights[2])) weights[2] = 1.0f; > + break; This might cause problems in the (unlikely) case float exceptions are enabled. Ideally this case would need to be tested with native and, if it doesn't throw exceptions, your code would need to take care of that. I don't think this is super critical though, it should be easy to figure it out later on if some application crashes here. > + } > + > + D3DXVec3Normalize(&face_normal, &cross); > + > + for (j = 0; j < 3; j++) > + { > + D3DXVECTOR3 normal; > + DWORD rep_index = point_reps[face_indices[j]]; > + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); > + > + D3DXVec3Scale(&normal, &face_normal, weights[j]); > + D3DXVec3Add(rep_normal, rep_normal, &normal); > + } > + } > + > + for (i = 0; i < num_vertices; i++) > + { > + DWORD rep_index = point_reps[i]; > + D3DXVECTOR3 *normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, i); > + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); > + > + if (i == rep_index) > + D3DXVec3Normalize(rep_normal, rep_normal); > + else > + *normal = *rep_normal; > + } > + > + hr = D3D_OK; > + > +done: > + if (vertices) > + mesh->lpVtbl->UnlockVertexBuffer(mesh); > + > + if (indices) > + mesh->lpVtbl->UnlockIndexBuffer(mesh); > + > + HeapFree(GetProcessHeap(), 0, point_reps); > + > + return hr; > } > > /************************************************************************* > -- > 2.3.6 > > >

2 1

Re: [PATCH] gdi32: check for NULL pointer in GetOutlineTextMetrics
by Nikolay Sivov July 27, 2015

July 27, 2015

On 27.07.2015 21:19, Daniel Lehman wrote: > > Yes, looks like it will access NULL out pointer if cbData != 0. Please add a test for that, if it returns required buffer size your fix looks correct to me, if it returns 0 we don't need to call driver at all and API call itself should be fixed, not a driver.

1 0

Re: include/d3dcommon.idl: Add missing typedefs
by Matteo Bruni July 27, 2015

July 27, 2015

2015-07-26 3:24 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > + D3D_SIF_TEXTURE_COMPONENT_0 = 4, > + D3D_SIF_TEXTURE_COMPONENT_1 = 8, > + D3D_SIF_TEXTURE_COMPONENTS = 12, Please use hexadecimal here. FWIW in the Win 8.1 SDK headers there is also a D3D_SIF_UNUSED enum value.

1 0

Re: [PATCH 3/9] d2d1: Validate bitmap formats.
by Marvin July 27, 2015

July 27, 2015

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=15530 Your paranoid android. === wvistau64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w7u (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w8 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2.

2 1

mountmgr.sys: Write usable device paths into HKLM\SYSTEM\MountedDevices.
by Bernhard Übelacker July 27, 2015

July 27, 2015

Hello, I got asked if I could get a discussion started for the attached patch and bug #38235 [1]. This bug is about Blindwrite 7 not showing any usable source DVD drive. It seems Blindwrite relies on the values stored in HKLM\SYSTEM\MountedDevices to enumerate drives. Wine currently stores in e.g. "\DosDevices\D:" the linux mount point of the drive as ansi string. A native Windows XP stores there (as wide string): \??\IDE#CdRomVBOX_CD-ROM_____________________________1.0_____#42562d3231303037333036372020202020202020#{53f5630d-b6bf-11d0-94f2-00a0c91efb8b} This patch stores now as content just the device (also as wide string): \\.\d: This is sufficient to make Blindwrite 7 happy. - Is there currently any use of the stored linux mount point anywhere? - Is there a test needed and where should that be placed as mountmgr.sys has currently no tests subdirectory? - Is there a reason known why this short device name should not be used in this situation? Kind regards, Bernhard [1] https://bugs.winehq.org/show_bug.cgi?id=38235

1 0

Re: d3dx9_36: Add D3DXTessellateNPatches stub
by Matteo Bruni July 27, 2015

July 27, 2015

2015-07-24 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > > > Changelog: > d3dx9_36: Add D3DXTessellateNPatches stub > > > Best Regards > Alistair Leslie-Hughes Please avoid caps in the parameter names. Also don't forget the period at the end of the FIXME message.

1 0

Re: [2/2] d3dx9_36: Add D3DXCreateFragmentLinker, D3DXCreateFragmentLinkerEx stubs
by Matteo Bruni July 27, 2015

July 27, 2015

2015-07-23 11:11 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > > Hi, > > Fixes crash of https://bugs.winehq.org/show_bug.cgi?id=38086 > > Changelog: > d3dx9_36: Add D3DXCreateFragmentLinker, D3DXCreateFragmentLinkerEx stubs > > > Best Regards > Alistair Leslie-Hughes > + FIXME("(device %p, size %u, linker %p)\n", device, size, linker); Please drop the parentheses in the message. > + > + if(linker) Space between if and '('. While you're at it, please drop the D3DXCreateFragmentLinker and D3DXCreateFragmentLinkerEx entries from d3dx9_42.spec, it looks like those functions were removed in d3dx9_42.dll. You should probably also add the function prototypes to d3dx9shader.h.

1 0

Re: [1/2] include: Add ID3DXFragmentLinker interface
by Matteo Bruni July 27, 2015

July 27, 2015

2015-07-23 11:11 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > > > Changelog: > include: Add ID3DXFragmentLinker interface > > > Best Regards > Alistair Leslie-Hughes > +typedef interface ID3DXFragmentLinker ID3DXFragmentLinker; You don't need that. > + STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9 *device) PURE; This is wrong. > + STDMETHOD(LinkPixelShader)(THIS_ const char *profile, DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DVertexShader9 **shader, ID3DXBuffer **errors) PURE; This too. For reference, I checked the definitions with those from the March 2009 DirectX SDK.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 3 - resend)
by Matteo Bruni July 27, 2015

July 27, 2015

2015-07-23 11:09 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > + FIXME(" srcdata %p, srcdatasize %lu, sourcename %s, defines %p, includes %p, entrypoint %s, target %s, " Extra space at the start. But it's okay, not worth a resend IMHO. As followups you could make D3DCompile() forward to D3DCompile2() and you could try to implement D3DCompileFromFile(), probably via the new D3DReadFileToBlob() function.

1 0

Re: [PATCH 5/5] qcap/tests: Add COM tests for VfwCapture.
by Marvin July 27, 2015

July 27, 2015

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=15590 Your paranoid android. === build (build) === Make failed

2 1

Re: user32: Hide horizontal Listbox scroll bar if no horizontal extent is set. (try 2)
by Marvin July 26, 2015

July 26, 2015

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=15569 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

1 0

Re: widl: Don't output C++ default value if the argument is followed by another without default value.
by Michael Stefaniuc July 26, 2015

July 26, 2015

Jacek, On 07/26/2015 05:07 PM, Jacek Caban wrote: > + /* Output default value only is all following arguments also have default value. */ should that be an "if"? ^^^ bye michael

2 1

Re: [PATCH 1/5] d3dx9/tests: Remove todo that succeeds now.
by Nikolay Sivov July 26, 2015

July 26, 2015

On 25.07.2015 12:23, Józef Kucia wrote: > --- > dlls/d3dx9_36/tests/effect.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 482f064..dd88b29 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -156,7 +156,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > > hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > if (FAILED(hr)) > { > skip("Failed to compile effect, skipping test.\n"); > Hi, Jozef. There's no failures currently http://test.winehq.org/data/tests/d3dx9_36:mesh.html, so I'm not sure why it succeeds for you.

2 1

[PATCH] Use asserts for mmap failure modes
by Michael Gilbert July 26, 2015

July 26, 2015

Hi, Using exit in shared libraries is a discouraged practice, and wine's mmap implementation currently does that. I attach a proposed change using asserts instead. Let me know if you have any feedback. Best wishes, Mike (btw I'm the debian wine maintainer)

2 2

re: Wine Stable
by Michael Gilbert July 26, 2015

July 26, 2015

Michael Stefaniuc wrote: > We already have a topic "Wine Stable Considered Harmful" for the > WineConf in September, see http://wiki.winehq.org/WineConf2015 "Considered Harmful" is also Considered Harmful ;) http://meyerweb.com/eric/comment/chech.html > On a high level view this are IMHO the good and bad things about the > current stable process in Wine: > > Good Bad > ---- --- > Code freeze/stabilization Way too old > Marketing Release slips with features slippage > Some distributions want it Distributions insist on using it > Bug reports for stable are ignored The other good is that we can plan on shipping a stabilized (bug fixed, well tested) version of the package, rather than whichever version happened to be released at the time of the Debian freeze. The whole point of having both stable and development versions of the package in Debian is so the user can have a choice. Either go with the stable, well tested version, or go with a snapshot from the date of the freeze. Best wishes, Mike

1 0

Re: psapi/tests: Don't check for exact value (try 2)
by Sebastian Lackner July 26, 2015

July 26, 2015

On 23.07.2015 22:50, André Hentschel wrote: > --- > dlls/psapi/tests/psapi_main.c | 59 +++++++++++++------------------------------ > 1 file changed, 17 insertions(+), 42 deletions(-) > > diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c > index cebfc5f..1ee30d2 100644 > --- a/dlls/psapi/tests/psapi_main.c > +++ b/dlls/psapi/tests/psapi_main.c > @@ -194,6 +194,11 @@ static void test_GetModuleInformation(void) > ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); > } > > +#define ADMITTED_ERROR (64) > +#define CHECK_MARGIN(perf, sys) \ > + ok(perf >= max(sys, ADMITTED_ERROR) - ADMITTED_ERROR && perf <= sys + ADMITTED_ERROR, \ > + "expected approximately " #perf "=%u but got %u\n", sys, (ULONG)perf) > + > static void test_GetPerformanceInfo(void) > { > PERFORMANCE_INFORMATION info; > @@ -227,36 +232,16 @@ static void test_GetPerformanceInfo(void) > ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); > ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); > > - ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, > - "expected info.CommitTotal=%u but got %u\n", > - sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); > - > - ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, > - "expected info.CommitLimit=%u but got %u\n", > - sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); > - > - ok(info.CommitPeak == sys_performance_info->PeakCommitment, > - "expected info.CommitPeak=%u but got %u\n", > - sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); > - > - ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && > - info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, > - "expected approximately info.PhysicalAvailable=%u but got %u\n", > - sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); > + CHECK_MARGIN(info.CommitTotal, sys_performance_info->TotalCommittedPages); > + CHECK_MARGIN(info.CommitLimit, sys_performance_info->TotalCommitLimit); > + CHECK_MARGIN(info.CommitPeak, sys_performance_info->PeakCommitment); > + CHECK_MARGIN(info.PhysicalAvailable, sys_performance_info->AvailablePages); > > /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ > > - ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, > - "expected info.KernelTotal=%u but got %u\n", > - sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); > - > - ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, > - "expected info.KernelPaged=%u but got %u\n", > - sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); > - > - ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, > - "expected info.KernelNonpaged=%u but got %u\n", > - sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); > + CHECK_MARGIN(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); > + CHECK_MARGIN(info.KernelPaged, sys_performance_info->PagedPoolUsage); > + CHECK_MARGIN(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); > > /* compare with values from SYSTEM_BASIC_INFORMATION */ > size = 0; > @@ -264,13 +249,8 @@ static void test_GetPerformanceInfo(void) > ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); > ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); > > - ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, > - "expected info.PhysicalTotal=%u but got %u\n", > - sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); > - > - ok(info.PageSize == sys_basic_info.PageSize, > - "expected info.PageSize=%u but got %u\n", > - sys_basic_info.PageSize, (ULONG)info.PageSize); > + CHECK_MARGIN(info.PhysicalTotal, sys_basic_info.MmNumberOfPhysicalPages); I think we can safely assume that the total physical memory does not change between two calls. > + CHECK_MARGIN(info.PageSize, sys_basic_info.PageSize); The pagesize should usually also match exactly. > > /* compare with values from SYSTEM_PROCESS_INFORMATION */ > size = 0; > @@ -297,14 +277,9 @@ static void test_GetPerformanceInfo(void) > } > HeapFree(GetProcessHeap(), 0, sys_process_info); > > - ok(info.HandleCount == handle_count, > - "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); > - > - ok(info.ProcessCount == process_count, > - "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); > - > - ok(info.ThreadCount == thread_count, > - "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); > + CHECK_MARGIN(info.HandleCount, handle_count); > + CHECK_MARGIN(info.ProcessCount, process_count); > + CHECK_MARGIN(info.ThreadCount, thread_count); A tolerance of 64 (especially for process/threads) basically disables these tests. A smaller tolerance would already be sufficient to avoid random test failures. > } > } > >

1 0

Re: user32/tests: Also check against the low word of hSubMenu (try 2)
by Marvin July 25, 2015

July 25, 2015

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=15565 Your paranoid android. === w2003std (32 bit menu) === menu.c:2545: Test failed: id 202: expected fState 0, got 0003 menu.c:2545: Test failed: id 202: expected fState 0, got 1000

1 0

Re: [PATCH 14/21] api-ms-win-crt-multibyte-l1-1-0: Add stub dll.
by Sebastian Lackner July 25, 2015

July 25, 2015

On 23.07.2015 21:47, Martin Storsjo wrote: > +@ stdcall __p__mbcasemap() ucrtbase.__p__mbcasemap This (and a couple of other redirects) should probably be declared as cdecl, similar to how its done in all other msvcr* dlls. You have to update the hack in tools/make_specfiles for this to work properly, for example like that: --- snip --- @@ -376,7 +376,7 @@ sub update_spec_file($) if ($parent{callconv} ne "stub" || $parent{args}) { my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : - $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack + $parent{spec} =~ /(msvc|ucrtbase)/ ? "cdecl" : "stdcall"; # hack $_ = sprintf "$descr{ordinal} %s %s%s", $callconv, $flags, $func; if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible --- snip --- Please note that this is the first patch affected by this problem.

2 1

Re: user32: Hide horizontal Listbox scroll bar if no horizontal extent is set.
by Marvin July 24, 2015

July 24, 2015

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=15534 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

2 1

Re: [PATCH 1/2] user32: Initialize buffer before sending WM_GETTEXT
by Marvin July 24, 2015

July 24, 2015

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=15535 Your paranoid android. === wvistau64 (32 bit win) === win.c:7546: Test failed: transparent window didn't get WM_NCHITTEST message win.c:7547: Test failed: button under static window didn't get WM_LBUTTONUP

2 1

Re: [PATCH 8/9] d2d1: Bitmap values are always premultiplied in practice.
by Marvin July 23, 2015

July 23, 2015

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=15531 Your paranoid android. === wvistau64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w7u (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w8 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === wvistau64 (64 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (64 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2.

1 0

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument().
by Nikolay Sivov July 23, 2015

July 23, 2015

On 14.07.2015 16:31, Zhenbo Li wrote: > Hi Nikolay, > > 2015-07-14 20:17 GMT+08:00 Nikolay Sivov <bunglehead(a)gmail.com>: >> In principle this is most likely fine, but I'd really prefer to have similar >> test for all node types that support this method, so we can move a check >> directly to node_get_owner_doc(). For those additional tests it would be >> better to add a new test function called test_get_ownerDocument(). Next step >> would be to make this test run on all document versions (3, 4 and 6), but >> that should be a separate patch, and I'm not asking you to work on it. > > Thanks for your reply. > I agree with you that move the check into node_get_owner_doc might be > more general > > Do you mean I should write a helper function like: > > #define test_get_ownerDocument_call(el,doc) > _test_get_ownerDocument_call(__LINE__,el,doc) > static void _test_get_ownerDocument_call(unsigned line, IXMLDOMElement > *element, IXMLDOMDocument *doc) > { > IXMLDOMDocument *owner; > HRESULT r; > r = IXMLDOMElement_get_ownerDocument( element, NULL ); > ok( r == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", r); > > owner = NULL; > r = IXMLDOMElement_get_ownerDocument( element, &owner ); > ok( r == S_OK, "get_ownerDocument return code\n"); > ok( owner != doc, "get_ownerDocument return\n"); > IXMLDOMDocument_Release(owner); > } > > No, helper like that won't work, because the point is to check how all node types work, not just elements. What I meant is to have a separate test_* function in START_TEST() that will load a document with all node types you need and iterating through them call get_ownderDocument.

2 3

Scan-build report uploaded
by André Hentschel July 22, 2015

July 22, 2015

Hi, in case someone is interested, i've uploaded a scan-build here: http://dawncrow.de/scan-build-2015-07-20-200148-28114-1/ Wine source is from last Friday

2 2

Re: [PATCH 4/4] mshtml: Add IHTMLXMLHttpRequest::statusText property implementation.
by Jacek Caban July 22, 2015

July 22, 2015

Hi Zhenbo, On 22/07/15 17:34, Zhenbo Li wrote: > + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); > + *p = SysAllocStringLen(NULL, len); > + if(!*p) { > + nsACString_Finish(nscstr); > + return E_OUTOFMEMORY; > + } > + MultiByteToWideChar(CP_ACP, 0, str, -1, *p, len); I didn't catch it earlier, but this should use CP_UTF8. Cheers, Jacek

1 0

1.7.48 release delayed
by Alexandre Julliard July 22, 2015

July 22, 2015

Folks, I'm out to my brother's wedding for a few days, so there won't be a release this Friday. I'm planning to release 1.7.48 early next week, probably on Tuesday. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error.
by Nikolay Sivov July 22, 2015

July 22, 2015

On 22.07.2015 12:57, Dmitry Timoshkov wrote: > --- > dlls/setupapi/devinst.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c > index b084a5e..5a18937 100644 > --- a/dlls/setupapi/devinst.c > +++ b/dlls/setupapi/devinst.c > @@ -2340,7 +2340,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p > if (!(flags & DIGCF_ALLCLASSES) && !class) > { > SetLastError(ERROR_INVALID_PARAMETER); > - return NULL; > + return INVALID_HANDLE_VALUE; > } > if (flags & unsupportedFlags) > WARN("unsupported flags %08x\n", flags & unsupportedFlags); > How about a test for this and next one?

2 1

Re: winhttp: Implement WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT.
by Dmitry Timoshkov July 22, 2015

July 22, 2015

Huw Davies <huw(a)codeweavers.com> wrote: > + case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: > + TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); > + session->unload_event = *(HANDLE *)buffer; > + return TRUE; I admit, that adding another case that doesn't check input buffer size doesn't change much, but it has to stop at some point, rather sooner than later. -- Dmitry.

1 0

Skyrim hang on exit: Any news?
by Theodore Dubois July 22, 2015

July 22, 2015

When you quit to desktop from Skyrim, it hangs. This is bug 34041. It's still a bug, but it has not been touched by anyone from Codewaevers since 2013 (as far as I can tell.) Clearly, it's low priority. Any news? ~Theodore

2 1

Re: user32/tests: Test for caption width of 13 on japanese W7
by Marvin July 21, 2015

July 21, 2015

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=15482 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2489: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2502: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: ntdll: Don't touch SecurityCookie when the pointer is outside of the image
by Michael Müller July 21, 2015

July 21, 2015

Am 21.07.2015 um 20:33 schrieb André Hentschel: > + if (loadcfg && loadcfg_size >= sizeof(*loadcfg) && > + (ULONG_PTR)ptr > loadcfg->SecurityCookie &&loadcfg->SecurityCookie < (ULONG_PTR)ptr + total_size) > set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); Your check doesn't take the size of the security cookie into account. If the cookie would only be partially inside of the image area, the check would still succeed although not all memory is writable. The check for the lower limit should be (<= instead of >): (ULONG_PTR)ptr <= loadcfg->SecurityCookie Is it possible to have an unmapped space between mapped sections? According to the NT section header it should be possible, but I am not sure if Wine fills this area.

2 1

Re: dwrite: Remove unused initializer (Clang)
by Nikolay Sivov July 21, 2015

July 21, 2015

Looks good, thanks.

1 0

Re: user32/tests: Test for caption width of 13 on japanese W7
by Huw Davies July 21, 2015

July 21, 2015

On 21 Jul 2015, at 19:32, André Hentschel wrote: > --- a/dlls/user32/tests/sysparams.c > +++ b/dlls/user32/tests/sysparams.c > @@ -1554,8 +1554,9 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ > > ok( Ncmcur.iCaptionWidth == 8 || > Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ > + Ncmcur.iCaptionWidth == 13 || /* Win7 japanese */ > Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ > - "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); > + "CaptionWidth: %d expected 8, 12, 13 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); > ok( Ncmcur.iScrollWidth == 8, > "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); > ok( Ncmcur.iScrollHeight == 8, I deliberately haven't fixed it like this because it has already become untenable. I suspect it should be compared to the height of the default gui font, or something like that. Huw.

1 0

[PATCH v2 00/15] AppUserModelID support
by Jonas Kümmerlin July 21, 2015

July 21, 2015

Changes since the last version: - Feedback by Vincent Porvik, Nikolay Sivov and GOUJON Alexandre has been incorporated. - Where appropriate, bigger patches have been split into smaller chunks. - All required features are now implemented: You can try it out by installing LibreOffice using the MSI package, set the windows version to Win7 in winecfg and observe the new fancy desktop file matching performed by your desktop shell. (assuming your shell does this; Gnome3 and Unity do, XFCE and LXDE don't) - While Gnome3 works great, KDE hasn't been exactly cooperative so far. It now gets the grouping right, but ignores the StartupWMClass key in the desktop files, so pinning and fancy high-res icons won't work. This is most likely not fixable on our side, at least not without further research. I am still not happy with the PROPVARIANT (de)serialization code (patches 4 and 5, hope the mailing list won't eat it this time). The ole32 <-> propsys interfacing has been implemented as Nikolay Sivov suggested, but I'm not really happy with it. The new (de)serialization code also caused a weird regression in MSI.dll which I haven't been able to track down yet. I'm currently leaning towards moving the new code to propsys.dll and leaving ole32.dll untouched, even though that would result in two different implementations of basically the same thing. Does anyone have strong opinions on this matter? Rationale: AppUserModelIDs can be used to match open windows to shortcuts in order to make the Win7 Taskbar happen. The idea is similar to WM_CLASS in X11/freedesktop.org environments: Add the AppUserModelID to every window and every shortcut and let the shell figure out the matching. The shell can then do fancy things like pinning the app or showing a high quality icon. While most windows apps rely on the fallback algorithm of doing the shortcut<->window mapping via the full path to the executable, some applications, like LibreOffice, are making use of the AppUserModelID feature to appear as a set of different applications (Writer, Calc, ...) while sharing the same exe file (soffice.bin). Modern freedesktop.org shells work very similar to the Win7 Taskbar in this regard (using the X11 WM_CLASS attribute and the StartupWMClass= deskop entry key), and the goal is to have wine apps appear like any native app: With a high-res icon and pinnable. Jonas Kümmerlin (15): shell32: Implement process-wide explicit AppUserModelID propsys: Implement several PropVariantInit*() functions propsys: Extend PropVariantCompareEx() ole32: Rework property (de)serialization propsys: Implement Stg(De)SerializePropVariant propsys: Implement named properties on the in-memory property store propsys: Implement serialization of the in-memory property store propsys: Implement IPersistStream on the in-memory property store propsys: Partially implement property stringification shell32: Properly implement IPropertyStore for shell links shell32: Implement window property store (SHGetPropertyStoreForWindow) winex11.drv,user32,shell32 Use AppUserModelID to populate WM_CLASS propsys: Partially implement/stub IPropertyDescription msi: Write shortcut properties winemenubuilder: Save AppUserModelID as StartupWMClass dlls/msi/Makefile.in | 2 +- dlls/msi/action.c | 120 ++ dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 75 +- dlls/msi/tests/automation.c | 1 - dlls/msi/tests/suminfo.c | 4 +- dlls/ole32/stg_prop.c | 1717 +++++++++++++++++++++++----- dlls/ole32/tests/propvariant.c | 86 +- dlls/propsys/Makefile.in | 4 +- dlls/propsys/propdesc.c | 537 +++++++++ dlls/propsys/propdesc_builtin_data.c | 85 ++ dlls/propsys/propstore.c | 1062 ++++++++++++++++- dlls/propsys/propsys.spec | 36 +- dlls/propsys/propsys_classes.idl | 7 +- dlls/propsys/propsys_main.c | 6 - dlls/propsys/propsys_private.h | 23 + dlls/propsys/propvar.c | 889 +++++++++++++- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propstore.c | 403 ++++++- dlls/propsys/tests/propsys.c | 709 +++++++++++- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32.spec | 2 + dlls/shell32/shell32_main.c | 109 +- dlls/shell32/shelllink.c | 218 +++- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/appusermodel.c | 272 +++++ dlls/shell32/tests/shell32_test.h | 9 + dlls/shell32/tests/shelllink.c | 123 ++ dlls/shell32/winpropstore.c | 303 +++++ dlls/user32/message.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/winex11.drv/window.c | 160 ++- include/propidl.idl | 6 + include/propsys.idl | 1 + include/propvarutil.h | 105 +- include/shellapi.h | 1 + include/shobjidl.idl | 6 + include/strsafe.h | 17 + include/winbase.h | 2 + include/wine/server_protocol.h | 59 +- programs/winemenubuilder/winemenubuilder.c | 123 +- server/protocol.def | 38 + server/request.h | 35 + server/trace.c | 47 + server/window.c | 148 +++ 45 files changed, 7098 insertions(+), 465 deletions(-) create mode 100644 dlls/propsys/propdesc.c create mode 100644 dlls/propsys/propdesc_builtin_data.c create mode 100644 dlls/shell32/tests/appusermodel.c create mode 100644 dlls/shell32/winpropstore.c -- 2.4.3

4 22

Re: include: Add stuff related to WSAPoll() (try 4)
by Alexandre Julliard July 21, 2015

July 21, 2015

Bruno Jesus <00cpxxx(a)gmail.com> writes: > Use Sebastian's idea of not naming the struct since only WSAPOLLFD is > used anyway. This is still causing a lot of warnings on mingw: In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:117:0: warning: "POLLERR" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:293:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:118:0: warning: "POLLHUP" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:294:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:119:0: warning: "POLLNVAL" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:295:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:124:0: warning: "POLLPRI" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:291:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:125:0: warning: "POLLIN" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:290:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:126:0: warning: "POLLOUT" redefined -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] regsvr32: change regsvr32 to a GUI program.
by Nikolay Sivov July 21, 2015

July 21, 2015

On 21.07.2015 12:26, Hao Peng wrote: > --- > programs/regsvr32/Makefile.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > -APPMODE = -mconsole -municode > +APPMODE = -mwindows -municode Why do you need this?

2 1

Re: [PATCH] advapi32: test and fix ChangeServiceConfig2 when given a zero length or a null description (try2, resend)
by Marvin July 20, 2015

July 20, 2015

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=15399 Your paranoid android. === w7u (32 bit service) === service.c:1421: Test failed: Active services mismatch 1 service.c:1422: Test failed: Inactive services mismatch 4294967295

3 3

Re: odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString
by Alistair Leslie-Hughes July 20, 2015

July 20, 2015

On 19/07/15 21:10, Nikolay Sivov wrote: > Based on patch by Alistair Leslie-Hughes > Here is a modified version of the patch you sent. This patch includes test cases for SQLGetPrivateProfileStringW. There was an error in my logic with the entry parameter which I have also corrected. When the entry parameter is NULL, it returns the list of keys, in the format keyname\0keyname\0. I've tested two application which now work correctly with the attached patch. Happy to hear any feedback. Best Regards Alistair.

2 1

Re: kernel32/editline: Enabling/disabling Insert Mode via the user dialog should take effect immediately
by Sebastian Lackner July 20, 2015

July 20, 2015

On 20.07.2015 04:02, Hugh McMaster wrote: > Currently, if Insert Mode is enabled/disabled via the user dialog, > the new console mode does not take effect until after > CONSOLE_Readline is called again. > > On Windows, this change takes effect immediately. > --- > dlls/kernel32/editline.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c > index 7664b55..581ea7c 100644 > --- a/dlls/kernel32/editline.c > +++ b/dlls/kernel32/editline.c > @@ -987,6 +987,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) > } > } > > + GetConsoleMode(hConsoleIn, &mode); > + ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == > + (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0; You can remove the " ? 1 : 0" here, the value is already BOOL. > + > if (func) > (func)(&ctx); > else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED)) >

2 1

Re: [PATCH 3/4] msvcp110: Add tr2_sys__Last_write_time implementation and test.(resend)
by Piotr Caban July 20, 2015

July 20, 2015

On 07/18/15 05:15, YongHao Hu wrote: > + /* test the formula */ > + file = CreateFileA("tr2_test_dir/f1", 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, > + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); > + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); > + ok(GetFileTime(file, 0, 0, &lwt), "GetFileTime failed\n"); > + CloseHandle(file); > + last_write_time = (((__int64)lwt.dwHighDateTime)<< 32) + lwt.dwLowDateTime; > + last_write_time -= TICKS_1601_TO_1970; > + last_write_time /= TICKSPERSEC; > + ok(last_write_time == newtime, "last_write_time after converting from FILETIME to UNIX Timestamp should equal to newtime\n"); There's no guarantee that the filesystem will store the time accurately. As far as I know the test will not work on fat file system. > + /* test negative time */ > + newtime = 1111111; > + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", -newtime); > + last_write_time = p_tr2_sys__Last_write_time("tr2_test_dir/f1"); > + todo_wine ok(1844674407369-newtime+1 == last_write_time, "last_write_time expect %s, got %s\n", > + debugstr_longlong(1844674407369-newtime+1), debugstr_longlong(last_write_time)); You can't use debugstr_longlong 2 times inside one ok call. You can't use 64-bit constants this way. Also please avoid using "magic" constants. Is this test still failing on wine if unsigned __int64 is used in computations? > + /* maximum time */ > + newtime = 9223372036854775807; > + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); > + todo_wine ok(1844674407369 == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), "last_write_time expect 1844674407369, got %s\n", > + debugstr_longlong(p_tr2_sys__Last_write_time("tr2_test_dir/f1"))); I'm expecting it to fail on some filesystems. It would be nice to run this tests on fat32 filesystem. Cheers, Piotr

1 0

Re: [PATCH] user32/tests: Correct spelling of "Invisible".
by Marvin July 20, 2015

July 20, 2015

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=15450 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10609: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [PATCH 2/4] msvcp110: Add tr2_sys__Stat and tr2_sys__Lstat implementation and test.(try 2)
by Piotr Caban July 20, 2015

July 20, 2015

On 07/17/15 20:20, YongHao Hu wrote: > --- > dlls/msvcp110/msvcp110.spec | 8 +- > dlls/msvcp120/msvcp120.spec | 8 +- > dlls/msvcp120/tests/msvcp120.c | 142 > ++++++++++++++++++++++++++++++++++++ > dlls/msvcp120_app/msvcp120_app.spec | 8 +- > dlls/msvcp90/ios.c | 47 ++++++++++++ > 5 files changed, 201 insertions(+), 12 deletions(-) There's a compilation warning: msvcp120.c: In function 'test_tr2_sys__Stat': msvcp120.c:777:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] BYTE buf[sizeof(struct REPARSE_MOUNTPOINT_DATA_BUFFER) + MAX_PATH * sizeof(WCHAR)]; The tests are also not working for me on Windows 7: msvcp120.c:770: Test failed: CreateSymbolicLinkA failed msvcp120.c:771: Test failed: CreateSymbolicLinkA failed msvcp120.c:823: Test failed: tr2_sys__Stat(): test 6 expect: 2, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 6 expect: 2, got 1 msvcp120.c:823: Test failed: tr2_sys__Stat(): test 7 expect: 3, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 7 expect: 3, got 1 msvcp120.c:845: Test failed: expect tr2_test_dir/f1_link to exist msvcp120.c:846: Test failed: expect tr2_test_dir/dir_link to exist msvcp120: 380 tests executed (0 marked as todo, 8 failures), 0 skipped. There are some more test failures when tests are run from filesystem that doesn't support reparse points: msvcp120.c:621: Test failed: test_tr2_sys__Copy_file(): test 5 expect: 5, got 80 msvcp120.c:623: Test failed: test_tr2_sys__Copy_file(): test 11 expect: 3, got 2 msvcp120.c:770: Test failed: CreateSymbolicLinkA failed msvcp120.c:771: Test failed: CreateSymbolicLinkA failed msvcp120.c:785: Test failed: DeviceIoControl failed msvcp120.c:792: Test failed: DeviceIoControl failed msvcp120.c:823: Test failed: tr2_sys__Stat(): test 6 expect: 2, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 6 expect: 2, got 1 msvcp120.c:823: Test failed: tr2_sys__Stat(): test 7 expect: 3, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 7 expect: 3, got 1 msvcp120.c:845: Test failed: expect tr2_test_dir/f1_link to exist msvcp120.c:846: Test failed: expect tr2_test_dir/dir_link to exist msvcp120: 380 tests executed (0 marked as todo, 12 failures), 0 skipped.

2 2

Re: include: Add stuff related to WSAPoll() (try 3)
by Sebastian Lackner July 20, 2015

July 20, 2015

On 17.07.2015 18:29, Bruno Jesus wrote: > Try to apply Matteo's idea to not redefine the struct when port.h was > already included. I can't test in mingw myself unfortunately. I don't think this will work properly. The Linux pollfd struct contains "fd" with type "int", but on Windows its defined as "SOCKET" (which has size of a pointer). My personal preference would be to just leave out the "struct pollfd" definition here, and only declare WSAPOLLFD. Basically: +typedef struct +{ + SOCKET fd; + SHORT events; + SHORT revents; +} WSAPOLLFD; Not sure if this would be an acceptable solution for the other devs though.

2 1

Re: [PATCH 3/4] msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Piotr Caban July 20, 2015

July 20, 2015

2 1

Re: msi/tests: Mark a test result on win2k3 as broken.
by Marvin July 17, 2015

July 17, 2015

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=15404 Your paranoid android. === w7u (32 bit package) === The test timed out

1 0

Re: [4/4] user32: SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should return real font names.
by Marvin July 17, 2015

July 17, 2015

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=15397 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: winemac.drv: Release mouse capture when destroying window specified in SetCapture call
by Ken Thomases July 17, 2015

July 17, 2015

On Jul 17, 2015, at 5:54 AM, Piotr Caban <piotr(a)codeweavers.com> wrote: > --- > dlls/winemac.drv/window.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c > index c67ccd0..9d996ec 100644 > --- a/dlls/winemac.drv/window.c > +++ b/dlls/winemac.drv/window.c > @@ -1274,6 +1274,8 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) > > if (!(data = get_win_data(hwnd))) return; > > + if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); > + > if (data->gl_view) macdrv_dispose_view(data->gl_view); > destroy_cocoa_window(data); > > Looks good to me. Thanks! -Ken

1 0

Re: [1/4] user32: Add a test to show that fonts returned by SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should be listed b
by Marvin July 17, 2015

July 17, 2015

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=15394 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: [PATCH 2/2] d3drm/tests: Add version specific tests for CreateDeviceFrom* methods. (try 3)
by Stefan Dösinger July 17, 2015

July 17, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Sorry, there are always more issues to find :-( . Am 2015-07-16 um 18:08 schrieb Aaryaman Vasishta: > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > ... > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); The if check here is redundant. I expect Coverity to complain about this sooner or later... (version 2 and 3 are affected too) > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > ... > + /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 0, 0, &device3); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); Does it return D3DRMERR_BADVALUE because clipper is NULL or because width / height are 0? Don't test two error conditions at once, unless both return a different error and you want to test the priority of the error handling. (version 2 and 3 are affected too) > + /* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */ > + hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3); > + ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); Please also test what happens when you have an already attached depth surface and do *not* pass D3DRMDEVICE_NOZBUFFER. I suspect that it either works like version 2 (your surface is kept, no error), or that it returns an error (because AddAttachedSurface fails). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVqLmUAAoJEN0/YqbEcdMw3L8P/iqw4zcu9MbgJsfvM7MBLqZa OEbQ5SyYot/QTPqGL1TPujjLIkm4q557Ban2ZBcN3lPSWscJ5KQoo2sKedWfu/yi Y47Cvwqggrx7FUOpdNEdp4311eDQ3xo6wYklhzVAUXqQ4cZRmjm6clhMlIW1PPfX v2iJSNg4xTBqABH6xz+bapO29QpDqq5KuWTRtUuzGFZt9N1cvCzgNHRPmMtlpiCp ray9/trglSQzsqbyamRD5Tr9Cd8bpSgxrtF7juIVc1MEBISuJquN+Hv/I3qqKgUb SZkf3yDmEoKeRrCHgfESR9j9gkzH6Iy0R01GWIVdQCshyW36rNI6NwP8zBu9kaeq psHeFv0Rp0Ed4OKqc+WT+OwagEaH9TwBXmd/JruOiNMQK4/q4HOVvM/10jPG+/gP /PioGPETbISnMZqZBqSJkdw/NgKoiP8AnJKxYI8GNoAPnPbkktTZ+G0T4rRJkKX/ uYEoUma38cSs6Mv0t1Qb5mxMOl6ioeBnZlGF2WxnZkAOct4Xaww2EM7fPN0dqUP3 nDGd4dU4Sj66hrb5p3nb12K/iJ+skjT0beHWQfxPDhlL9NyLDLl/96XCB/sV5S8Y qJR3irxiFgSbcm+kGsSa24GV2B1gDDGeXFDEm6rZo37jlG3ASzoOnek9HqcSgBA1 scHWj2bMxjyM39oePaek =ve5C -----END PGP SIGNATURE-----

1 0

[PATCH 0/6] [WIP] AppUserModelID implementation
by Jonas Kümmerlin July 16, 2015

July 16, 2015

Hi, I'm currently working on implementing AppUserModelID[1] support in Wine. It's far from finished, but it's slowly getting there, so I want to show it off and get some feedback. Rationale: AppUserModelIDs can be used to match open windows to shortcuts in order to make the Win7 Taskbar happen. The idea is similar to WM_CLASS in X11/freedesktop.org environments: Add the AppUserModelID to every window and every shortcut and let the shell figure out the matching. The shell can then do fancy things like pinning the app or showing a high quality icon. While most windows apps rely on the fallback algorithm of doing the shortcut<->window mapping via the full path to the executable, some applications, like LibreOffice, are making use of the AppUserModelID feature to appear as a set of different applications (Writer, Calc, ...) while sharing the same exe file (soffice.bin). Modern freedesktop.org shells work very similar to the Win7 Taskbar in this regard (using the X11 WM_CLASS attribute and the StartupWMClass= deskop entry key), and the goal is to have wine apps appear like any native app: With a high-res icon and pinnable. At the moment, the following features are implemented and working: - SetCurrentProcessExplicitAppUserModelID - IPropertyStore implementation on IShellLink - Exporting the AppUserModelID as WM_CLASS in the X11 driver The following things are not yet implemented, but I expect to complete them in the following weeks: - The window-specific property store (SHGetPropertyStoreForWindow) - MSI support for shortcut properties - Extracting the AppUserModelID in winemenubuilder.exe The whole thing required me to implement a fair bit of infrastructure (mostly in propsys.dll), and I am afraid that more might follow. Since I am kinda new to wine development, I appreciate any early feedback and comments. Regards Jonas Kümmerlin [1] Application User Model IDs: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).… Jonas Kümmerlin (6): shell32: Implement process-wide explicit AppUserModelID winex11.drv: Use process-wide AppUserModelID to populate WM_CLASS ole32, propsys: Rework PROPVARIANT (de)serialization propsys: Implement named properties, serialization on the in-memory store propsys: Partially implement property stringification shell32: Properly implement IPropertyStore for shell links dlls/ole32/ole32.spec | 3 + dlls/ole32/stg_prop.c | 1711 ++++++++++++++++++++++++++++++++----- dlls/ole32/tests/propvariant.c | 55 +- dlls/propsys/propstore.c | 1088 ++++++++++++++++++++++- dlls/propsys/propsys.spec | 34 +- dlls/propsys/propsys_classes.idl | 7 +- dlls/propsys/propvar.c | 821 +++++++++++++++++- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propstore.c | 400 ++++++++- dlls/propsys/tests/propsys.c | 460 +++++++++- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 109 ++- dlls/shell32/shelllink.c | 218 +++-- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/appusermodel.c | 108 +++ dlls/shell32/tests/shell32_test.h | 9 + dlls/shell32/tests/shelllink.c | 123 +++ dlls/winex11.drv/window.c | 72 +- include/propidl.idl | 10 + include/propvarutil.h | 106 ++- include/shobjidl.idl | 6 + include/winbase.h | 2 + 22 files changed, 4971 insertions(+), 375 deletions(-) create mode 100644 dlls/shell32/tests/appusermodel.c -- 2.4.3

4 22

Re: [PATCH 1/4] d3d9/tests: Add a windowed GetFrontBufferData test.
by Henri Verbeet July 16, 2015

July 16, 2015

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/d3d9/tests/visual.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 92 insertions(+) > Testbot failures aside, GetFrontBufferData() is pretty unreliable. This will (potentially) fail if e.g. a different window is covering the test window. (And the ChildWindowFromPoint() in v2 doesn't help, because it only takes other Wine windows into account.)

2 11

Re: [PATCH 2/7] winex11.drv: implement DoDragDrop on top of XDND (try 2)
by Ken Thomases July 16, 2015

July 16, 2015

Hi, On Jul 16, 2015, at 12:38 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > Implements DoDragDrop on top of XDND. > --- > dlls/winex11.drv/clipboard.c | 50 +++ > dlls/winex11.drv/event.c | 2 + > dlls/winex11.drv/x11drv.h | 7 + > dlls/winex11.drv/xdnd.c | 837 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 896 insertions(+) Since you removed the parts touching the user drivers from patch 1 (at my request; thanks), doesn't this patch need to add the entry point to the .spec file? -Ken

2 1

Re: [PATCH (try 2)] user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Marvin July 16, 2015

July 16, 2015

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=15351 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

1 0

Re: [1/4] msvcirt: Implement ios static locking (try 3)
by Piotr Caban July 16, 2015

July 16, 2015

Hi Iván, On 07/15/15 21:29, Iván Matellanes wrote: > +CRITICAL_SECTION ios_static_lock; ... > +CRITICAL_SECTION ios_static_lock = { &ios_static_lock_debug, -1, 0, 0, 0, 0 }; This will not compile when Microsoft Visual Studio is used (variable redefinition). Please use "extern". Thanks, Piotr

1 0

Re: [4/8] vcomp: Implement stub for _vcomp_fork.
by Alexandre Julliard July 16, 2015

July 16, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > +{ > + __ms_va_list valist; > + > + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); > + > + __ms_va_start(valist, wrapper); > + _vcomp_fork_call_wrapper(wrapper, nargs, valist); > + __ms_va_end(valist); > +} Using a valist for this is questionable, even more so in the next patch where you copy it around, and doesn't buy anything over doing it in assembly from the start. -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: [PATCH] user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Marvin July 16, 2015

July 16, 2015

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=15347 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:711: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:946: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w7u (32 bit listbox) === listbox.c:452: Test failed: expected vscroll 0, got 1 listbox.c:457: Test failed: expected vscroll 1, got 2 === wvistau64 (64 bit listbox) === listbox.c:711: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:946: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

1 0

Re: [PATCH 3/8] winex11.drv: implement DoDragDrop on top of XDND
by Sebastian Lackner July 16, 2015

July 16, 2015

On 04.07.2015 15:36, Damjan Jovanovic wrote: > Implements DoDragDrop on top of XDND. While some of DoDragDrop() and > supporting functions are copied from ole32, they were modified to be > non-blocking and event-driven. > > The clipboard is patched to allow searching its clipboard formats for > X11 atoms, export data in X11 format, and forward selection requests > for the XdndSelection selection to XDND. > > We support XDND version 3 to 5 (although we still need XdndProxy > support for version 4). XdndPosition messages are rate-limited to at > most 1 unreplied message and at least every 50 milliseconds apart, so > that we don't flood slow X11 clients like the spec warns. > > Damjan Jovanovic > --- > dlls/winex11.drv/clipboard.c | 50 +++ > dlls/winex11.drv/event.c | 2 + > dlls/winex11.drv/x11drv.h | 7 + > dlls/winex11.drv/xdnd.c | 829 ++++++++++++++++++++++++++++++++++++++++++- > 4 files changed, 887 insertions(+), 1 deletion(-) Thanks for working on this. Sorry for the delayed reply, I've been a bit busy during the last days. Not sure if you have already started improving the patches, but I'll just comment on this version. First of all, regarding patch 2, applying such a patch separately doesn't make much sense. Either the design is accepted (then it can be part of patch 3), or it needs additional work, but then its questionable if the function can be used without further modifications. At first I was planning to give line by line feedback on the patch, but I think you are more interested in general feedback about the design. One of the main disadvantages I see in the current approach is that there is a lot of code duplication in winex11 and ole32. It will get even worse as soon as someone starts implementing the same for winemac or other future backends. I am aware that Ken Thomases basically asked for such a solution, but I don't think its the right approach. There are basically two ways to solve it: * Either the code in winex11 has to be stripped down a lot. A more minimalistic solution has better chances to be accepted, and as soon as winemac contains a similar implementation, the code in ole32 could be removed. When we need a huge statemachine though, its better to avoid duplication. * Alternatively, instead of duplicating code, the winex11/winemac backend could provide a function pointer table or separate exports, with callbacks for things which can be done natively. Ole32 could use these callbacks to register the format, query if it dragging was finished, and so on. To avoid polling, the driver could also post window messages to the "TrackerWindow". If you need any help, feel free to ask. Also feel free to show proof-of-concept patches even when they are not finished yet, for example via IRC or wine-devel. As a side note, it looks like various parts of your patch lack proper locking, but thats not your fault, its already missing in the existing winex11 code. I'll see if I can clean up the existing code a bit to simplify the integration of such a new feature. Best regards, Sebastian

2 1

Re: [PATCH 2/2] d3drm: Add version specific tests for CreateDeviceFrom* methods. (try 2)
by Marvin July 15, 2015

July 15, 2015

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=15326 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73

1 0

Re: [PATCH 1/2] d3drm/tests: Fix leaks while creating device in tests (Valgrind) (try 2)
by Marvin July 15, 2015

July 15, 2015

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=15325 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB

1 0

WineConf 2015 RSVP
by Stefan Dösinger July 15, 2015

July 15, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Jeremy Newman has set up a simple form to register for WineConf: https://www.winehq.org/wineconf/rsvp . If you're planning to attend the conference please fill out this form. This allows us to give the hotel a better guest estimate to prepare the conference room. The link can of course be found at the WineConf 2015 wiki page: http://wiki.winehq.org/WineConf2015 . Thanks, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVppXBAAoJEN0/YqbEcdMwlwIP/jmLTAGgjm++2oE4NtznKisw TKdclyHGxsi//iVSPJ3TGH+GZdjd1ymcnoNthIWxHJfnDBxm/eqeNDsyRcOEEtAg g/qgiTa1dToWdb9lkyJKqU7MJioYOnDXDruhn1C9+3LUVkQE1hdSvMlIq2+4iRoX s2A+pkT1Gz8qfn/QXjrReZ5ZswvqaqNTWvfBtXRKxzHw/IhtEA5KnNDyQAfB1GiM B5gbWr5GWe200LDnxAu4L0wduznnFA4GKPtdOYByFHGT3eXUShCB8q6vCTBIVvq3 grZSAdE08p7XLj9f41YIN/P5LpjB40zdvns/KxtkYOmLsCF49npLptQrbxgCqWqz +1W2mdcRKu8Y7EusLB+Oa9shwfgIMO2wiRIGiRvxRB2w3h4Yg3IvYMaha+YczYa3 4+iaDgSLwwfTi5OKhK0zV+8JYyWzWaSSRlBm0MFS407i+DHkFtTWtmktQrG20LGG tcdTWRlD02GvjxWbuF3iMDwk2DRJl9wAY4PH9Z2VyR15i3w2Bs00FmY+Td4L38GS otw4EozknMNd/MBv7ijWrDaiEw1GMrkhh1b+wbxKmw/Ac2x+tBNtcLM8R00PuxK3 corVb1WzkRbIjCNPpQ0YS2C/8OVFh/k0ScO5R5+au0L0FepUxKg91A94hOH0KJk/ waKBRJ23gYN55NlsIh8J =KVcj -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] d3drm: Add version specific tests for CreateDeviceFrom* methods.
by Marvin July 15, 2015

July 15, 2015

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=15324 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73

1 0

Need a new subscriber password
by Aaryaman Vasishta July 15, 2015

July 15, 2015

Hello, Please provide me with a new password as I've forgotten the old one for this list. Thanks! Jam

2 1

Re: [PATCH 1/5] d3drm/tests: Fix leaks while creating device in tests (Valgrind)
by Marvin July 15, 2015

July 15, 2015

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=15323 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB

1 0

Re: [PATCH 1/5] d3drm/tests: Fix leaks while creating device in tests (Valgrind)
by Aaryaman Vasishta July 15, 2015

July 15, 2015

This fixes bug #38913. https://bugs.winehq.org/show_bug.cgi?id=38913 On Wed, Jul 15, 2015 at 5:23 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/tests/d3drm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 1816214..8c1c9d6 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1999,10 +1999,14 @@ static void test_create_device_from_clipper(void) > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 0, 0, &device2); > todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > + if (FAILED(hr)) > + IDirect3DRMDevice2_Release(device2); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, > 0, &device2); > todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > + if (FAILED(hr)) > + IDirect3DRMDevice2_Release(device2); > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 300, 200, &device2); > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = > %x).\n", hr); > -- > 2.3.2 (Apple Git-55) > >

1 1