January 2018 - Wine-Commits

Dmitry Timoshkov : include: MICROSOFT_KERBEROS_NAME_A definition should be available regardless of UNICODE.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 943f0d38ec54c5205bf5e5b85c66b3908a159109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=943f0d38ec54c5205bf5e5b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:50:56 2018 +0800 include: MICROSOFT_KERBEROS_NAME_A definition should be available regardless of UNICODE. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntsecapi.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 36357c6..d0339a9 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -340,7 +340,7 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS PolicyNotifyMachineAccountPasswordInformation } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; -#ifdef UNICODE +#define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos" #elif defined(__GNUC__) @@ -348,9 +348,6 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS #else /* _MSC_VER/__GNUC__ */ static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif -#else /* UNICODE */ -#define MICROSOFT_KERBEROS_NAME_A "Kerberos" -#endif #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040

1 0

Dmitry Timoshkov : include: Fix the LSA_SEC_HANDLE definition.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 71891091483b248e7505728ec3d0889a10e3a9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=71891091483b248e7505728e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:50:48 2018 +0800 include: Fix the LSA_SEC_HANDLE definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntsecpkg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 0df345d..9378826 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -165,7 +165,7 @@ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, /* misc typedefs used in the below prototypes */ typedef PVOID *PLSA_CLIENT_REQUEST; -typedef ULONG LSA_SEC_HANDLE, *PLSA_SEC_HANDLE; +typedef ULONG_PTR LSA_SEC_HANDLE, *PLSA_SEC_HANDLE; typedef LPTHREAD_START_ROUTINE SEC_THREAD_START; typedef PSECURITY_ATTRIBUTES SEC_ATTRS;

1 0

