wine-devel August 2015

wine-devel@winehq.org

59 participants
198 discussions

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

Jump to page:

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 August 2015