- wine-devel - winehq.org

Re: loader: Add UTC Time Zone
by Sebastian Lackner 03 Aug '15

03 Aug '15

On 03.08.2015 14:48, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2ab6ff3 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 This is still wrong unfortunately, there should only be one "," before the 1, otherwise it is not interpreted correctly. > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner 03 Aug '15

03 Aug '15

On 02.08.2015 14:12, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2a7505c 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Hello Philippe, thanks for working on this. The line above is unfortunately not completely correct, you forgot to specify the type of the registry key (it should be a binary key in this case). It should look like this: HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Besides that the patch is fine. Regards, Sebastian > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

2 1

Re: [PATCH 1/4] reg: Add path/key conversion functions
by Stefan Dösinger 03 Aug '15

03 Aug '15

-----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: ole32: Add stub implementations of CoGetActivationState and CoGetCallState.
by Dmitry Timoshkov 03 Aug '15

03 Aug '15

Hans Leidekker <hans(a)codeweavers.com> wrote: > +/*********************************************************************** > + * CoGetActivationState (ole32.@) > + */ > +HRESULT CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) > +{ > + FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); > + return E_NOTIMPL; > +} > + > +/*********************************************************************** > + * CoGetCallState (ole32.@) > + */ > +HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) > +{ > + FIXME("%d, %p\n", unknown, unknown2); > + return E_NOTIMPL; > +} wct.h from PSDK has typedefs for COGETCALLSTATE and COGETACTIVATIONSTATE without WINAPI, so probably implementations shouldn't have them either. Same applies to .spec file entries. -- Dmitry.

1 0

Re: [PATCH] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2)
by Marvin 03 Aug '15

03 Aug '15

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=15708 Your paranoid android. === w8 (32 bit mesh) === mesh.c:8258: Test failed: Mesh 26: new_num_vertices == 4, expected 6. mesh.c:8272: Test failed: Mesh 26: indices[3] == 1, expected 3 mesh.c:8272: Test failed: Mesh 26: indices[4] == 3, expected 4 mesh.c:8272: Test failed: Mesh 26: indices[5] == 2, expected 5 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[3] == 4, expected 3 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[4] == -1, expected 4 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[5] == -1, expected 5 mesh.c:8328: Test failed: Mesh 26: Got (3.000000, 0.000000, 0.000000) for vertex 3 position, expected (2.000000, 3.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 3 undefined color, expected (0, 0, 0, 0). mesh.c:8328: Test failed: Mesh 26: Got (2.000000, 3.000000, 0.000000) for vertex 4 position, expected (3.000000, 0.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 5 undefined color, expected (1, 1, 1, 1).

2 1

Re: [PATCH] include: Fix packing of digitalv.h
by Dmitry Timoshkov 02 Aug '15

02 Aug '15

Bernhard Übelacker <bernhardu(a)vr-web.de> wrote: > diff --git a/include/digitalv.h b/include/digitalv.h > index a4ceb54..00601f4 100644 > --- a/include/digitalv.h > +++ b/include/digitalv.h > @@ -23,6 +23,8 @@ > * Wine Digital Video extensions > */ > > +#include <pshpack1.h> > + > #ifdef __cplusplus > extern "C" { > #endif This needs a matching #include <poppack.h> -- Dmitry.

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by YongHao Hu 02 Aug '15

02 Aug '15

Excuse me, Is there anything to do to improve this patch? On 15/7/30 上午2:01, YongHao Hu wrote: > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > >

1 0

Re: [PATCH] user32: Return correct size for SM_CXSMICON on high-DPI screens.
by Ken Thomases 01 Aug '15

01 Aug '15

On Aug 1, 2015, at 8:49 AM, Mark Harmstone <hellas(a)burntcomma.com> wrote: > Wine currently hardcodes the value of SM_CXSMICON in GetSystemMetrics as 16, > but Windows scales this on high-DPI screens: see https://msdn.microsoft.com/en-us/library/ms701681.aspx. According to that page, it only scales the results from GetSystemMetrics() for apps which have disabled automatic DPI scaling by calling SetProcessDPIAware(). Which makes sense because if the DPI is 192 and the app thinks the small icon size is 32x32 pixels and draws something that size and then it's scaled again for the DPI, it will appear 4 times the linear pixel size, rather than just the 2 times it should be for the DPI. -Ken

1 0

Re: [PATCH 00/21] MSVC 2015 CRT
by Martin Storsjö 01 Aug '15

01 Aug '15

Hi, On Thu, 23 Jul 2015, Martin Storsjo wrote: > The RTM version of MSVC 2015 is out now, and along with that, a new > CRT version (again). As most of you probably know already, the CRT > has now been split into two parts, ucrtbase (which is considered > a system component in Windows 10, and is available as a redistributable > installable component for older Windows versions) and vcruntime140 > (which is the normal, compiler specific runtime). > > Even if Windows 10 isn't out yet, this is based on the redistributable > ucrtbase.dll that is installed by MSVC 2015. > > The ucrtbase.dll isn't very functional after this patchset; e.g. many > stdio functions have been restructured and need to be updated. (I'll > send a patch for that later, once this patchset has been merged.) But > after this set, a minimal plain empty exe built with the dynamic CRT > with MSVC 2015 does start up. Any comments on this patchset, other than the detail about cdecl vs stdcall in the forwarding dlls that Sebastian pointed out? Now that Windows 10 RTM is out, this can also be updated with the version of ucrtbase.dll from there. The only difference is a few added private (functions starting with _o_) stubs in the spec file. If there's no further comments on the set as such, I can resend it with the spec file updated, and the cdecl vs stdcall issues fixed. // Martin

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin 31 Jul '15

31 Jul '15

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 31 Jul '15

31 Jul '15

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 31 Jul '15

31 Jul '15

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 31 Jul '15

31 Jul '15

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 31 Jul '15

31 Jul '15

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 31 Jul '15

31 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

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 30 Jul '15

30 Jul '15

> 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 30 Jul '15

30 Jul '15

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 29 Jul '15

29 Jul '15

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 29 Jul '15

29 Jul '15

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 29 Jul '15

29 Jul '15

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 28 Jul '15

28 Jul '15

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 28 Jul '15

28 Jul '15

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 28 Jul '15

28 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 27 Jul '15

27 Jul '15

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 26 Jul '15

26 Jul '15

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 26 Jul '15

26 Jul '15

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 26 Jul '15

26 Jul '15

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 26 Jul '15

26 Jul '15

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel