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

[PATCH 2/5] combase: Add stub for RoRegisterForApartmentShutdown.
by Alistair Leslie-Hughes May 4, 2018

May 4, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 19 +++++++++++++++++++ 3 files changed, 21 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 88139fb..d27130c 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 @@ -3,7 +3,7 @@ @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ff89232..ec4a6cd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -263,7 +263,7 @@ @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate @ stub RoReportUnhandledError diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 9cceb82..ffcb0e9 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -232,3 +232,22 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) *identifier = 0xdeadbeef; return S_OK; } + +/*********************************************************************** + * RoRegisterForApartmentShutdown (combase.@) + */ +HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, + UINT64 *identifier, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE *cookie) +{ + HRESULT hr; + + FIXME("(%p, %p, %p): stub\n", callback, identifier, cookie); + + hr = RoGetApartmentIdentifier(identifier); + if (FAILED(hr)) + return hr; + + if (cookie) + *cookie = (void *)0xcafecafe; + return S_OK; +} -- 1.9.1

1 0

[PATCH 1/5] combase: Add stub for RoGetApartmentIdentifier.
by Alistair Leslie-Hughes May 4, 2018

May 4, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 3 files changed, 16 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 978c3dc..88139fb 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,6 +1,6 @@ @ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f42bdae..ff89232 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -250,7 +250,7 @@ @ stub RoGetActivatableClassRegistration @ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index bfd07fb..9cceb82 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -218,3 +218,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) return hr; } + +/*********************************************************************** + * RoGetApartmentIdentifier (combase.@) + */ +HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) +{ + FIXME("(%p): stub\n", identifier); + + if (!identifier) + return E_INVALIDARG; + + *identifier = 0xdeadbeef; + return S_OK; +} -- 1.9.1

1 0

[PATCH 1/3] strmbase: Check that the output pin supports the given media type before connecting.
by Zebediah Figura May 4, 2018

May 4, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 48f2497..a3117dd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,7 +718,8 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei TRACE("(%p, %p)\n", pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); - /* FIXME: call queryacceptproc */ + if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) + return hr; This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); -- 2.7.4

1 2

[PATCH] schedsvc: Also watch for job file modifications.
by Dmitry Timoshkov May 4, 2018

May 4, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 74 ++++++++++++++++++++++++++++++---------- dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 12 ++++++- 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e7e59a4c0a..53a18fd682 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -269,15 +269,12 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -void add_job(const WCHAR *name) +static BOOL load_job(const WCHAR *name, AT_ENUM *info) { HANDLE file, mapping; DWORD size, try; void *data; - struct job_t *job; - - job = heap_alloc_zero(sizeof(*job)); - if (!job) return; + BOOL ret = FALSE; try = 1; for (;;) @@ -304,14 +301,7 @@ void add_job(const WCHAR *name) data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); if (data) { - if (load_job_data(data, size, &job->info)) - { - EnterCriticalSection(&at_job_list_section); - job->name = heap_strdupW(name); - job->info.JobId = current_jobid++; - list_add_tail(&at_job_list, &job->entry); - LeaveCriticalSection(&at_job_list_section); - } + ret = load_job_data(data, size, info); UnmapViewOfFile(data); } @@ -320,11 +310,39 @@ void add_job(const WCHAR *name) break; } - if (!job->info.JobId) + return ret; +} + +static void free_job_info(AT_ENUM *info) +{ + heap_free(info->Command); +} + +static void free_job(struct job_t *job) +{ + free_job_info(&job->info); + heap_free(job->name); + heap_free(job); +} + +void add_job(const WCHAR *name) +{ + struct job_t *job; + + job = heap_alloc_zero(sizeof(*job)); + if (!job) return; + + if (!load_job(name, &job->info)) { - heap_free(job->info.Command); - heap_free(job); + free_job(job); + return; } + + EnterCriticalSection(&at_job_list_section); + job->name = heap_strdupW(name); + job->info.JobId = current_jobid++; + list_add_tail(&at_job_list, &job->entry); + LeaveCriticalSection(&at_job_list_section); } static BOOL write_signature(HANDLE hfile) @@ -523,12 +541,32 @@ void remove_job(const WCHAR *name) if (job) { list_remove(&job->entry); - heap_free(job->name); - heap_free(job); + free_job(job); } LeaveCriticalSection(&at_job_list_section); } +void modify_job(const WCHAR *name) +{ + AT_ENUM info; + + if (load_job(name, &info)) + { + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + job = find_job(0, name); + if (job) + { + free_job_info(&job->info); + job->info = info; + } + else + free_job_info(&info); + LeaveCriticalSection(&at_job_list_section); + } +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { WCHAR windir[MAX_PATH]; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba003e..c0aa188fda 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void modify_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index fb7732c1d9..ba8de0430f 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -78,7 +78,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) memset(&info, 0, sizeof(info)); ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, NULL); + FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, + NULL, &ov, NULL); if (!ret) break; events[0] = done_event; @@ -106,6 +107,15 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) remove_job(path); break; + case FILE_ACTION_MODIFIED: + TRACE("FILE_ACTION_MODIFIED %s\n", debugstr_w(info.data.FileName)); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + modify_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; -- 2.16.3

