March 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : kernel32: Added SetWaitableTimerEx().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 467b7696235a6ca7dfa3aaf82e32f16f5239e273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467b7696235a6ca7dfa3aaf82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 22 11:09:18 2014 +0400 kernel32: Added SetWaitableTimerEx(). --- .../api-ms-win-core-synch-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/sync.c | 10 ++++++++++ include/winbase.h | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec index 43be0c8..d35fe78 100644 --- a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec +++ b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec @@ -39,7 +39,7 @@ @ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount @ stdcall SetEvent(long) kernel32.SetEvent @ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer -@ stub SetWaitableTimerEx +@ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) kernel32.SetWaitableTimerEx @ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait @ stdcall Sleep(long) kernel32.Sleep @ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3126628..b24a9ee 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1191,6 +1191,7 @@ @ stub SetVolumeMountPointA @ stub SetVolumeMountPointW @ stdcall SetWaitableTimer(long ptr long ptr ptr long) +@ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) @ stdcall SetupComm(long long long) @ stub ShowConsoleCursor @ stdcall SignalObjectAndWait(long long long long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 0f44240..6c452a4 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1177,6 +1177,16 @@ BOOL WINAPI SetWaitableTimer( HANDLE handle, const LARGE_INTEGER *when, LONG per return TRUE; } +/*********************************************************************** + * SetWaitableTimerEx (KERNEL32.@) + */ +BOOL WINAPI SetWaitableTimerEx( HANDLE handle, const LARGE_INTEGER *when, LONG period, + PTIMERAPCROUTINE callback, LPVOID arg, REASON_CONTEXT *context, ULONG tolerabledelay ) +{ + FIXME("(%p, %p, %d, %p, %p, %p, %d) semi-stub\n", + handle, when, period, callback, arg, context, tolerabledelay); + return SetWaitableTimer(handle, when, period, callback, arg, FALSE); +} /*********************************************************************** * CancelWaitableTimer (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 6cc0a24..29ff218 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1512,6 +1512,23 @@ typedef PRTL_RUN_ONCE LPINIT_ONCE; /* initialization callback prototype */ typedef BOOL (WINAPI *PINIT_ONCE_FN)(PINIT_ONCE,PVOID,PVOID*); +typedef struct _REASON_CONTEXT +{ + ULONG Version; + DWORD Flags; + union + { + struct + { + HMODULE LocalizedReasonModule; + ULONG LocalizedReasonId; + ULONG ReasonStringCount; + LPWSTR *ReasonStrings; + } Detailed; + LPWSTR SimpleReasonString; + } Reason; +} REASON_CONTEXT, *PREASON_CONTEXT; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -2363,6 +2380,7 @@ WINBASEAPI BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCSTR,LPCSTR); #define SetVolumeMountPoint WINELIB_NAME_AW(SetVolumeMountPoint) WINBASEAPI BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); +WINBASEAPI BOOL WINAPI SetWaitableTimerEx(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,REASON_CONTEXT*,ULONG); WINBASEAPI BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC);

1 0

Austin English : ws2_32: Skip some tests on broken ISPs.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 171748da4d7f77e6fb8db76eaa6d513a3ebf15a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171748da4d7f77e6fb8db76ea… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 22 13:50:37 2014 -0700 ws2_32: Skip some tests on broken ISPs. --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00947c9..dcedd99 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5518,11 +5518,21 @@ static void test_GetAddrInfoW(void) result = (ADDRINFOW *)0xdeadbeef; ret = pGetAddrInfoW(NULL, NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); ok(result == NULL, "got %p\n", result); result = (ADDRINFOW *)0xdeadbeef; ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); ok(result == NULL, "got %p\n", result); @@ -5659,6 +5669,11 @@ static void test_getaddrinfo(void) result = (ADDRINFOA *)0xdeadbeef; ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); ok(result == NULL, "got %p\n", result);

1 0