Gijs Vermeulen : compobj.dll16: Add StringFromIID.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 85820f5e402eea8f78eba9390dae35f60f278891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85820f5e402eea8f78eba939… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jan 14 23:47:36 2018 +0100 compobj.dll16: Add StringFromIID. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 1 + dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index af69bf8..4eddace 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -434,6 +434,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { /****************************************************************************** * StringFromCLSID [COMPOBJ.19] + * StringFromIID [COMPOBJ.14] * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 71dba80..2ef011f 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -11,7 +11,7 @@ 11 stub COFREELIBRARY 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 -14 stub STRINGFROMIID +14 pascal StringFromIID(ptr ptr) StringFromCLSID16 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries16

1 0

Huw Davies : winebrowser: Fix calling convention for wine_get_unix_file_name().
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: f4e75d780b9b662d6b0b7a845c3a1f1b8ae5dacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e75d780b9b662d6b0b7a84… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 18 09:44:41 2018 +0000 winebrowser: Fix calling convention for wine_get_unix_file_name(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 304ac14..b1c49e7 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); -typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); +typedef LPSTR (*CDECL wine_get_unix_file_name_t)(LPCWSTR unixname); static const WCHAR browser_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\',

1 0

Thomas Faber : ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 42f742e1be8a4f3b26ed3d1a343f17fe55cbf322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f742e1be8a4f3b26ed3d1a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jan 16 19:19:34 2018 +0100 ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68..b978438 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1453,8 +1453,11 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + WCHAR **new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, + 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE;

1 0

Zebediah Figura : winedbg/gdbproxy: Replace memory read over a breakpoint with the real value.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: eb63a5f3c3c1851f212bd14f91da329bf3166e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb63a5f3c3c1851f212bd14f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:15 2018 -0600 winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Normally, when we hit a breakpoint, we remove it before stopping and add it after continuing. gdb, however, reads the process memory before requesting that the breakpoint be removed, and apparently caches it until the `stepi` instruction is executed; as a result, it thinks that the interrupt byte that is present in the code is an actual interrupt and not a breakpoint, and so tries to step over it as one byte instead of executing the real instruction at that location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c02ad3b..7b9a476 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1568,6 +1568,28 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } +static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) +{ + /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ + + BOOL ret; + + ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); + if (ret) + { + struct gdb_ctx_Xpoint *xpt; + + for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) + { + char *xpt_addr = xpt->addr; + + if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + buffer[xpt_addr - addr] = xpt->val; + } + } + return ret; +} + static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1584,8 +1606,7 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, &r) || - r == 0) + if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT);

1 0

Julian Rüger : German translation for release 3.0
by Jeremy Newman Jan. 19, 2018

Jan. 19, 2018

Module: website Branch: master Commit: 264de3ebb57cbf91dfb37d32bb6c391e012cd039 URL: https://source.winehq.org/git/website.git/?a=commit;h=264de3ebb57cbf91dfb37… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jan 19 14:27:13 2018 +0100 German translation for release 3.0 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018011801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018011801.xml b/news/de/2018011801.xml new file mode 100644 index 0000000..d34a420 --- /dev/null +++ b/news/de/2018011801.xml @@ -0,0 +1,16 @@ +<news> +<date>18. Januar 2018</date> +<title>Wine 3.0 freigegeben</title> +<body> +Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 3.0 verfügbar ist. +Dieses Release verkörpert den Entwicklungsaufwand eines Jahres und über 6.000 individuellen Änderungen. Enthalten sind eine große Zahl an Verbesserungen, welche in den <a href="{$root}/announce/3.0">Release Notes (en)</a> aufgeführt sind. Die Höhepunkte sind: +<ul> + <li>Unterstützung von Direct3D 10 und 11.</li> + <li>Der Direct3D-Command-Stream.</li> + <li>Der Android-Grafiktreiber.</li> + <li>Verbesserte DirectWrite- und Direct2D-Unterstützung.</li> +</ul> +Aufgrund des jährlichen Releasezeitplans wurden erneut einige Features, an denen noch gearbeitet wird, auf den nächsten Entwicklungszyklus vertagt. Darunter sind insbesondere die Unterstützung von Direct3D 12 und Vulkan, sowie von OpenGL ES, welche Direct3D unter Android ermöglicht. +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">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

Alexandre Julliard : Clean up 3.0 announcement formatting.
by Alexandre Julliard Jan. 18, 2018

Jan. 18, 2018

Module: website Branch: master Commit: d38e511414679ba0955625c92c1345887c5acfbf URL: https://source.winehq.org/git/website.git/?a=commit;h=d38e511414679ba095562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 16:59:08 2018 +0100 Clean up 3.0 announcement formatting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018011801.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/news/en/2018011801.xml b/news/en/2018011801.xml index b4f60c6..06d4d52 100644 --- a/news/en/2018011801.xml +++ b/news/en/2018011801.xml @@ -3,9 +3,14 @@ <title>Wine 3.0 Released</title> <body> The Wine team is proud to announce that the stable release Wine 3.0 is now available. - This release represents a year of development effort and over 6,000 individual changes. It contains a large number of improvements that are listed in the release notes below. The main highlights are: - - Direct3D 10 and 11 support. - The Direct3D command stream. - The Android graphics driver. - Improved DirectWrite and Direct2D support. + This release represents a year of development effort and over 6,000 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/3.0">release notes</a>. The main highlights are: +<ul> + <li>Direct3D 10 and 11 support.</li> + <li>The Direct3D command stream.</li> + <li>The Android graphics driver.</li> + <li>Improved DirectWrite and Direct2D support.</li> +</ul> Once again, because of the annual release schedule, a number of features that are being worked on have been deferred to the next development cycle. This includes in particular Direct3D 12 and Vulkan support, as well as OpenGL ES support to enable Direct3D on Android. -The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">available now</a>. +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">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 : Wine release 3.0
by Alexandre Julliard Jan. 18, 2018

Jan. 18, 2018

Module: website Branch: master Commit: ef8e059cde4b0e461f33f40ef1e78cec070dd7c6 URL: https://source.winehq.org/git/website.git/?a=commit;h=ef8e059cde4b0e461f33f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 16:41:31 2018 +0100 Wine release 3.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018011801.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/en/2018011801.xml b/news/en/2018011801.xml new file mode 100644 index 0000000..b4f60c6 --- /dev/null +++ b/news/en/2018011801.xml @@ -0,0 +1,11 @@ +<news> +<date>January 18, 2018</date> +<title>Wine 3.0 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 3.0 is now available. + This release represents a year of development effort and over 6,000 individual changes. It contains a large number of improvements that are listed in the release notes below. The main highlights are: + - Direct3D 10 and 11 support. - The Direct3D command stream. - The Android graphics driver. - Improved DirectWrite and Direct2D support. + Once again, because of the annual release schedule, a number of features that are being worked on have been deferred to the next development cycle. This includes in particular Direct3D 12 and Vulkan support, as well as OpenGL ES support to enable Direct3D on Android. +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">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 : ntdll: Avoid the strd ARM instruction.
by Alexandre Julliard Jan. 18, 2018

Jan. 18, 2018

Module: wine Branch: master Commit: 3e26caf0d85caa4256edb011a6311e00cf893e3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e26caf0d85caa4256edb011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 17 09:35:12 2018 +0100 ntdll: Avoid the strd ARM instruction. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index a0c3cb1..22ce172 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -594,7 +594,8 @@ __ASM_GLOBAL_FUNC( relay_call, "mov r5, r1\n\t" "mov r0, r7\n\t" "mov r1, r8\n\t" - "strd r4, [sp]\n\t" + "str r4, [sp]\n\t" + "str r5, [sp, #4]\n\t" #ifndef __SOFTFP__ "vstr d0, [sp, #8]\n\t" /* preserve floating point retval */ "bl " __ASM_NAME("relay_trace_exit") "\n\t"

1 0