January 2014 - Wine-Commits

Ken Thomases : winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 64e939c2d41d3245b8b782b1ef105404cd5a093d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e939c2d41d3245b8b782b1e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 16:52:07 2013 -0600 winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations. (cherry picked from commit f6a8c5b50e9562ffea41dfbfe6749b21d4acdb5a) --- dlls/winemac.drv/window.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9007610..d2bacfa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -137,7 +137,11 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT struct macdrv_window_features wf; get_cocoa_window_features(data, style, ex_style, &wf); - if (wf.title_bar) style_mask |= WS_CAPTION; + if (wf.title_bar) + { + style_mask |= WS_CAPTION; + ex_style_mask |= WS_EX_TOOLWINDOW; + } if (wf.shadow) { style_mask |= WS_DLGFRAME | WS_THICKFRAME;

1 0

Qian Hong : msi: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 262db8f8fc4aa7c8f60f24609f582ca1763994cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=262db8f8fc4aa7c8f60f24609… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 13 19:51:51 2013 +0800 msi: Get extension name by strrchrW instead of strchrW. (cherry picked from commit 9612ed1ba64b1067ce9e1b17306b0ca490f711d7) --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d964787..cd5230a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3839,7 +3839,7 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) filename = msi_dup_record_field( row, 3 ); msi_reduce_to_long_filename( filename ); - extension = strchrW( filename, '.' ); + extension = strrchrW( filename, '.' ); if (!extension || strcmpiW( extension, szlnk )) { int len = strlenW( filename );

1 0

Hans Leidekker : advapi32: Forward LogonUserA to LogonUserW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: aba364a256d85e399d4a5e75922bc09693df5a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba364a256d85e399d4a5e759… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:32:55 2013 +0100 advapi32: Forward LogonUserA to LogonUserW. (cherry picked from commit 7519cddddbe602c57caa078b88396e5654d68c38) --- dlls/advapi32/advapi.c | 19 +++++++++++++++++-- dlls/advapi32/advapi32_misc.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 860c728..884b5d1 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -35,6 +35,8 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "advapi32_misc.h" + WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** @@ -268,10 +270,23 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { - FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_a(lpszUsername), + WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL; + BOOL ret = FALSE; + + TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername), debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); - return TRUE; + if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE; + if (lpszDomain && !(domainW = strdupAW( lpszUsername ))) goto done; + if (lpszPassword && !(passwordW = strdupAW( lpszPassword ))) goto done; + + ret = LogonUserW( usernameW, domainW, passwordW, dwLogonType, dwLogonProvider, phToken ); + +done: + heap_free( usernameW ); + heap_free( domainW ); + heap_free( passwordW ); + return ret; } BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword, diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index ace73f1..9dd48b8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -22,6 +22,7 @@ #include "ntsecapi.h" #include "winsvc.h" +#include "winnls.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -52,4 +53,15 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + #endif /* __WINE_ADVAPI32MISC_H */

1 0

Hans Leidekker : mlang: Improve IMLangLineBreakConsole:: BreakLineA for the ASCII codepage.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 791b047b9f864b64f2a56196b26da08d50e62573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b047b9f864b64f2a56196b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 10:59:23 2013 +0100 mlang: Improve IMLangLineBreakConsole::BreakLineA for the ASCII codepage. (cherry picked from commit 8c08faba490d821c61033eaec606e8862fe0964b) --- dlls/mlang/mlang.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d28f811..72c136d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -36,6 +36,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "mlang.h" +#include "mimeole.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -44,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #include "initguid.h" -#define CP_UNICODE 1200 - static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); @@ -3484,10 +3483,28 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( LONG* pcchLine, LONG* pcchSkip) { + LONG i, line = cchSrc, skip = 0; + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); - *pcchLine = cchSrc; - *pcchSkip = 0; + if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) + { + for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--) + { + if (pszSrc[i] == ' ') + { + while (i >= 0 && pszSrc[i] == ' ') + { + i--; + line--; + skip++; + } + break; + } + } + } + *pcchLine = line; + *pcchSkip = skip; return S_OK; }

1 0

