May 2017 - Wine-commits - list.winehq.org

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 : 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 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 : 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

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

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

Jacek Caban : oleaut32/tests: Use static oleaut32 linking in vartest.c.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: e42a12d8b8e0474e8c2c7390341b8e8b46ccb281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42a12d8b8e0474e8c2c73903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 30 13:13:06 2017 +0200 oleaut32/tests: Use static oleaut32 linking in vartest.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 648 +++++------------------------------------- 1 file changed, 68 insertions(+), 580 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e42a12d8b8e0474e8c2c7…

1 0

Austin English : d3dx9_37: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: ebd1ae9bda0d162f04d178b8502711e78d495ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1ae9bda0d162f04d178b85… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:13 2017 -0500 d3dx9_37: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_37/d3dx9_37.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_38: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: fac79112b43c1975fc3dae52fa9f3a70f77a5231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac79112b43c1975fc3dae52f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:14 2017 -0500 d3dx9_38: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_38/d3dx9_38.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_39: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0a9fac9a357e334e796f752389d529427d93a552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9fac9a357e334e796f75238… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:15 2017 -0500 d3dx9_39: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_39/d3dx9_39.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0