May 2018 - Wine-Commits - list.winehq.org

Jeremy Newman : clean up news and rss links
by Jeremy Newman May 2, 2018

May 2, 2018

Module: website Branch: master Commit: ec2957aefab5d3e5e63409b07be0abfbbff6de06 URL: https://source.winehq.org/git/website.git/?a=commit;h=ec2957aefab5d3e5e6340… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 2 15:49:39 2018 -0500 clean up news and rss links sync the languages, and use font awesome --- css/styles.css | 16 ---------------- templates/de/news.template | 16 ---------------- templates/en/news.template | 11 +++++------ templates/fr/news.template | 12 ++++++++---- templates/ko/news.template | 12 ++++++------ templates/pl/news.template | 11 +++++------ templates/tr/news.template | 13 ++++++------- templates/uk/news.template | 13 ++++++------- templates/zh-cn/news.template | 13 ++++++------- 9 files changed, 42 insertions(+), 75 deletions(-) diff --git a/css/styles.css b/css/styles.css index 4c046d9..5564088 100644 --- a/css/styles.css +++ b/css/styles.css @@ -536,22 +536,6 @@ div.rbox div.content { margin: 0; background-color: #FFFFFF; } .wwnQuote { color: #A8003C; } p.indent { padding-left: 1em; padding-right: 1em;} -/* RSS Feed Links */ -ul.rss { - list-style: none; - padding: 0 0 0 2px; - margin: 0; -} -ul.rss li { - background: url("./images/feed.gif") no-repeat 0 1px; - padding: 0px 0 0px 0px; - height: 18px; -} -ul.rss li a { - font-size: 8pt; - padding: 0 0 0 18px; -} - /* template navigation links */ .link-container { position: relative; height: 1.2em; } .link-container p { position: absolute; width: 50%; margin: 0; } diff --git a/templates/de/news.template b/templates/de/news.template deleted file mode 100644 index 0fe155a..0000000 --- a/templates/de/news.template +++ /dev/null @@ -1,16 +0,0 @@ - - - -<h1 class="title">News</h1> - - - -<hr /> - -<div class="link-container"> - <p><a href="{$root}/wwn/">World Wine News Archiv</a></p> -</div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> -</ul> - diff --git a/templates/en/news.template b/templates/en/news.template index 0443453..719e072 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,5 +1,4 @@  - <h1 class="title">News</h1> @@ -8,9 +7,9 @@ <hr> <div class="link-container"> - <p><a href="{$root}/wwn/">World Wine News Archive</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> -</ul> - diff --git a/templates/fr/news.template b/templates/fr/news.template index 68585e5..e62421c 100644 --- a/templates/fr/news.template +++ b/templates/fr/news.template @@ -1,11 +1,15 @@  - <h1 class="title">Nouvelles</h1>  -<ul class="rss"> - <li><a href="{$root}/news/rss/">Flux RSS des nouvelles de WineHQ</a></li> -</ul> +<hr> +<div class="link-container"> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> Flux RSS des nouvelles de WineHQ</a> + </p> +</div> diff --git a/templates/ko/news.template b/templates/ko/news.template index 59878d5..69cb5da 100644 --- a/templates/ko/news.template +++ b/templates/ko/news.template @@ -1,5 +1,4 @@ - - + <h1 class="title">소식</h1> @@ -8,9 +7,10 @@ <hr> <div class="link-container"> - <p><a href="{$root}/wwn/">보존된 세계 와인 소식</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> 보존된 세계 와인 소식</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> 와인HQ 소식 RSS 피드</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">와인HQ 소식 RSS 피드</a></li> -</ul> diff --git a/templates/pl/news.template b/templates/pl/news.template index 5bad815..77f9f22 100644 --- a/templates/pl/news.template +++ b/templates/pl/news.template @@ -1,5 +1,4 @@  - <h1 class="title">Wieści</h1> @@ -8,9 +7,9 @@ <hr> <div class="link-container"> - <p><a href="{$root}/wwn/">Archiwum Wieści ze Świata Wine</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Archiwum Wieści ze Świata Wine</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> Kanał RSS Wieści WineHQ</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">Kanał RSS Wieści WineHQ</a></li> -</ul> - diff --git a/templates/tr/news.template b/templates/tr/news.template index c529df2..ebea1c1 100644 --- a/templates/tr/news.template +++ b/templates/tr/news.template @@ -1,16 +1,15 @@  - <h1 class="title">Haberler</h1>  -<hr /> +<hr> <div class="link-container"> - <p><a href="{$root}/wwn/">Dünya Wine Haber Arşivi</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Dünya Wine Haber Arşivi</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ Haber RSS Beslemesi</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ Haber RSS Beslemesi</a></li> -</ul> - diff --git a/templates/uk/news.template b/templates/uk/news.template index 52ba070..164507c 100644 --- a/templates/uk/news.template +++ b/templates/uk/news.template @@ -1,16 +1,15 @@  - <h1 class="title">Новини</h1>  -<hr /> +<hr> <div class="link-container"> - <p><a href="{$root}/wwn/">Світовий новинний архів Wine</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Світовий новинний архів Wine</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ Новинна стрічка RSS Feed</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ Новинна стрічка RSS Feed</a></li> -</ul> - diff --git a/templates/zh-cn/news.template b/templates/zh-cn/news.template index ea32da2..b23f88b 100644 --- a/templates/zh-cn/news.template +++ b/templates/zh-cn/news.template @@ -1,16 +1,15 @@  - <h1 class="title">新闻</h1>  -<hr /> +<hr> <div class="link-container"> - <p><a href="{$root}/wwn/">全部 Wine 新闻归档</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> 全部 Wine 新闻归档</a> +   <i class="fas fa-ellipsis-v"></i>   + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ 新闻 RSS 订阅</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ 新闻 RSS 订阅</a></li> -</ul> -