1 0

[PATCH 5/5] user32: Respect right margin in DrawTextExW().
by Zhiyi Zhang May 4, 2018

May 4, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 34e035607b..4ba8ed43fb 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1017,9 +1017,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, lines_ptr + used_buffer, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; + if (flags & DT_CENTER) + x = (rect->left + lmargin + rect->right - rmargin - size.cx) / 2; + else if (flags & DT_RIGHT) + x = rect->right - size.cx - rmargin; lines_info_ptr[used_lines].length = len; lines_info_ptr[used_lines].x = x; -- 2.17.0

1 0

[PATCH 4/5] user32: Fix using DrawTextEx() to calculate rect with flag DT_BOTTOM.
by Zhiyi Zhang May 4, 2018

May 4, 2018

Fix using DrawTextEx() to calculate text rect with DT_BOTTOM flag set returns zero for text height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 12 ++++++++++++ dlls/user32/text.c | 20 +++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..23868128d7 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,6 +28,8 @@ #include "winerror.h" #include "winnls.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) @@ -46,11 +48,13 @@ static void test_DrawTextCalcRect(void) static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; static char tabstring[] = "one\ttwo"; + static const DWORD alignments[] = {DT_TOP, DT_LEFT, DT_CENTER, DT_RIGHT, DT_VCENTER, DT_BOTTOM}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; + INT i; /* Initialization */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, @@ -586,6 +590,14 @@ static void test_DrawTextCalcRect(void) ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + for (i = 0; i < ARRAY_SIZE(alignments); i++) + { + SetRectEmpty(&rect); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_NOCLIP | DT_CALCRECT | DT_SINGLELINE | alignments[i]); + ok(textheight > 0, "Alignment 0x%08x got unexpected textheight %d\n", alignments[i], textheight); + ok(rect.right - rect.left > 0, "Alignment 0x%08x got unexpected rect width %d\n", alignments[i], + rect.right - rect.left); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index dbde596a1c..34e035607b 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -892,7 +892,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int lmargin = 0, rmargin = 0; int x = rect->left, y = rect->top, xseg; int width = rect->right - rect->left; - int max_width = 0; + int max_width = 0, max_height = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; @@ -1029,6 +1029,8 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (size.cx > max_width) max_width = size.cx; + max_height += lh; + if (invert_y) y -= lh; else @@ -1040,13 +1042,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (!(flags & DT_CALCRECT)) { - y = rect->top; - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; - } + if (flags & DT_VCENTER) + y = invert_y ? rect->top - (rect->bottom - rect->top) / 2 + max_height / 2 + : rect->top + (rect->bottom - rect->top) / 2 - max_height / 2; + else if (flags & DT_BOTTOM) + y = invert_y ? rect->bottom + max_height : rect->bottom - max_height; + else + y = rect->top; for (line_num = 0; line_num < used_lines; line_num++) { @@ -1118,7 +1120,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) memcpy(str, retstr, size_retstr); - ret = y - rect->top; + ret = invert_y ? -max_height : max_height; done: heap_free(retstr); if (lines_ptr != lines_buffer) heap_free(lines_ptr); -- 2.17.0

