July 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : winhttp/tests: Include winsock2.h before other headers.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 97d8ae9e7edd3892731a2be00891891b409fff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d8ae9e7edd3892731a2be00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:10:33 2014 +0200 winhttp/tests: Include winsock2.h before other headers. --- dlls/winhttp/tests/winhttp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 354f46f..6a2d8c6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -20,9 +20,7 @@ #define COBJMACROS #include <stdarg.h> -#include <stdlib.h> #include <windef.h> -#include <winbase.h> #include <winsock2.h> #include <ws2tcpip.h> #include <winhttp.h>

1 0

Alexandre Julliard : loader: Avoid ELF32_ST_INFO macro that is missing on Android.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 8b4ed00b59397c4d8658ff588c058feaa233e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4ed00b59397c4d8658ff588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:34:39 2014 +0200 loader: Avoid ELF32_ST_INFO macro that is missing on Android. --- loader/preloader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index f38e17a..25aaacd 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -999,7 +999,8 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int do { if ((chains[idx] & ~1u) == (hash & ~1u) && - symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; } while (!(chains[idx++] & 1u)); @@ -1011,9 +1012,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int const Elf32_Word *buckets = hashtab + 2; const Elf32_Word *chains = buckets + nbuckets; - for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) { - if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; }

1 0

Alexandre Julliard : ntdll: Define arch_prctl since it is missing on Android.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: d7f6f8ee6cec032fb375cb53182436de0500208c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f6f8ee6cec032fb375cb531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:43:33 2014 +0200 ntdll: Define arch_prctl since it is missing on Android. --- dlls/ntdll/signal_x86_64.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5658537..05581c2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -38,6 +38,13 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif +#ifdef HAVE_SYSCALL_H +# include <syscall.h> +#else +# ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +# endif +#endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif @@ -131,7 +138,7 @@ struct MSVCRT_JUMP_BUFFER #ifdef linux #include <asm/prctl.h> -extern int arch_prctl(int func, void *ptr); +static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } #define RAX_sig(context) ((context)->uc_mcontext.gregs[REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.gregs[REG_RBX])

1 0

Alexandre Julliard : scrrun/tests: Allow the drive total size to fit into an int.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: b27735e807043b6e24af971f74237b9e58aa75d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27735e807043b6e24af971f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 21:13:43 2014 +0200 scrrun/tests: Allow the drive total size to fit into an int. --- dlls/scrrun/tests/filesystem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6042241..faa0b0c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1289,8 +1289,11 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size);

1 0

Daniel Lehman : cryptnet: Continue checking the revocation urls if one is offline.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 3be7f3079c125155388c21d3072263a16cc7c4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7f3079c125155388c21d30… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 23 13:08:34 2014 -0700 cryptnet: Continue checking the revocation urls if one is offline. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3986f0f..df9eb49 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1553,7 +1553,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext( endTime = timeout = 0; if (!ret) error = GetLastError(); - for (j = 0; !error && j < urlArray->cUrl; j++) + /* continue looping if one was offline; break if revoked or timed out */ + for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl;

1 0

Nikolay Sivov : t2embed: Added TTDeleteEmbeddedFont() stub.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: c27e5ca511d65dfd1a516430676ef9b77fdccd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27e5ca511d65dfd1a5164306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 24 08:27:33 2014 +0400 t2embed: Added TTDeleteEmbeddedFont() stub. --- dlls/t2embed/main.c | 6 ++++++ dlls/t2embed/t2embed.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e92c49c..e1a880d 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -84,3 +84,9 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) if (enabled) *enabled = FALSE; return E_API_NOTIMPL; } + +LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) +{ + FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 120eaaa..e3be15c 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -1,22 +1,22 @@ @ stub TTCharToUnicode -@ stub TTDeleteEmbeddedFont -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @ stub _TTDeleteEmbeddedFont(a)12 -@ stdcall _TTEmbedFont(a)44(ptr long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont +@ stdcall _TTEmbedFont(a)44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA(a)52 @ stub _TTEnableEmbeddingForFacename(a)8 @ stub _TTGetEmbeddedFontInfo(a)28 -@ stdcall _TTGetEmbeddingType(a)8(ptr ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled(a)8(ptr ptr) TTIsEmbeddingEnabled +@ stdcall _TTGetEmbeddingType(a)8(long ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled(a)8(long ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename(a)8 @ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8

1 0

Alexandre Julliard : libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 8478cece692c1498e361388783f515f03c9ca71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8478cece692c1498e36138878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:24:49 2014 +0200 libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment. --- libs/wine/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5c0192d..c2290df 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -873,6 +873,12 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); setenv( var, val, 1 ); + if (!strcmp( var, "LD_LIBRARY_PATH" )) + { + void (*update_func)( const char * ) = dlsym( RTLD_DEFAULT, + "android_update_LD_LIBRARY_PATH" ); + if (update_func) update_func( val ); + } (*env)->ReleaseStringUTFChars( env, val_obj, val ); } else unsetenv( var );

1 0

Alexandre Julliard : libwine: No longer look for libraries in the dll path on Android.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: a6a9b05deeab21f24263de32a17b83a17c1403dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a9b05deeab21f24263de32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:25:15 2014 +0200 libwine: No longer look for libraries in the dll path on Android. --- libs/wine/loader.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c2290df..3591ede 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else -#elif defined(__ANDROID__) - if (!strchr( filename, '/' ) && nb_dll_paths) - { - unsigned int i; - char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); - - buffer[dll_path_maxlen] = '/'; - strcpy( buffer + dll_path_maxlen + 1, filename ); - for (i = 0; i < nb_dll_paths; i++) - { - char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); - ret = dlopen( path, flag | RTLD_FIRST ); - if (ret) break; - } - free( buffer ); - if (ret) return ret; - } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror();

1 0

Jacek Caban : wininet: Fixed leak in InternetGetConnectedStateExA.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: e1dbfb762c5991bba130bceb5f9ddfe35ff92def URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dbfb762c5991bba130bceb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:19:49 2014 +0200 wininet: Fixed leak in InternetGetConnectedStateExA. --- dlls/wininet/internet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aa58e34..3ed9bb1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1294,11 +1294,10 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen, dwReserved); if (rc && lpwszConnectionName) - { WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, dwNameLen, NULL, NULL); - heap_free(lpwszConnectionName); - } + + heap_free(lpwszConnectionName); return rc; }

1 0

Jacek Caban : wininet: Moved DllInstall to internet.c.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 1cfee7da6ee2ed8e854d030e51b99112420bf789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfee7da6ee2ed8e854d030e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 12:20:00 2014 +0200 wininet: Moved DllInstall to internet.c. --- dlls/wininet/Makefile.in | 3 +-- dlls/wininet/internet.c | 9 +++++++++ dlls/wininet/wininet_main.c | 42 ------------------------------------------ 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 357b924..5379e03 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ internet.c \ netconnection.c \ urlcache.c \ - utility.c \ - wininet_main.c + utility.c RC_SRCS = wininet.rc diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3ed9bb1..2a2876c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -341,6 +341,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * DllInstall (WININET.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%x %s): stub\n", bInstall, debugstr_w(cmdline)); + return S_OK; +} + +/*********************************************************************** * INTERNET_SaveProxySettings * * Stores the proxy settings given by lpwai into the registry diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c deleted file mode 100644 index cf4a6f2..0000000 --- a/dlls/wininet/wininet_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * WinInet - * - * Copyright (c) 2000 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winreg.h" -#include "shlwapi.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - -/*********************************************************************** - * DllInstall (WININET.@) - */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) -{ - FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", - debugstr_w(cmdline)); - - return S_OK; -}

1 0