1 0

Louis Lenders : winmm: Return error in waveInMessage if either dwParam1 or dwParam2 is null.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 8dca6c35e11a104385242ed8346ee05707b78ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dca6c35e11a104385242ed8… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 2 10:02:15 2018 -0500 winmm: Return error in waveInMessage if either dwParam1 or dwParam2 is null. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 54c3793..fd4005c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -661,6 +661,16 @@ static void wave_in_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 26fed17..045bf4a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3660,17 +3660,17 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_inmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; }

1 0

Michael Müller : combase: Implement RoActivateInstance.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: e5275c2f86bd6a1dea88ece3e636783c19c430ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5275c2f86bd6a1dea88ece3… Author: Michael Müller <michael(a)fds-team.de> Date: Wed May 2 03:42:49 2018 +0000 combase: Implement RoActivateInstance. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 74c9d27..978c3dc 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub RoActivateInstance +@ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stub RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c238eb8..f42bdae 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -242,7 +242,7 @@ @ stdcall PropVariantClear(ptr) ole32.PropVariantClear @ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy @ stub ReleaseFuncDescs -@ stub RoActivateInstance +@ stdcall RoActivateInstance(ptr ptr) @ stub RoCaptureErrorContext @ stub RoClearError @ stub RoFailFastWithErrorContext diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index f7862fb..bfd07fb 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -198,3 +198,23 @@ HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, cons if (hiid) *hiid = INVALID_HANDLE_VALUE; return E_NOTIMPL; } + +/*********************************************************************** + * RoActivateInstance (combase.@) + */ +HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) +{ + IActivationFactory *factory; + HRESULT hr; + + FIXME("(%p, %p): semi-stub\n", classid, instance); + + hr = RoGetActivationFactory(classid, &IID_IActivationFactory, (void **)&factory); + if (SUCCEEDED(hr)) + { + hr = IActivationFactory_ActivateInstance(factory, instance); + IActivationFactory_Release(factory); + } + + return hr; +}

1 0