Ken Thomases : winemac: Don' t recreate the GL view when the pixel format is set again.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 10f50b89c664c8942e5274c3492ddebcac3147aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f50b89c664c8942e5274c34… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:44:18 2014 -0500 winemac: Don't recreate the GL view when the pixel format is set again. It's not necessary. Unlike with X11, on Mac OS X the pixel format doesn't affect the properties of windows and views. The pixel format is a property of the GL context, which can attach to any view. --- dlls/winemac.drv/opengl.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 825e523..4265797 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1311,28 +1311,29 @@ static BOOL get_gl_view_window_rect(struct macdrv_win_data *data, macdrv_window */ static BOOL set_win_format(struct macdrv_win_data *data, int format) { - macdrv_window cocoa_window; - TRACE("hwnd %p format %d\n", data->hwnd, format); - if (!get_gl_view_window_rect(data, &cocoa_window, &data->gl_rect)) + if (!data->gl_view) { - ERR("no top-level parent with Cocoa window in this process\n"); - return FALSE; - } + macdrv_window cocoa_window; + + if (!get_gl_view_window_rect(data, &cocoa_window, &data->gl_rect)) + { + ERR("no top-level parent with Cocoa window in this process\n"); + return FALSE; + } - if (data->gl_view) macdrv_dispose_view(data->gl_view); - data->gl_view = macdrv_create_view(cocoa_window, cgrect_from_rect(data->gl_rect)); + data->gl_view = macdrv_create_view(cocoa_window, cgrect_from_rect(data->gl_rect)); + if (!data->gl_view) + { + WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); + return FALSE; + } - if (!data->gl_view) - { - WARN("failed to create GL view for window %p rect %s\n", cocoa_window, wine_dbgstr_rect(&data->gl_rect)); - return FALSE; + TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, + wine_dbgstr_rect(&data->gl_rect)); } - TRACE("created GL view %p in window %p at %s\n", data->gl_view, cocoa_window, - wine_dbgstr_rect(&data->gl_rect)); - data->pixel_format = format; return TRUE;

1 0

André Hentschel : setupapi: Add support for more architectures when building fake dlls.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 4bcc492fe30e99f88e2204854af702c08117fdef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcc492fe30e99f88e2204854… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 22 16:41:30 2014 +0100 setupapi: Add support for more architectures when building fake dlls. --- dlls/setupapi/fakedll.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 3528e79..e74a306 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -275,8 +275,14 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); /* some fields are copied from the source dll */ -#ifdef _WIN64 +#if defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined __arm__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#elif defined __powerpc__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #endif

1 0

Frédéric Delanoy : French translation for release 1.7.15
by Jeremy Newman March 24, 2014

March 24, 2014

Module: website Branch: master Commit: 2cc92bfac51fe4bd9101f30609007b6b2f44e3f9 URL: http://source.winehq.org/git/website.git/?a=commit;h=2cc92bfac51fe4bd9101f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Mar 24 21:02:52 2014 +0100 French translation for release 1.7.15 --- news/fr/2014032101.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014032101.xml b/news/fr/2014032101.xml new file mode 100644 index 0000000..a659fd6 --- /dev/null +++ b/news/fr/2014032101.xml @@ -0,0 +1,14 @@ +<news> +<date>21 mars 2014</date> +<title>Sortie de Wine 1.7.15</title> +<body> + La version de développement 1.7.15 de Wine est disponible. + <a href="{$root}/announce/1.7.15">Nouveautés</a> de cette version : +<ul> + <li>Nouveau service Planificateur de tâches.</li> + <li>Un tas de corrections dans les tests de régression.</li> + <li>Prise en charge du déroulement d'exceptions dans VBScript.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.15.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.7.15 freigegeben
by Jeremy Newman March 24, 2014

March 24, 2014

