December 2016 - Wine-commits

Andrew Eikum : mscoree: Leave the last backslash on application base path.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 0ea8893e1c3dd9097df083b57c0d7442c3fb4f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea8893e1c3dd9097df083b57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 16 14:50:30 2016 -0600 mscoree: Leave the last backslash on application base path. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 94eca7f..86eb759 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -170,7 +170,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf slash = strrchr(base_dirA, '\\'); if (slash) - *slash = 0; + *(slash + 1) = 0; TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); mono_domain_set_config(This->default_domain, base_dirA, config_pathA);

1 0

Lauri Kenttä : cmd: Fix memory leak in WCMD_reduce.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 21dd04670c1e2fa06bfc5bbb5b0c6f4537cde9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dd04670c1e2fa06bfc5bbb5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Dec 17 10:33:27 2016 +0200 cmd: Fix memory leak in WCMD_reduce. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cd319f8..f3dbe3a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3689,7 +3689,7 @@ static WCHAR WCMD_popoperator(OPSTACK **opstack) { * Returns non-zero on error. */ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { - OPSTACK *thisop; + WCHAR thisop; int var1,var2; int rc = 0; @@ -3699,13 +3699,12 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { } /* Remove the top operator */ - thisop = *opstack; - *opstack = (*opstack)->next; - WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop->op); + thisop = WCMD_popoperator(opstack); + WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop); /* One variable operators */ var1 = WCMD_popnumber(varstack); - switch (thisop->op) { + switch (thisop) { case '!': WCMD_pushnumber(NULL, !var1, varstack); break; case '~': WCMD_pushnumber(NULL, ~var1, varstack); @@ -3721,7 +3720,7 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { WINE_TRACE("No operands left for the reduce?\n"); return WCMD_NOOPERAND; } - switch (thisop->op) { + switch (thisop) { case '!': case '~': case OP_POSITIVE: @@ -3792,11 +3791,11 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { /* Make the operand stack grow by pushing the assign operator plus the operator to perform */ while (calcassignments[i].op != ' ' && - calcassignments[i].calculatedop != thisop->op) { + calcassignments[i].calculatedop != thisop) { i++; } if (calcassignments[i].calculatedop == ' ') { - WINE_ERR("Unexpected operator %c\n", thisop->op); + WINE_ERR("Unexpected operator %c\n", thisop); return WCMD_NOOPERATOR; } WCMD_pushoperator('=', WCMD_getprecedence('='), opstack); @@ -3820,10 +3819,9 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { break; } - default: WINE_ERR("Unrecognized operator %c\n", thisop->op); + default: WINE_ERR("Unrecognized operator %c\n", thisop); } - heap_free(thisop); return rc; }

1 0

Alexandre Julliard : Wine release 1.8.6
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: website Branch: master Commit: 65d1cc2fa6eeece6c930c10cefa6497154f841c1 URL: http://source.winehq.org/git/website.git/?a=commit;h=65d1cc2fa6eeece6c930c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:10:48 2016 +0100 Wine release 1.8.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016121901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2016121901.xml b/news/en/2016121901.xml new file mode 100644 index 0000000..5cb91c8 --- /dev/null +++ b/news/en/2016121901.xml @@ -0,0 +1,14 @@ +<news> +<date>December 19, 2016</date> +<title>Wine 1.8.6 Released</title> +<body> + The Wine maintenance release 1.8.6 is now available. + <a href="{$root}/announce/1.8.6">What's new</a> in this release: +<ul> + <li>Fix a regression introduced in 1.8.5 (#41627)</li> + <li>Various bug fixes.</li> + <li>A few more cards added to the GPU description table.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.6.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

Philipp Hoppermann : ws2_32: Implement InetNtopW.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: d65fd8fdfaf5f5adca04244d7c6b437e2e70f7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65fd8fdfaf5f5adca04244d7… Author: Philipp Hoppermann <plata(a)mailbox.org> Date: Sat Jul 23 01:21:23 2016 -0300 ws2_32: Implement InetNtopW. Signed-off-by: Philipp Hoppermann <plata(a)mailbox.org> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8397e3da735c87295d1ae71e3e1650be0c52d28c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 20 ++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 21 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6877063..7b63639 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7818,6 +7818,26 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) } /*********************************************************************** + * InetNtopW (WS2_32.@) + */ +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T len) +{ + char bufferA[WS_INET6_ADDRSTRLEN]; + PWSTR ret = NULL; + + TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); + + if (WS_inet_ntop(family, addr, bufferA, sizeof(bufferA))) + { + if (MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, len)) + ret = buffer; + else + SetLastError(ERROR_INVALID_PARAMETER); + } + return ret; +} + +/*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ INT WINAPI WSAStringToAddressA(LPSTR AddressString, diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 6de888f..24fb198 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -54,6 +54,7 @@ @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) +@ stdcall InetNtopW(long ptr ptr long) @ stdcall InetPtonW(long wstr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)

1 0

Michael Stefaniuc : Release 1.8.6.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 7b38d4f9efd899a68d754b83b1b396929549a973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b38d4f9efd899a68d754b83b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 30 01:32:54 2016 +0100 Release 1.8.6. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 320 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 157 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b38d4f9efd899a68d754…

1 0

Tag wine-1.8.6 : Alexandre Julliard : Release 1.8.6
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: refs/tags/wine-1.8.6 Tag: 909cacdbcdaa0c535e746145dd68eba83608fd87 URL: http://source.winehq.org/git/wine.git/?a=tag;h=909cacdbcdaa0c535e746145dd68… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 20:08:23 2016 +0100 Release 1.8.6

1 0

Bruno Jesus : comdlg32: Avoid crash when a path is passed into Open File Dialog.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 673bafaa7ad5c7c9f8b380739fb3601085a2a044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673bafaa7ad5c7c9f8b380739… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 27 06:53:27 2016 +0000 comdlg32: Avoid crash when a path is passed into Open File Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58091188929f9786b408912c991420f54f489f6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1453396..1b9ad43 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1564,10 +1564,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit); if (result) { - /* nameBit is always shorter than the original filename */ - lstrcpyW(fodInfos->filename,nameBit); + /* nameBit is always shorter than the original filename. It may be NULL + * when the filename contains only a drive name instead of file name */ + if (nameBit) + { + lstrcpyW(fodInfos->filename,nameBit); + *nameBit = 0x00; + } + else + *fodInfos->filename = '\0'; - *nameBit = 0x00; MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf);