Michael Müller : combase: Implement RoGetActivationFactory.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: e6c0dd3bed8dd716bb39a81c46f4d505bf783493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c0dd3bed8dd716bb39a81c… Author: Michael Müller <michael(a)fds-team.de> Date: Wed May 2 03:42:47 2018 +0000 combase: Implement RoGetActivationFactory. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 +- dlls/combase/roapi.c | 139 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 135 insertions(+), 6 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index b1d759e..df051ad 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,5 +1,5 @@ MODULE = combase.dll -IMPORTS = ole32 uuid +IMPORTS = advapi32 ole32 uuid C_SRCS = \ roapi.c \ diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2d62520..f7862fb 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -1,5 +1,6 @@ /* * Copyright 2014 Martin Storsjo + * Copyright 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,16 +16,96 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#define COBJMACROS #include "objbase.h" +#include "initguid.h" #include "roapi.h" #include "roparameterizediid.h" -#include "hstring.h" +#include "winstring.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(combase); +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) +{ + static const WCHAR classkeyW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','R','u','n','t','i','m','e','\\', + 'A','c','t','i','v','a','t','a','b','l','e','C','l','a','s','s','I','d',0}; + static const WCHAR dllpathW[] = {'D','l','l','P','a','t','h',0}; + HKEY hkey_root, hkey_class; + DWORD type, size; + HRESULT hr; + WCHAR *buf = NULL; + + *out = NULL; + + /* load class registry key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, classkeyW, 0, KEY_READ, &hkey_root)) + return REGDB_E_READREGDB; + if (RegOpenKeyExW(hkey_root, classid, 0, KEY_READ, &hkey_class)) + { + WARN("Class %s not found in registry\n", debugstr_w(classid)); + RegCloseKey(hkey_root); + return REGDB_E_CLASSNOTREG; + } + RegCloseKey(hkey_root); + + /* load (and expand) DllPath registry value */ + if (RegQueryValueExW(hkey_class, dllpathW, NULL, &type, NULL, &size)) + { + hr = REGDB_E_READREGDB; + goto done; + } + if (type != REG_SZ && type != REG_EXPAND_SZ) + { + hr = REGDB_E_READREGDB; + goto done; + } + if (!(buf = HeapAlloc(GetProcessHeap(), 0, size))) + { + hr = E_OUTOFMEMORY; + goto done; + } + if (RegQueryValueExW(hkey_class, dllpathW, NULL, NULL, (BYTE *)buf, &size)) + { + hr = REGDB_E_READREGDB; + goto done; + } + if (type == REG_EXPAND_SZ) + { + WCHAR *expanded; + DWORD len = ExpandEnvironmentStringsW(buf, NULL, 0); + if (!(expanded = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + hr = E_OUTOFMEMORY; + goto done; + } + ExpandEnvironmentStringsW(buf, expanded, len); + HeapFree(GetProcessHeap(), 0, buf); + buf = expanded; + } + + *out = buf; + return S_OK; + +done: + HeapFree(GetProcessHeap(), 0, buf); + RegCloseKey(hkey_class); + return hr; +} + + /*********************************************************************** * RoInitialize (combase.@) */ @@ -51,10 +132,58 @@ void WINAPI RoUninitialize(void) /*********************************************************************** * RoGetActivationFactory (combase.@) */ -HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factory) +HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_factory) { - FIXME("stub: %p %p %p\n", classid, iid, factory); - return E_NOTIMPL; + PFNGETACTIVATIONFACTORY pDllGetActivationFactory; + IActivationFactory *factory; + WCHAR *library; + HMODULE module; + HRESULT hr; + + FIXME("(%s, %s, %p): semi-stub\n", debugstr_hstring(classid), debugstr_guid(iid), class_factory); + + if (!iid || !class_factory) + return E_INVALIDARG; + + hr = get_library_for_classid(WindowsGetStringRawBuffer(classid, NULL), &library); + if (FAILED(hr)) + { + ERR("Failed to find library for %s\n", debugstr_hstring(classid)); + return hr; + } + + if (!(module = LoadLibraryW(library))) + { + ERR("Failed to load module %s\n", debugstr_w(library)); + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + if (!(pDllGetActivationFactory = (void *)GetProcAddress(module, "DllGetActivationFactory"))) + { + ERR("Module %s does not implement DllGetActivationFactory\n", debugstr_w(library)); + hr = E_FAIL; + goto done; + } + + TRACE("Found library %s for class %s\n", debugstr_w(library), debugstr_hstring(classid)); + + hr = pDllGetActivationFactory(classid, &factory); + if (SUCCEEDED(hr)) + { + hr = IActivationFactory_QueryInterface(factory, iid, class_factory); + if (SUCCEEDED(hr)) + { + TRACE("Created interface %p\n", *class_factory); + module = NULL; + } + IActivationFactory_Release(factory); + } + +done: + HeapFree(GetProcessHeap(), 0, library); + if (module) FreeLibrary(module); + return hr; } /***********************************************************************

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add a test for IoGetCurrentProcess() .
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 80f82ee9d735808aa56a419beadec52b8831aecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=80f82ee9d735808aa56a419b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 1 18:38:03 2018 -0500 ntoskrnl.exe/tests: Add a test for IoGetCurrentProcess(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 8 +- dlls/ntoskrnl.exe/tests/driver.c | 157 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 9 +++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 50 ++++++++++++ include/wine/test.h | 9 ++- 5 files changed, 226 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80f82ee9d735808aa56a…

1 0

Alex Henrie : include: Add strtof and strtold.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: ccbfb951c25a76d689ffd4a203b3e4fd2e13e92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbfb951c25a76d689ffd4a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 1 22:52:00 2018 -0600 include: Add strtof and strtold. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index a325187..2851e19 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -203,7 +203,9 @@ int __cdecl rand(void); errno_t __cdecl rand_s(unsigned int*); void* __cdecl realloc(void*,size_t); void __cdecl srand(unsigned int); +float __cdecl strtof(const char*,char**); double __cdecl strtod(const char*,char**); +double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl _strtoi64(const char*,char**,int);

1 0

Zebediah Figura : msi: Set the correct values for ProgramFiles64Folder and CommonFiles64Folder.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: a6e9622439c4fd22578e737e60ca2af44a32f8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e9622439c4fd22578e737e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 2 00:09:24 2018 -0500 msi: Set the correct values for ProgramFiles64Folder and CommonFiles64Folder. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 37 ++++-- dlls/msi/tests/package.c | 292 ++++++++++++----------------------------------- 2 files changed, 101 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e9622439c4fd22578e…

1 0

Hans Leidekker : server: Store the token owner separately.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: fc3057c4f3c3dd85902140b9ed479128e7d9297e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3057c4f3c3dd85902140b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 2 10:45:42 2018 +0200 server: Store the token owner separately. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/server/token.c b/server/token.c index cde9c5a..0810a61 100644 --- a/server/token.c +++ b/server/token.c @@ -104,7 +104,8 @@ struct token struct list privileges; /* privileges available to the token */ struct list groups; /* groups that the user of this token belongs to (sid_and_attributes) */ SID *user; /* SID of user this token represents */ - SID *primary_group; /* SID of user's primary group */ + SID *owner; /* SID of owner (points to user or one of groups) */ + SID *primary_group; /* SID of user's primary group (points to one of groups) */ unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ @@ -582,9 +583,12 @@ static struct token *create_token( unsigned primary, const SID *user, group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); - /* Use first owner capable group as an owner */ + /* Use first owner capable group as owner and primary group */ if (!token->primary_group && group->owner) + { + token->owner = &group->sid; token->primary_group = &group->sid; + } } /* copy privileges */ @@ -654,7 +658,10 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); if (src_token->primary_group == &group->sid) + { + token->owner = &newgroup->sid; token->primary_group = &newgroup->sid; + } } assert( token->primary_group ); @@ -1393,16 +1400,14 @@ DECL_HANDLER(access_check) } } -/* retrieves the SID of the user that the token represents */ +/* retrieves an SID from the token */ DECL_HANDLER(get_token_sid) { struct token *token; reply->sid_len = 0; - if ((token = (struct token *)get_handle_obj( current->process, req->handle, - TOKEN_QUERY, - &token_ops ))) + if ((token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_QUERY, &token_ops ))) { const SID *sid = NULL; @@ -1416,18 +1421,8 @@ DECL_HANDLER(get_token_sid) sid = token->primary_group; break; case TokenOwner: - { - struct group *group; - LIST_FOR_EACH_ENTRY( group, &token->groups, struct group, entry ) - { - if (group->owner) - { - sid = &group->sid; - break; - } - } + sid = token->owner; break; - } case TokenLogonSid: sid = (const SID *)&builtin_logon_sid; break;

1 0

Hans Leidekker : configure: Require a more recent version of libkrb5.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: ca919ee9c414f668f57a78476bab3b59c9f33d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca919ee9c414f668f57a7847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 2 14:15:03 2018 +0200 configure: Require a more recent version of libkrb5. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0529256..cf625c8 100755 --- a/configure +++ b/configure @@ -13640,11 +13640,11 @@ LIBS="-lkrb5 $KRB5_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char krb5_init_context (); +char krb5_is_config_principal (); int main () { -return krb5_init_context (); +return krb5_is_config_principal (); ; return 0; } @@ -13689,9 +13689,9 @@ else fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in - x) as_fn_append wine_notices "|libkrb5 ${notice_platform}development files not found, Kerberos won't be supported." ;; + x) as_fn_append wine_notices "|libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported." ;; xno) ;; - *) as_fn_error $? "libkrb5 ${notice_platform}development files not found, Kerberos won't be supported. + *) as_fn_error $? "libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported. This is an error since --with-krb5 was requested." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index fe8ffaa..7386d74 100644 --- a/configure.ac +++ b/configure.ac @@ -1669,7 +1669,7 @@ then [AC_CHECK_HEADERS([krb5/krb5.h]) if test "$ac_cv_header_krb5_krb5_h" = "yes" then - WINE_CHECK_SONAME(krb5,krb5_init_context,,[KRB5_CFLAGS=""],[$KRB5_LIBS]) + WINE_CHECK_SONAME(krb5,krb5_is_config_principal,,[KRB5_CFLAGS=""],[$KRB5_LIBS]) else KRB5_CFLAGS="" fi]) @@ -1677,7 +1677,7 @@ else with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], - [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.]) + [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** if test "x$with_gssapi" != "xno"

1 0

Alex Henrie : ucrtbase: Hook up _Exit.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 67cae2dedc9770755d86e4fbc756d3f8ddf6676a URL: https://source.winehq.org/git/wine.git/?a=commit;h=67cae2dedc9770755d86e4fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 1 22:52:01 2018 -0600 ucrtbase: Hook up _Exit. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/stdlib.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 50856a5..24014a6 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub _Exit +@ cdecl _Exit(long) ucrtbase._Exit @ cdecl -arch=i386 __control87_2(long long ptr ptr) ucrtbase.__control87_2 @ cdecl __doserrno() ucrtbase.__doserrno @ cdecl __fpe_flt_rounds() ucrtbase.__fpe_flt_rounds diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ce226fe..236b0d5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -20,7 +20,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() -@ stub _Exit +@ cdecl _Exit(long) MSVCRT__exit @ stub _FCbuild @ stub _FCmulcc @ stub _FCmulcr diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2851e19..8d0a7c5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -179,6 +179,7 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); +void __cdecl _Exit(int); void __cdecl _exit(int); void __cdecl abort(void); int __cdecl abs(int);

1 0