1 0

Plans for Website (Was: Ignore Patch Series)
by Kyle Auble May 3, 2018

May 3, 2018

On 5/3/2018 9:19 AM, Jeremy Newman wrote: > Thanks for letting me know. Also, thanks for help cleaning up this old site. > > However, I'm tempted to just redirect all of www.winehq.org to > wiki.winehq.org, and be done with the old site. > > So far we can't do this because we'd lose our news system. If there was > a way to migrate that to the wiki, as well as a way for julliard to > easily post new releases, then we could simply kill the old site. > > I'm open to suggestions there. Perhaps this is a something that can be > discussed at WineConf (yes, I'm going this year). > > -N I know Rosanne mentioned that the goal's to do exactly that with all the static pages. I figured the plan was to do it incrementally though, moving everything to the wiki first, and then keeping just a skeletal PHP system for things like the landing page. I'll focus on the low-hanging fruit when editing the website. The images folder is probably the easiest to tackle. My impression is that everything in there that doesn't belong on the wiki or CDN could probably be deleted. It's just a matter of deciding which is which. That said, I was also looking at some of the PHP and JS parts, but if we're going to drop the PHP altogether, I'll just work on migrating content.... Except for that XSS bug. I'd definitely like to clear that up (I think adding htmlentities() to the existing input cleaning should do it, but I'm not sure exactly where yet): https://bugs.winehq.org/show_bug.cgi?id=44764 Kyle

1 0

[PATCH 1/3] include: Add atoll
by Alex Henrie May 3, 2018

May 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For https://stackoverflow.com/questions/49397035/trying-to-use-winelib-with-sta… include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 8d0a7c5a76..745f214718 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -188,6 +188,7 @@ double __cdecl atof(const char*); int __cdecl atoi(const char*); int __cdecl _atoi_l(const char*,_locale_t); __msvcrt_long __cdecl atol(const char*); +__int64 __cdecl atoll(const char*); void* __cdecl calloc(size_t,size_t); #ifndef __i386__ div_t __cdecl div(int,int); -- 2.17.0

2 5

[PATCH] ntoskrnl.exe/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel May 3, 2018

May 3, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5887d94..40de760 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -68,8 +68,10 @@ static void unload_driver(SC_HANDLE service) ControlService(service, SERVICE_CONTROL_STOP, &status); while (status.dwCurrentState == SERVICE_STOP_PENDING) { + BOOL ret; Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); @@ -121,11 +123,13 @@ static SC_HANDLE load_driver(char *filename) ok(ret, "StartService failed: %u\n", GetLastError()); /* wait for the service to start up properly */ - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); while (status.dwCurrentState == SERVICE_START_PENDING) { Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); @@ -194,6 +198,7 @@ START_TEST(ntoskrnl) { char filename[MAX_PATH]; SC_HANDLE service; + BOOL ret; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); @@ -205,5 +210,6 @@ START_TEST(ntoskrnl) main_test(); unload_driver(service); - ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); } -- 2.7.4

2 1

[PATCH 2/2] wininet: Add stub for INTERNET_OPTION_REFRESH.
by Jacek Caban May 3, 2018

May 3, 2018

Based on patch by Michael Müller. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 145470 dlls/wininet/internet.c | 5 +++++ dlls/wininet/tests/internet.c | 13 +++++++++++++ 2 files changed, 18 insertions(+)

1 0