1 0

Alistair Leslie-Hughes : comdlg32/tests: Test when a directory is passed to OpenFileName Dialog.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 5226773d53dbbdff8c51946fae0bdc234490d0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5226773d53dbbdff8c51946fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 27 06:53:39 2016 +0000 comdlg32/tests: Test when a directory is passed to OpenFileName Dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3126d9ca4c29737af1526ea8aae92a2dadf62665) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0a4c509..e14aa2f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1243,6 +1243,46 @@ static void test_null_filename(void) ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); } +static void test_directory_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + char szInitialDir[MAX_PATH] = {0}; + WCHAR szInitialDirW[MAX_PATH] = {0}; + DWORD ret; + + GetWindowsDirectoryA(szInitialDir, MAX_PATH); + GetWindowsDirectoryW(szInitialDirW, MAX_PATH); + + szInitialDir[strlen(szInitialDir)] = '\\'; + szInitialDirW[lstrlenW(szInitialDirW)] = '\\'; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = szInitialDir; + ofnA.nMaxFile = MAX_PATH; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = szInitialDirW; + ofnW.nMaxFile = MAX_PATH; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1256,4 +1296,5 @@ START_TEST(filedlg) if( resizesupported) test_resizable2(); test_extension(); test_null_filename(); + test_directory_filename(); }

1 0

Alistair Leslie-Hughes : dpnet: Header files cleanup.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 0b1c912060613b44782fe5d11941b646b59e3305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1c912060613b44782fe5d11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 15 06:59:13 2016 +0000 dpnet: Header files cleanup. Stops error of SOCKADDR being redefined on older compilers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cd33bf892f3a7599f37dba64b1046f22b95af6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/address.c | 1 - dlls/dpnet/client.c | 1 - dlls/dpnet/lobbiedapp.c | 2 -- dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - dlls/dpnet/threadpool.c | 1 - include/dpaddr.h | 2 ++ 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d87d4e7..e6b82fd 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -33,7 +33,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index bf2b8d2..765a1bc 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -31,7 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..c7b49b9 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -31,8 +31,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" -#include "dplobby8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index a07a59a..f0a6467 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 3e026fc..65128b4 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -32,7 +32,6 @@ #include "ocidl.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" typedef struct IDirectPlay8ServerImpl diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 274789d..9e13ffb 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "wine/debug.h" -#include "dplay8.h" #include "dpnet_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnet); diff --git a/include/dpaddr.h b/include/dpaddr.h index 576caaf..d47dd26 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -27,7 +27,9 @@ extern "C" { #endif /* defined(__cplusplus) */ typedef REFIID DPNAREFIID; +#ifndef _WINSOCK2API_ typedef struct sockaddr SOCKADDR; +#endif /***************************************************************************** * DirectPlay8Addr defines

1 0

Bernhard Übelacker : ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: 7a09ac7f94fb7fbb07fa6359cd406daa48d38d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a09ac7f94fb7fbb07fa6359c… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Mar 29 22:13:16 2016 +0200 ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64aec5d8dbae329958b9b677d3289de78142e289) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 904d66a..1a5fe11 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { SIZE_T size; PIRP irp; + CCHAR loc_count = stack_size; TRACE( "%d, %d\n", stack_size, charge_quota ); - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + if (loc_count < 8 && loc_count != 1) + loc_count = 8; + + size = sizeof(IRP) + loc_count * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); if (irp == NULL) return NULL; IoInitializeIrp( irp, size, stack_size ); - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (stack_size >= 1 && stack_size <= 8) + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; return irp;

1 0