Module: website Branch: master Commit: cb352798f48beb58177bd78488e6b556585c3595 URL: http://source.winehq.org/git/website.git/?a=commit;h=cb352798f48beb58177bd7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 22 15:40:32 2014 +0100 Wine 1.7.15 freigegeben --- news/de/2014032101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014032101.xml b/news/de/2014032101.xml new file mode 100644 index 0000000..4aaef8d --- /dev/null +++ b/news/de/2014032101.xml @@ -0,0 +1,15 @@ +<news> +<date>21. März 2014</date> +<title>Wine 1.7.15 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neuer Task Scheduler Dienst.</li> + <li>Viele Fehlerbehebungen an den Regressionstests.</li> + <li>Unterstützung für Exception Unwinding in VBScript.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.15.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.15
by Jeremy Newman March 24, 2014

March 24, 2014

Module: website Branch: master Commit: e91d8319e389bc6f6c4f52e604321bf14e993129 URL: http://source.winehq.org/git/website.git/?a=commit;h=e91d8319e389bc6f6c4f52… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Mar 22 11:32:30 2014 +0200 Ukrainian translation for release 1.7.15 --- news/uk/2014032101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2014032101.xml b/news/uk/2014032101.xml new file mode 100644 index 0000000..34f1b47 --- /dev/null +++ b/news/uk/2014032101.xml @@ -0,0 +1,15 @@ +<news> +<date>21 березня 2014</date> +<title>Випущено Wine 1.7.15</title> +<body> + Розробницький реліз Wine 1.7.15 наразі доступний. + <a href="{$root}/announce/1.7.15">Що нового</a> в цьому релізі: +<ul> + <li>Новий сервіс планувальника завдань.</li> + <li>Багато виправлень регресивного тестування.</li> + <li>Підтримка винятку розкручування в VBScript.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.15.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.15
by Jeremy Newman March 24, 2014

March 24, 2014

Module: website Branch: master Commit: d0e9f09cf958fe46bc13e3291dec3a42e2c95833 URL: http://source.winehq.org/git/website.git/?a=commit;h=d0e9f09cf958fe46bc13e3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 22 07:07:54 2014 +0100 Polish translation for release 1.7.15 --- news/pl/2014032101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014032101.xml b/news/pl/2014032101.xml new file mode 100644 index 0000000..9e38b79 --- /dev/null +++ b/news/pl/2014032101.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 21, 2014</date> +<title>Wydano Wine 1.7.15</title> +<body> + Wydanie rozwojowe Wine 1.7.15 jest już dostępne. + <a href="{$root}/announce/1.7.15">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa usługa Harmonogramu Zadań.</li> + <li>Wiele poprawek regresji.</li> + <li>Wsparcie dla odwijania wyjątków w VBScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.15.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.15
by Alexandre Julliard March 21, 2014

March 21, 2014

Module: website Branch: master Commit: bf6ae6a33991fcdb2bd97fdea0cda36cf51af721 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf6ae6a33991fcdb2bd97f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 22:45:12 2014 +0100 Wine release 1.7.15 --- news/en/2014032101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014032101.xml b/news/en/2014032101.xml new file mode 100644 index 0000000..0d13db7 --- /dev/null +++ b/news/en/2014032101.xml @@ -0,0 +1,15 @@ +<news> +<date>March 21, 2014</date> +<title>Wine 1.7.15 Released</title> +<body> + The Wine development release 1.7.15 is now available. + <a href="{$root}/announce/1.7.15">What's new</a> in this release: +<ul> + <li>New Task Scheduler service.</li> + <li>Many regression test fixes.</li> + <li>Support for exception unwinding in VBScript.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.15.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.15.
by Alexandre Julliard March 21, 2014

March 21, 2014

Module: wine Branch: master Commit: 3ea505bdea39d9c412120d6120c39067170cabc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea505bdea39d9c412120d612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 21 22:37:09 2014 +0100 Release 1.7.15. --- ANNOUNCE | 725 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 363 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ea505bdea39d9c412120…

1 0