Daniel Lehman : msvcrt: Return wall-clock time from clock().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ed8357ee890e359fb3660cd1b39a31ec353a1af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8357ee890e359fb3660cd1b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 27 16:42:53 2011 -0700 msvcrt: Return wall-clock time from clock(). (cherry picked from commit 15b35f4d37e4bdd8d2b44b772e800a8ffade7ab6) --- dlls/msvcrt/time.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4c21380..11a5df9 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -30,6 +30,7 @@ #include "mtdll.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -709,19 +710,23 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size) */ MSVCRT_clock_t CDECL MSVCRT_clock(void) { - FILETIME ftc, fte, ftk, ftu; - ULONGLONG utime, ktime; - - MSVCRT_clock_t clock; + static LONGLONG start_time; + LARGE_INTEGER systime; - GetProcessTimes(GetCurrentProcess(), &ftc, &fte, &ftk, &ftu); + if(!start_time) { + KERNEL_USER_TIMES pti; - ktime = ((ULONGLONG)ftk.dwHighDateTime << 32) | ftk.dwLowDateTime; - utime = ((ULONGLONG)ftu.dwHighDateTime << 32) | ftu.dwLowDateTime; - - clock = (utime + ktime) / (TICKSPERSEC / MSVCRT_CLOCKS_PER_SEC); + /* while Linux's clock returns user time, Windows' clock + * returns wall-clock time from process start. cache the + * process start time since it won't change and to avoid + * wineserver round-trip overhead */ + if(NtQueryInformationProcess(GetCurrentProcess(), ProcessTimes, &pti, sizeof(pti), NULL)) + return -1; + start_time = pti.CreateTime.QuadPart; + } - return clock; + NtQuerySystemTime(&systime); + return (systime.QuadPart - start_time) * MSVCRT_CLOCKS_PER_SEC / TICKSPERSEC; } /*********************************************************************

1 0

Nikolay Sivov : scrrun: Implement BuildPath method.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9d26384beb0a2f80a9b766a01e220013cece3899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d26384beb0a2f80a9b766a01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 11:49:53 2013 +0400 scrrun: Implement BuildPath method. (cherry picked from commit 70bb23a9acc6abb73005dc221c65c9c682a2d868) --- dlls/scrrun/filesystem.c | 57 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4f0b163..5b94e8f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -713,11 +713,62 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * } static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, - BSTR Name, BSTR *pbstrResult) + BSTR Name, BSTR *Result) { - FIXME("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), pbstrResult); + BSTR ret; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + ret[path_len] = 0; + strcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + static const WCHAR bsW[] = {'\\',0}; + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + strcpyW(ret, Path); + if (Path[path_len-1] != ':') + strcatW(ret, bsW); + strcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + strcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path,

1 0

Rico Schüller : shell32: Use lParam for BFFM_SETOKTEXT.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: fbdeeaa57f28850ddac2068e72f95fbe04cda09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdeeaa57f28850ddac2068e7… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 22 10:35:44 2013 +0100 shell32: Use lParam for BFFM_SETOKTEXT. (cherry picked from commit 5f15a5633c338352aed17474eaa9acec2fe07a1d) --- dlls/shell32/brsfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index a14c172..a849682 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1027,8 +1027,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETOKTEXT: /* unicode only */ - TRACE("Set OK text %s\n", debugstr_w((LPWSTR)wParam)); - SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)wParam); + TRACE("Set OK text %s\n", debugstr_w((LPWSTR)lParam)); + SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)lParam); break; case BFFM_SETSELECTIONA:

1 0

Ken Thomases : winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window 's bounds.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 33b077477ac8d875ef7fa56fbb91349741202000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b077477ac8d875ef7fa56fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 15:35:37 2013 -0600 winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window's bounds. That fails with the dread "invalid drawable" message. (cherry picked from commit 682ed91017e6aa043feaf0c70a34118445e65d1e) --- dlls/winemac.drv/cocoa_opengl.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index b678cae..45799db 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,14 +123,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL windowHasDevice; + __block BOOL viewIsValidDrawable; macdrv_add_view_opengl_context(v, c); OnMainThread(^{ - windowHasDevice = [[view window] windowNumber] > 0; + viewIsValidDrawable = [[view window] windowNumber] > 0 && + !NSIsEmptyRect([view visibleRect]); }); - if (windowHasDevice) + if (viewIsValidDrawable) { [context setView:view]; [context setLatentView:nil];

1 0

Vitaly Lipatov : ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 47913a59a9880b2cf87b82a442947091a1fe0847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47913a59a9880b2cf87b82a44… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Nov 18 19:00:10 2013 +0400 ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode. (cherry picked from commit 6ceb5644083bee2f26c87634dfc3ba86e771a01e) --- programs/ipconfig/ipconfig.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 30e50fd..11ff56b 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -186,8 +186,12 @@ static void print_basic_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + if (addr->Address.lpSockaddr->sa_family == AF_INET && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); + else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + print_field(STRING_IP6_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ }

1 0

Vincent Povirk : explorer: Use StrRetToStrW to convert STRRET result.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1619a7efd90c73536f54720ef3053f75033961ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1619a7efd90c73536f54720ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 14:50:51 2013 -0500 explorer: Use StrRetToStrW to convert STRRET result. (cherry picked from commit cd1abd68c3bd48267f96403e9ed937e1a11911db) --- programs/explorer/explorer.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1df781c..d01a3c3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -118,20 +118,13 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag HICON icon; strret.uType=STRRET_WSTR; hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + if(SUCCEEDED(hres)) + hres = StrRetToStrW(&strret, pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - switch(strret.uType) - { - case STRRET_WSTR: - item->pszText = strret.u.pOleStr; - break; - default: - WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType); - break; - } hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, &reserved,(void**)&extract_icon); if(SUCCEEDED(hres))

1 0