August 2016 - Wine-Commits - list.winehq.org

Keno Fischer : preloader: Add proper CFI instructions to _start functions.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 5f38bfed7cf408c1734d6bff8770c3b11edc665f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f38bfed7cf408c1734d6bff8… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Thu Aug 11 15:04:39 2016 -0400 preloader: Add proper CFI instructions to _start functions. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index db0e998..7cf2946 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -212,6 +212,7 @@ struct void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, + __ASM_CFI("\t.cfi_undefined %eip\n") "\tmovl $243,%eax\n" /* SYS_set_thread_area */ "\tmovl $thread_ldt,%ebx\n" "\tint $0x80\n" /* allocate gs segment */ @@ -363,6 +364,7 @@ void *thread_data[256]; void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, + __ASM_CFI(".cfi_undefined %rip\n\t") "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ "movq %rax,(%rsp)\n\t" /* orig stack pointer */

1 0

Hans Leidekker : webservices: Write the envelope in WsInitializeMessage.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 202bc2a77fcdc75a57260c15d0f36511c7f97833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202bc2a77fcdc75a57260c15d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:32 2016 +0200 webservices: Write the envelope in WsInitializeMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ecbc31d..904d490 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -198,30 +198,6 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M } /************************************************************************** - * WsInitializeMessage [webservices.@] - */ -HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, - WS_MESSAGE *src_handle, WS_ERROR *error ) -{ - struct msg *msg = (struct msg *)handle; - - TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); - if (error) FIXME( "ignoring error parameter\n" ); - if (src_handle) - { - FIXME( "src message not supported\n" ); - return E_NOTIMPL; - } - - if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; - if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; - - msg->init = init; - msg->state = WS_MESSAGE_STATE_INITIALIZED; - return S_OK; -} - -/************************************************************************** * WsFreeMessage [webservices.@] */ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) @@ -555,6 +531,30 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de return hr; } +/************************************************************************** + * WsInitializeMessage [webservices.@] + */ +HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, + WS_MESSAGE *src_handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (src_handle) + { + FIXME( "src message not supported\n" ); + return E_NOTIMPL; + } + + if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; + if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + msg->init = init; + msg->state = WS_MESSAGE_STATE_INITIALIZED; + return write_envelope( msg ); +} + static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len ) { text->text.textType = WS_XML_TEXT_TYPE_UTF8;

1 0

Bruno Jesus : winejoystick.drv: Don' t assume the first joystick is at the first device on Linux.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 62876f3fc5feb1ca23d27a6de5adca580d963d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62876f3fc5feb1ca23d27a6de… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:01:48 2016 -0300 winejoystick.drv: Don't assume the first joystick is at the first device on Linux. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 35 ++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index b8fda4f..289e728 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -126,6 +126,7 @@ LRESULT driver_open(LPSTR str, DWORD dwIntf) return 0; JSTCK_Data[dwIntf].joyIntf = dwIntf; + JSTCK_Data[dwIntf].dev = -1; JSTCK_Data[dwIntf].in_use = TRUE; return (LRESULT)&JSTCK_Data[dwIntf]; } @@ -160,25 +161,43 @@ struct js_status */ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { - char buf[20]; - int flags; + char buf[20]; + int flags, fd, found_ix, i; if (jstick->dev > 0) return jstick->dev; - sprintf(buf, JOYDEV_NEW, jstick->joyIntf); #ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; #else flags = O_RDONLY; #endif - if ((jstick->dev = open(buf, flags)) < 0) { - sprintf(buf, JOYDEV_OLD, jstick->joyIntf); - if ((jstick->dev = open(buf, flags)) < 0) - return jstick->dev; + + /* The first joystick may not be at /dev/input/js0, find the correct + * first or second device. For example the driver for XBOX 360 wireless + * receiver creates entries starting at 20. + */ + for (found_ix = i = 0; i < MAXJOYSTICK; i++) { + sprintf(buf, JOYDEV_NEW, i); + if ((fd = open(buf, flags)) < 0) { + sprintf(buf, JOYDEV_OLD, i); + if ((fd = open(buf, flags)) < 0) + continue; + } + + if (found_ix++ == jstick->joyIntf) + { + TRACE("Found joystick[%d] at %s\n", jstick->joyIntf, buf); + jstick->dev = fd; + break; + } + + close(fd); } + #ifdef HAVE_LINUX_22_JOYSTICK_API - ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); + if (jstick->dev > 0) + ioctl(jstick->dev, JSIOCGAXMAP, jstick->axesMap); #endif return jstick->dev; }

1 0

Peter Beutner : kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: c90e46b66ded518dbfb88f1efdc366e7986defb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90e46b66ded518dbfb88f1ef… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:50 2016 +0200 kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 27 ++------------------------- dlls/kernel32/tests/path.c | 10 ---------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 620401d..eadd2e7 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -335,23 +335,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) - { - /* strip double delimiters */ - tmplongpath[lp++] = shortpath[sp]; - } + tmplongpath[lp++] = shortpath[sp++]; tmplongpath[lp] = 0; /* terminate string */ - sp++; continue; } p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - sp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); @@ -498,24 +487,12 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) - { - /* strip double delimiters */ - tmpshortpath[sp] = longpath[lp]; - sp++; - } + tmpshortpath[sp++] = longpath[lp++]; tmpshortpath[sp] = 0; /* terminate string */ - lp++; continue; } p = longpath + lp; - if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmpshortpath[sp++] = *p++; - tmpshortpath[sp++] = *p++; - lp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 764141d..7eb9e75 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -949,31 +949,23 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* test double delimiters */ sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); - todo_wine - { ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } if (pGetLongPathNameA) { sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); - todo_wine - { ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } } } @@ -2204,12 +2196,10 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Andrew Eikum : Revert "dsound: Allow inactive devices to change the primary format.".
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: b25e1aefc7b868266042f842955a001618ef3b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25e1aefc7b868266042f8429… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 15 09:02:36 2016 -0500 Revert "dsound: Allow inactive devices to change the primary format.". This reverts commit 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 830764a..f9720f8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -478,30 +478,35 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + if (device->priolevel == DSSCL_WRITEPRIMARY) { + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } - if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; + if (FAILED(err)) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; + } else + HeapFree(GetProcessHeap(), 0, old_fmt); } else { - /* ignore failures */ - err = S_OK; - HeapFree(GetProcessHeap(), 0, old_fmt); + WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); + if (wfx) { + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = wfx; + } else + err = DSERR_OUTOFMEMORY; } out:

