wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Józef Kucia : user32: Fix memory leak in WinHelpA().
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: ae9d5ce5f70ca196ee6b71e9d16cd4ded914d4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9d5ce5f70ca196ee6b71e9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 30 12:21:54 2017 +0200 user32: Fix memory leak in WinHelpA(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winhelp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index a2c331b..c40b0fc 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -80,6 +80,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD HWND hDest; int size, dsize, nlen; WINHELP* lpwh; + LRESULT ret; hDest = FindWindowA("MS_WINHELP", NULL); if (!hDest) @@ -156,7 +157,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); - return SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + ret = SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + HeapFree(GetProcessHeap(), 0, lpwh); + return ret; }

1 0

Piotr Caban : winemac: Don't update clipboard if its content didn' t change.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 1cd883fcb57c30120e564aefc35ce38934038288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd883fcb57c30120e564aefc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 30 09:56:25 2017 +0200 winemac: Don't update clipboard if its content didn't change. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 23 ++++++++--------------- dlls/winemac.drv/cocoa_clipboard.m | 18 ++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 53f01d5..ac0dc31 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -198,7 +198,6 @@ static DWORD clipboard_thread_id; static HWND clipboard_hwnd; static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; -static UINT rendered_formats; static ULONG64 last_clipboard_update; static DWORD last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; @@ -1729,11 +1728,7 @@ static void render_format(UINT id) { HANDLE handle = current_mac_formats[i]->import_func(pasteboard_data); CFRelease(pasteboard_data); - if (handle) - { - SetClipboardData(id, handle); - rendered_formats++; - } + if (handle) SetClipboardData(id, handle); break; } } @@ -1746,7 +1741,7 @@ static void render_format(UINT id) * Grab the Win32 clipboard when a Mac app has taken ownership of the * pasteboard, and fill it with the pasteboard data types. */ -static void grab_win32_clipboard(BOOL changed) +static void grab_win32_clipboard(void) { static CFArrayRef last_types; CFArrayRef types; @@ -1758,8 +1753,7 @@ static void grab_win32_clipboard(BOOL changed) return; } - changed = (changed || rendered_formats || !last_types || !CFEqual(types, last_types)); - if (!changed) + if (!macdrv_has_pasteboard_changed() && last_types && CFEqual(types, last_types)) { CFRelease(types); return; @@ -1771,7 +1765,6 @@ static void grab_win32_clipboard(BOOL changed) if (!OpenClipboard(clipboard_hwnd)) return; EmptyClipboard(); is_clipboard_owner = TRUE; - rendered_formats = 0; last_clipboard_update = GetTickCount64(); set_win32_clipboard_formats_from_mac_pasteboard(types); CloseClipboard(); @@ -1798,10 +1791,10 @@ static void update_clipboard(void) if (is_clipboard_owner) { if (GetTickCount64() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY) - grab_win32_clipboard(FALSE); + grab_win32_clipboard(); } else if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) - grab_win32_clipboard(TRUE); + grab_win32_clipboard(); updating = FALSE; } @@ -1828,7 +1821,7 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM break; case WM_TIMER: if (!is_clipboard_owner) break; - grab_win32_clipboard(FALSE); + grab_win32_clipboard(); break; case WM_DESTROYCLIPBOARD: TRACE("WM_DESTROYCLIPBOARD: lost ownership\n"); @@ -1974,7 +1967,7 @@ static DWORD WINAPI clipboard_thread(void *arg) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener(clipboard_hwnd); register_builtin_formats(); - grab_win32_clipboard(TRUE); + grab_win32_clipboard(); TRACE("clipboard thread %04x running\n", GetCurrentThreadId()); while (1) @@ -2239,7 +2232,7 @@ void macdrv_lost_pasteboard_ownership(HWND hwnd) { TRACE("win %p\n", hwnd); if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) - grab_win32_clipboard(TRUE); + grab_win32_clipboard(); } diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 3b6ec41..39c3b8f 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -25,6 +25,7 @@ static int owned_change_count = -1; +static int change_count = -1; static NSArray* BitmapOutputTypes; static NSDictionary* BitmapOutputTypeMap; @@ -52,6 +53,23 @@ int macdrv_is_pasteboard_owner(macdrv_window w) return ret; } +/*********************************************************************** + * macdrv_has_pasteboard_changed + */ +int macdrv_has_pasteboard_changed(void) +{ + __block int new_change_count; + int ret; + + OnMainThread(^{ + NSPasteboard* pb = [NSPasteboard generalPasteboard]; + new_change_count = [pb changeCount]; + }); + + ret = (change_count != new_change_count); + change_count = new_change_count; + return ret; +} /*********************************************************************** * macdrv_copy_pasteboard_types diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index c4d3a53..a22b4c2 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -549,6 +549,7 @@ extern int macdrv_layout_list_needs_update DECLSPEC_HIDDEN; extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(macdrv_window w) DECLSPEC_HIDDEN; +extern int macdrv_has_pasteboard_changed(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(macdrv_window w) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : libwine: Handle WINEDEBUGLOG variable on Android to specify a log file.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 98860707bcab25600da3ed54c23abb957ac226d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98860707bcab25600da3ed54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 19:12:35 2017 +0200 libwine: Handle WINEDEBUGLOG variable on Android to specify a log file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 89ae935..172bfa0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -877,6 +877,15 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo "android_update_LD_LIBRARY_PATH" ); if (update_func) update_func( val ); } + else if (!strcmp( var, "WINEDEBUGLOG" )) + { + int fd = open( val, O_WRONLY | O_CREAT | O_APPEND, 0666 ); + if (fd != -1) + { + dup2( fd, 2 ); + close( fd ); + } + } (*env)->ReleaseStringUTFChars( env, val_obj, val ); } else unsetenv( var );

1 0

Alexandre Julliard : wineandroid: Add support for initializing Wine from Java.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0519e3c108771a306192ed64757f7b29ca298ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0519e3c108771a306192ed647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 19:12:11 2017 +0200 wineandroid: Add support for initializing Wine from Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 73 +++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 84ce463..b0a8541 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -36,10 +36,13 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; +import java.util.Locale; import java.util.Map; public class WineActivity extends Activity { + private native String wine_init( String[] cmdline, String[] env ); + private final String LOGTAG = "wine"; private ProgressDialog progress_dialog; @@ -50,13 +53,68 @@ public class WineActivity extends Activity requestWindowFeature( android.view.Window.FEATURE_NO_TITLE ); - new Thread( new Runnable() { public void run() { loadWine(); }} ).start(); + new Thread( new Runnable() { public void run() { loadWine( null ); }} ).start(); } - private void loadWine() + private void loadWine( String cmdline ) { + File bindir = new File( getFilesDir(), Build.CPU_ABI + "/bin" ); + File libdir = new File( getFilesDir(), Build.CPU_ABI + "/lib" ); + File prefix = new File( getFilesDir(), "prefix" ); + File loader = new File( bindir, "wine" ); + String locale = Locale.getDefault().getLanguage() + "_" + + Locale.getDefault().getCountry() + ".UTF-8"; + copyAssetFiles(); runOnUiThread( new Runnable() { public void run() { progress_dialog.dismiss(); }}); + + HashMap<String,String> env = new HashMap<String,String>(); + env.put( "WINELOADER", loader.toString() ); + env.put( "WINEPREFIX", prefix.toString() ); + env.put( "LD_LIBRARY_PATH", libdir.toString() ); + env.put( "LC_ALL", locale ); + env.put( "LANG", locale ); + + if (cmdline == null) + { + if (new File( prefix, "drive_c/winestart.cmd" ).exists()) cmdline = "c:\\winestart.cmd"; + else cmdline = "wineconsole.exe"; + } + + String winedebug = readFileString( new File( prefix, "winedebug" )); + if (winedebug == null) winedebug = readFileString( new File( getFilesDir(), "winedebug" )); + if (winedebug != null) + { + File log = new File( getFilesDir(), "log" ); + env.put( "WINEDEBUG", winedebug ); + env.put( "WINEDEBUGLOG", log.toString() ); + Log.i( LOGTAG, "logging to " + log.toString() ); + log.delete(); + } + + System.load( libdir.toString() + "/libwine.so" ); + prefix.mkdirs(); + + runWine( cmdline, env ); + } + + private final void runWine( String cmdline, HashMap<String,String> environ ) + { + String[] env = new String[environ.size() * 2]; + int j = 0; + for (Map.Entry<String,String> entry : environ.entrySet()) + { + env[j++] = entry.getKey(); + env[j++] = entry.getValue(); + } + + String[] cmd = { environ.get( "WINELOADER" ), + "explorer.exe", + "/desktop=shell,,android", + cmdline }; + + String err = wine_init( cmd, env ); + Log.e( LOGTAG, err ); } private void createProgressDialog( final int max, final String message ) @@ -126,6 +184,17 @@ public class WineActivity extends Activity catch( IOException e ) { return new HashMap<String,String>(); } } + private final String readFileString( File file ) + { + try + { + FileInputStream in = new FileInputStream( file ); + BufferedReader reader = new BufferedReader( new InputStreamReader( in, "UTF-8" )); + return reader.readLine(); + } + catch( IOException e ) { return null; } + } + private final void copyAssetFile( String src ) { File dest = new File( getFilesDir(), src );

1 0

Alexandre Julliard : wineandroid: Install libraries from the package assets if present.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: da2522becb3c167ddba5457ee460a7194eb505e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2522becb3c167ddba5457ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 14:19:57 2017 +0200 wineandroid: Install libraries from the package assets if present. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 5 + dlls/wineandroid.drv/WineActivity.java | 164 +++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 42c6926..0001dec 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -8,4 +8,9 @@ EXTRA_TARGETS = wine-debug.apk all: wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg + (test -d assets && \ + rm -f assets/files.sum assets/sums.sum && \ + sha256sum `find assets -type f -print` | sed 's/ assets\// /' >files.sum && \ + sha256sum files.sum >sums.sum && \ + mv files.sum sums.sum assets) || rm -rf assets gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk . diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index ceac1b6..84ce463 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -21,13 +21,177 @@ package org.winehq.wine; import android.app.Activity; +import android.app.ProgressDialog; +import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; +import android.preference.PreferenceManager; +import android.util.Log; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; public class WineActivity extends Activity { + private final String LOGTAG = "wine"; + private ProgressDialog progress_dialog; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate( savedInstanceState ); + + requestWindowFeature( android.view.Window.FEATURE_NO_TITLE ); + + new Thread( new Runnable() { public void run() { loadWine(); }} ).start(); + } + + private void loadWine() + { + copyAssetFiles(); + runOnUiThread( new Runnable() { public void run() { progress_dialog.dismiss(); }}); + } + + private void createProgressDialog( final int max, final String message ) + { + runOnUiThread( new Runnable() { public void run() { + if (progress_dialog != null) progress_dialog.dismiss(); + progress_dialog = new ProgressDialog( WineActivity.this ); + progress_dialog.setProgressStyle( max > 0 ? ProgressDialog.STYLE_HORIZONTAL + : ProgressDialog.STYLE_SPINNER ); + progress_dialog.setTitle( "Wine" ); + progress_dialog.setMessage( message ); + progress_dialog.setCancelable( false ); + progress_dialog.setMax( max ); + progress_dialog.show(); + }}); + + } + + private final boolean isFileWanted( String name ) + { + if (name.equals( "files.sum" )) return true; + if (name.startsWith( "share/" )) return true; + if (name.startsWith( Build.CPU_ABI + "/system/" )) return false; + if (name.startsWith( Build.CPU_ABI + "/" )) return true; + if (name.startsWith( "x86/" )) return true; + return false; + } + + private final boolean isFileExecutable( String name ) + { + return name.startsWith( Build.CPU_ABI + "/" ) || name.startsWith( "x86/" ); + } + + private final HashMap<String,String> readMapFromInputStream( InputStream in ) + { + HashMap<String,String> map = new HashMap<String,String>(); + String str; + + try + { + BufferedReader reader = new BufferedReader( new InputStreamReader( in, "UTF-8" )); + while ((str = reader.readLine()) != null) + { + String entry[] = str.split( "\\s+", 2 ); + if (entry.length == 2 && isFileWanted( entry[1] )) map.put( entry[1], entry[0] ); + } + } + catch( IOException e ) { } + return map; + } + + private final HashMap<String,String> readMapFromDiskFile( String file ) + { + try + { + return readMapFromInputStream( new FileInputStream( new File( getFilesDir(), file ))); + } + catch( IOException e ) { return new HashMap<String,String>(); } + } + + private final HashMap<String,String> readMapFromAssetFile( String file ) + { + try + { + return readMapFromInputStream( getAssets().open( file ) ); + } + catch( IOException e ) { return new HashMap<String,String>(); } + } + + private final void copyAssetFile( String src ) + { + File dest = new File( getFilesDir(), src ); + try + { + Log.i( LOGTAG, "extracting " + dest ); + dest.getParentFile().mkdirs(); + dest.delete(); + if (dest.createNewFile()) + { + InputStream in = getAssets().open( src ); + FileOutputStream out = new FileOutputStream( dest ); + int read; + byte[] buffer = new byte[65536]; + + while ((read = in.read( buffer )) > 0) out.write( buffer, 0, read ); + out.close(); + if (isFileExecutable( src )) dest.setExecutable( true, true ); + } + else + Log.i( LOGTAG, "Failed to create file " + dest ); + } + catch( IOException e ) + { + Log.i( LOGTAG, "Failed to copy asset file to " + dest ); + dest.delete(); + } + } + + private final void deleteAssetFile( String src ) + { + File dest = new File( getFilesDir(), src ); + Log.i( LOGTAG, "deleting " + dest ); + dest.delete(); + } + + private final void copyAssetFiles() + { + String new_sum = readMapFromAssetFile( "sums.sum" ).get( "files.sum" ); + if (new_sum == null) return; // no assets + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences( this ); + String old_sum = prefs.getString( "files.sum", "" ); + if (old_sum.equals( new_sum )) return; // no change + prefs.edit().putString( "files.sum", new_sum ).apply(); + + HashMap<String,String> existing_files = readMapFromDiskFile( "files.sum" ); + HashMap<String,String> new_files = readMapFromAssetFile( "files.sum" ); + ArrayList<String> copy_files = new ArrayList<String>(); + copy_files.add( "files.sum" ); + + for (Map.Entry<String, String> entry : new_files.entrySet()) + { + String name = entry.getKey(); + if (!entry.getValue().equals( existing_files.remove( name ))) copy_files.add( name ); + } + + createProgressDialog( copy_files.size(), "Extracting files..." ); + + for (String name : existing_files.keySet()) deleteAssetFile( name ); + + for (String name : copy_files) + { + copyAssetFile( name ); + runOnUiThread( new Runnable() { public void run() { + progress_dialog.incrementProgressBy( 1 ); }}); + } } }

1 0

Alexandre Julliard : wineandroid: Add initial stub for the Java activity.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 93d4ac2a0f7147d3178645aedcbf66c9d5147124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d4ac2a0f7147d3178645aed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 12:59:15 2017 +0200 wineandroid: Add initial stub for the Java activity. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 2 +- configure.ac | 2 +- dlls/wineandroid.drv/AndroidManifest.xml | 16 + dlls/wineandroid.drv/Makefile.in | 10 + dlls/wineandroid.drv/WineActivity.java | 33 ++ dlls/wineandroid.drv/build.gradle.in | 81 +++ dlls/wineandroid.drv/wine.svg | 829 +++++++++++++++++++++++++++++++ 8 files changed, 972 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93d4ac2a0f7147d317864…

1 0

Alexandre Julliard : configure: Add Android driver stub.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: e11f2397ac847872fc8e5547c95ad7f0d9ed824b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f2397ac847872fc8e5547c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 12:58:03 2017 +0200 configure: Add Android driver stub. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++++++++++++- configure.ac | 15 ++++++++++++++- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fb22627..9751fa0 100755 --- a/configure +++ b/configure @@ -1465,6 +1465,7 @@ enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv +enable_wineandroid_drv enable_winebus_sys enable_winecoreaudio_drv enable_wined3d @@ -8367,6 +8368,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" LDEXECFLAGS="-Wl,-pie" + enable_wineandroid_drv=${enable_wineandroid_drv:-yes} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : @@ -8481,6 +8483,16 @@ fi LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" + + if test "x$exec_prefix" = xNONE + then + case $host_cpu in + *i[3456]86*) exec_prefix='${prefix}/x86' ;; + *x86_64*) exec_prefix='${prefix}/x86_64' ;; + *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; + *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + esac + fi ;; *) @@ -8873,6 +8885,7 @@ esac enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} @@ -11002,7 +11015,7 @@ else X_LIBS="" fi -if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then if test "x$X_LIBS" = "x"; then : case "x$with_x" in @@ -18562,6 +18575,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test wine_fn_config_dll windowscodecsext enable_windowscodecsext implib wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv +wine_fn_config_dll wineandroid.drv enable_wineandroid_drv wine_fn_config_dll winebus.sys enable_winebus_sys wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index dde867b..74fdf11 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,7 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" LDEXECFLAGS="-Wl,-pie" + enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], @@ -865,6 +866,16 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) + + if test "x$exec_prefix" = xNONE + then + case $host_cpu in + *i[[3456]]86*) exec_prefix='${prefix}/x86' ;; + *x86_64*) exec_prefix='${prefix}/x86_64' ;; + *arm*) exec_prefix='${prefix}/armeabi-v7a' ;; + *aarch64*) exec_prefix='${prefix}/arm64-v8a' ;; + esac + fi ;; *) @@ -938,6 +949,7 @@ esac enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} enable_wineqtdecoder=${enable_wineqtdecoder:-no} +enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} @@ -1175,7 +1187,7 @@ else X_LIBS="" fi -if test "$enable_winemac_drv" = "no" +if test "$enable_wineandroid_drv$enable_winemac_drv" = "nono" then WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"], [X ${notice_platform}development files not found. Wine will be built @@ -3507,6 +3519,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) +WINE_CONFIG_DLL(wineandroid.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in new file mode 100644 index 0000000..5fd0180 --- /dev/null +++ b/dlls/wineandroid.drv/Makefile.in @@ -0,0 +1 @@ +MODULE = wineandroid.drv diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec new file mode 100644 index 0000000..30fd8e1 --- /dev/null +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -0,0 +1 @@ +# Nothing here yet

1 0

André Hentschel : iphlpapi: Add partial implementation of GetIfTable2Ex.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: ebf5b23ccb2be6a1d44de7c35e7c1df662136a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf5b23ccb2be6a1d44de7c35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 16:15:21 2017 +0200 iphlpapi: Add partial implementation of GetIfTable2Ex. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 21 +++++++++++++++++---- dlls/iphlpapi/tests/iphlpapi.c | 33 +++++++++++++++++++++++++++++++++ include/netioapi.h | 6 ++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4e5970c..fee9960 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -92,7 +92,7 @@ #@ stub GetIfStackTable @ stdcall GetIfTable( ptr ptr long ) @ stdcall GetIfTable2( ptr ) -#@ stub GetIfTable2Ex +@ stdcall GetIfTable2Ex( long ptr ) @ stub GetIfTableFromStack @ stub GetIgmpList @ stdcall GetInterfaceInfo( ptr ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c592a90..d0e13e4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1852,17 +1852,21 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) } /****************************************************************** - * GetIfTable2 (IPHLPAPI.@) + * GetIfTable2Ex (IPHLPAPI.@) */ -DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) +DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) { DWORD i, nb_interfaces, size = sizeof(MIB_IF_TABLE2); InterfaceIndexTable *index_table; MIB_IF_TABLE2 *ret; - TRACE( "table %p\n", table ); + TRACE( "level %u, table %p\n", level, table ); - if (!table) return ERROR_INVALID_PARAMETER; + if (!table || level > MibIfTableRaw) + return ERROR_INVALID_PARAMETER; + + if (level != MibIfTableNormal) + FIXME("level %u not fully supported\n", level); if ((nb_interfaces = get_interface_indices( FALSE, NULL )) > 1) size += (nb_interfaces - 1) * sizeof(MIB_IF_ROW2); @@ -1890,6 +1894,15 @@ DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) } /****************************************************************** + * GetIfTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) +{ + TRACE( "table %p\n", table ); + return GetIfTable2Ex(MibIfTableNormal, table); +} + +/****************************************************************** * GetInterfaceInfo (IPHLPAPI.@) * * Get a list of network interface adapters. diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3369f78..d8c319e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -58,6 +58,7 @@ static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); +static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); @@ -110,6 +111,7 @@ static void loadIPHlpApi(void) pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); + pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); @@ -2023,6 +2025,36 @@ static void test_GetIfTable2(void) pFreeMibTable( table ); } +static void test_GetIfTable2Ex(void) +{ + DWORD ret; + MIB_IF_TABLE2 *table; + + if (!pGetIfTable2Ex) + { + win_skip( "GetIfTable2Ex not available\n" ); + return; + } + + table = NULL; + ret = pGetIfTable2Ex( MibIfTableNormal, &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( MibIfTableRaw, &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( 2, &table ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( !table, "table should not be set\n" ); + pFreeMibTable( table ); +} + static void test_GetUnicastIpAddressEntry(void) { IP_ADAPTER_ADDRESSES *aa, *ptr; @@ -2208,6 +2240,7 @@ START_TEST(iphlpapi) test_interface_identifier_conversion(); test_GetIfEntry2(); test_GetIfTable2(); + test_GetIfTable2Ex(); test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); freeIPHlpApi(); diff --git a/include/netioapi.h b/include/netioapi.h index cabfe9e..4f5f671 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,12 @@ #include <ntddndis.h> +typedef enum _MIB_IF_TABLE_LEVEL +{ + MibIfTableNormal, + MibIfTableRaw +} MIB_IF_TABLE_LEVEL, *PMIB_IF_TABLE_LEVEL; + typedef enum _MIB_NOTIFICATION_TYPE { MibParameterNotification,

1 0

Andrey Gusev : api-ms-win-security-activedirectoryclient-l1-1-0: Add dll.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 52afd729752c5d8a0a90d25d6eada6da280ac548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52afd729752c5d8a0a90d25d6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 14:04:49 2017 +0300 api-ms-win-security-activedirectoryclient-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-activedirectoryclient-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index d2d391c..fb22627 100755 --- a/configure +++ b/configure @@ -1026,6 +1026,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17897,6 +17898,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_dll api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index db4d168..dde867b 100644 --- a/configure.ac +++ b/configure.ac @@ -2843,6 +2843,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in new file mode 100644 index 0000000..e1e99bd --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-activedirectoryclient-l1-1-0.dll diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec new file mode 100644 index 0000000..eef1c40 --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub DsBindWithSpnExW +@ stub DsCrackNamesW +@ stub DsFreeDomainControllerInfoW +@ stub DsFreeNameResultW +@ stub DsFreePasswordCredentials +@ stub DsGetDomainControllerInfoW +@ stub DsMakePasswordCredentialsW +@ stub DsUnBindW diff --git a/tools/make_specfiles b/tools/make_specfiles index e544293..910bd0f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "api-ms-win-power-setting-l1-1-0", ], [ + "ntdsapi", + "api-ms-win-security-activedirectoryclient-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1",

1 0

Andrey Gusev : api-ms-win-core-processthreads-l1-1-2: Add forwards.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: efaedba0d7db6fe21f6c51edfe424b734dbb5225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaedba0d7db6fe21f6c51edf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 12:22:20 2017 +0300 api-ms-win-core-processthreads-l1-1-2: Add forwards. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-2.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index c902274..7bfbe72 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -40,9 +40,9 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -58,7 +58,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 280954d..e544293 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,7 +224,6 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-sysinfo-l1-2-1", - "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-localization-l1-2-1", @@ -252,6 +251,7 @@ my @dll_groups = "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "kernel32",

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017