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

Rafaël Carré git at videolan.org
Thu Mar 8 00:53:14 CET 2012


vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar  7 17:38:07 2012 -0500| [23b55adc5b2a776df41dadf17b2eb0bf1d084766] | committer: Jean-Baptiste Kempf

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
(cherry picked from commit 24bd745705ae6017552678a20f1418c06ed81376)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=23b55adc5b2a776df41dadf17b2eb0bf1d084766
---

 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 c0a683e..955b254 100644
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -324,8 +324,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