1 0

Benjamin Hodgetts : wined3d: Add Nvidia 1XXX range to detection list.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 9dff8b75e6ed4da1780e324951256e2593b4c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dff8b75e6ed4da1780e32495… Author: Benjamin Hodgetts <ben(a)xnode.org> Date: Thu Aug 11 22:58:03 2016 +0100 wined3d: Add Nvidia 1XXX range to detection list. Signed-off-by: Benjamin Hodgetts <ben(a)xnode.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9da237d..50fb50d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1312,6 +1312,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1767,6 +1770,9 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ + {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ + {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7883951..fc8c397 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1953,6 +1953,9 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, + CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, + CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, + CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Peter Beutner : kernel32/tests: Add path tests for double delimiters.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 1fe0b84ffc26fab222195b4a451cfda0ff0e9555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe0b84ffc26fab222195b4a4… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:49 2016 +0200 kernel32/tests: Add path tests for double delimiters. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 6520513..764141d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -945,6 +945,36 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) test_ShortPathCase(curdir,SHORTDIR,LONGFILE); test_ShortPathCase(curdir,LONGDIR,SHORTFILE); test_ShortPathCase(curdir,LONGDIR,LONGFILE); + + /* test double delimiters */ + sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); + todo_wine + { + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + todo_wine + { + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + } } static void test_GetTempPathA(char* tmp_dir) @@ -2170,6 +2200,18 @@ static void test_relative_path(void) ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + /* test double delimiters */ + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo");

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 596ca595d87c2bcb3fe0f7f67f822d3af141b2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=596ca595d87c2bcb3fe0f7f67… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 15 09:19:13 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fb5edbc..a275db9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -856,6 +856,31 @@ static void test_import(void) test_import_str("REGEDIT4 FOO\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); + test_import_str("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -863,6 +888,30 @@ static void test_import(void) test_import_str("Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + /* Test file contents - Unicode */ test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */,

1 0

Nikolay Sivov : msvcirt/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 67d7690e5303e7d9b1f2ee78a63022cd721210a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d7690e5303e7d9b1f2ee78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 10:14:50 2016 +0300 msvcirt/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67d7690e5303e7d9b1f2e…

1 0

Daniel Lehman : msvcr120: Add lgamma.
by Alexandre Julliard Aug. 15, 2016

Aug. 15, 2016

Module: wine Branch: master Commit: 28a54059683a3a01028f4ecf7d922e4b7c8b04f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a54059683a3a01028f4ecf7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 17 14:49:32 2016 -0700 msvcr120: Add lgamma. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure b/configure index bf4d1a7..dccacb4 100755 --- a/configure +++ b/configure @@ -16935,6 +16935,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/configure.ac b/configure.ac index 0fad32f..3a24aab 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,6 +2527,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 05a0ac0..f886b97 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -258,9 +258,9 @@ @ stub ilogbf @ stub ilogbl @ cdecl ldexp(double long) ucrtbase.ldexp -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) ucrtbase.lgamma +@ cdecl lgammaf(float) ucrtbase.lgammaf +@ cdecl lgammal(double) ucrtbase.lgammal @ cdecl -ret64 llrint(double) ucrtbase.llrint @ cdecl -ret64 llrintf(float) ucrtbase.llrintf @ cdecl -ret64 llrintl(double) ucrtbase.llrintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f65d150..953cdba 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2243,9 +2243,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index de68b87..c88cde0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1906,9 +1906,9 @@ @ cdecl labs(long) msvcr120.labs @ cdecl ldexp(double long) msvcr120.ldexp @ cdecl ldiv(long long) msvcr120.ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) msvcr120.lgamma +@ cdecl lgammaf(float) msvcr120.lgammaf +@ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs @ stub lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index cf33f01..e87151a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2843,3 +2843,37 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) { return MSVCR120_remainder(x, y); } + +/********************************************************************* + * lgamma (MSVCR120.@) + */ +double CDECL MSVCR120_lgamma(double x) +{ +#ifdef HAVE_LGAMMA + return lgamma(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * lgammaf (MSVCR120.@) + */ +float CDECL MSVCR120_lgammaf(float x) +{ +#ifdef HAVE_LGAMMAF + return lgammaf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * lgammal (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) +{ + return MSVCR120_lgamma(x); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb18d4f..ed985d2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2377,9 +2377,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/include/config.h.in b/include/config.h.in index 6acafca..382beb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -351,6 +351,12 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL +/* Define to 1 if you have the `lgamma' function. */ +#undef HAVE_LGAMMA + +/* Define to 1 if you have the `lgammaf' function. */ +#undef HAVE_LGAMMAF + /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO

1 0