[vlc-commits] Win32 one-instance: fix mismatch in ABI on win64

Rafaël Carré git at videolan.org
Wed Mar 7 23:40:45 CET 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar  7 17:38:07 2012 -0500| [24bd745705ae6017552678a20f1418c06ed81376] | committer: Rafaël Carré

Win32 one-instance: fix mismatch in ABI on win64

86f2f7329b1b4 changed string length storage from int to size_t but did
not update the receiving code.

Close #6084

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24bd745705ae6017552678a20f1418c06ed81376
---

 src/win32/specific.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/win32/specific.c b/src/win32/specific.c
index 8a20808..3350cff 100644
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -291,8 +291,8 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
             ppsz_argv = (char **)malloc( i_argc * sizeof(char *) );
             for( i_opt = 0; i_opt < i_argc; i_opt++ )
             {
-                ppsz_argv[i_opt] = p_data->data + i_data + sizeof(int);
-                i_data += sizeof(int) + *((int *)(p_data->data + i_data));
+                ppsz_argv[i_opt] = p_data->data + i_data + sizeof(size_t);
+                i_data += sizeof(size_t) + *((size_t *)(p_data->data + i_data));
             }
 
             for( i_opt = 0; i_opt < i_argc; i_opt++ )



More information about the vlc-commits mailing list