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

Alexandre Julliard : opengl32: Generate the correct trace arguments for UINT64 types.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 926681fead6cf38d4868937445a54f487c74d766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926681fead6cf38d486893744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:23:10 2009 +0200 opengl32: Generate the correct trace arguments for UINT64 types. --- dlls/opengl32/make_opengl | 56 ++++++++++++++++++++++++++++++------------- dlls/opengl32/opengl_ext.c | 4 +- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7235b28..752ac87 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -88,17 +88,24 @@ my %cat_1_0 = ( "display-list" => 1, "pixel-op" => 1, "pixel-rw" => 1, "state-req" => 1, - "xform" => 1 ); + "xform" => 1, + "VERSION_1_0" => 1, + "VERSION_1_0_DEPRECATED" => 1 ); my %cat_1_1 = ( %cat_1_0, - "1_1" => 1 ); + "VERSION_1_1" => 1, + "VERSION_1_1_DEPRECATED" => 1 ); my %cat_1_2 = ( %cat_1_1, - "VERSION_1_2" => 1 ); + "VERSION_1_2" => 1, + "VERSION_1_2_DEPRECATED" => 1 ); my %cat_1_3 = ( %cat_1_2, - "VERSION_1_3" => 1 ); + "VERSION_1_3" => 1, + "VERSION_1_3_DEPRECATED" => 1 ); my %cat_1_4 = ( %cat_1_3, - "VERSION_1_4" => 1 ); + "VERSION_1_4" => 1, + "VERSION_1_4_DEPRECATED" => 1 ); my %cat_1_5 = ( %cat_1_4, - "VERSION_1_5" => 1 ); + "VERSION_1_5" => 1, + "VERSION_1_5_DEPRECATED" => 1 ); my %norm_categories = (); @@ -130,7 +137,9 @@ my %debug_conv = "GLhandleARB" => "%d", "GLcharARB" => "%c", "GLvoid" => "(void)", - "_GLfuncptr" => "%p"); + "_GLfuncptr" => "%p", + "UINT64" => "%s,wine_dbgstr_longlong(%s)" + ); # # This hash table gives the conversion between OpenGL types and what @@ -215,6 +224,7 @@ sub GenerateThunk($$$$$) my ($func_ref, $comment, $prefix, $thread_safe, $local_var) = @_; my $ret = ""; my $call_arg = ""; + my $trace_call_arg = ""; my $trace_arg = ""; return "" if $func_ref->[0] eq "glGetString"; @@ -235,20 +245,32 @@ sub GenerateThunk($$$$$) ## print $func_ref->[2]->[$i]->[1] . "\n"; my $type = $func_ref->[2]->[$i]->[0]; my $name = ConvertVarName($func_ref->[2]->[$i]->[1]); - $ret = $ret . ConvertType($type) . " $name"; - $call_arg = "$call_arg$name"; + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; if ($type =~ /\*/) { - $trace_arg = "$trace_arg\%p"; + $trace_arg .= "%p"; + $trace_call_arg .= $name; } else { - $trace_arg = "$trace_arg$debug_conv{$type}"; + if ($debug_conv{$type} =~ /(.*),(.*)/) + { + $trace_arg .= $1; + $trace_call_arg .= sprintf $2, $name; + } + else + { + $trace_arg .= $debug_conv{$type}; + $trace_call_arg .= $name; + } } if ($i+1 < @{$func_ref->[2]}) { - $ret = "$ret, "; - $call_arg = "$call_arg, "; - $trace_arg = "$trace_arg, "; + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; } else { - $ret = "$ret "; - $call_arg = "$call_arg "; + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; } } $ret .= 'void ' if (!@{$func_ref->[2]}); @@ -260,7 +282,7 @@ sub GenerateThunk($$$$$) if ($gen_traces) { $ret = "$ret TRACE(\"($trace_arg)\\n\""; if ($trace_arg ne "") { - $ret = "$ret, $call_arg"; + $ret .= ", $trace_call_arg"; } $ret = "$ret);\n"; } diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index ae12241..81cc1d2 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -8730,7 +8730,7 @@ static void WINAPI wine_glPolygonOffsetEXT( GLfloat factor, GLfloat bias ) { static void WINAPI wine_glPresentFrameDualFillNV( GLuint video_slot, UINT64 minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3 ) { void (*func_glPresentFrameDualFillNV)( GLuint, UINT64, GLuint, GLuint, GLenum, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint ) = extension_funcs[EXT_glPresentFrameDualFillNV]; - TRACE("(%d, %lld, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); + TRACE("(%d, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, wine_dbgstr_longlong(minPresentTime), beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); ENTER_GL(); func_glPresentFrameDualFillNV( video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); LEAVE_GL(); @@ -8738,7 +8738,7 @@ static void WINAPI wine_glPresentFrameDualFillNV( GLuint video_slot, UINT64 minP static void WINAPI wine_glPresentFrameKeyedNV( GLuint video_slot, UINT64 minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1 ) { void (*func_glPresentFrameKeyedNV)( GLuint, UINT64, GLuint, GLuint, GLenum, GLenum, GLuint, GLuint, GLenum, GLuint, GLuint ) = extension_funcs[EXT_glPresentFrameKeyedNV]; - TRACE("(%d, %lld, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); + TRACE("(%d, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, wine_dbgstr_longlong(minPresentTime), beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); ENTER_GL(); func_glPresentFrameKeyedNV( video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); LEAVE_GL();

1 0

Alexandre Julliard : winedump: Fix a printf format warning on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 23fd37528ca0b639c69a110e042c721c58c39ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fd37528ca0b639c69a110e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:23:24 2009 +0200 winedump: Fix a printf format warning on 64-bit. --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bbe4d56..5ff8a16 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -669,7 +669,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) } if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) printf( " handler %08x data at %08x\n", handler_data->handler, - function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info ); + (ULONG)(function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info )); } static void dump_dir_exceptions(void)

1 0

Alexandre Julliard : comctl32/tests: Replace a listview macro by an explicit SendMessage.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 448d48c3f494f7b0b10d176e987d9b2f9494adc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448d48c3f494f7b0b10d176e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:04 2009 +0200 comctl32/tests: Replace a listview macro by an explicit SendMessage. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 793717c..4c4022d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1745,7 +1745,7 @@ todo_wine item.stateMask = LVIS_SELECTED; r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - ListView_SetSelectionMark(hwnd, -1); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED;

1 0

Alexandre Julliard : ole32: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: fb640601eaccbe81814488ff02403878264e7b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb640601eaccbe81814488ff0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:25 2009 +0200 ole32: Fix some pointer conversion warnings on 64-bit. --- dlls/ole32/tests/clipboard.c | 2 +- dlls/ole32/tests/usrmarshal.c | 2 +- dlls/ole32/usrmarshal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index f06a482..a6229a1 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -735,7 +735,7 @@ static void test_cf_dataobject(IDataObject *data) DVTARGETDEVICE *target; ok(fmt_ptr->fmt.ptd != NULL, "target device offset zero\n"); - target = (DVTARGETDEVICE*)((char*)priv + (DWORD)fmt_ptr->fmt.ptd); + target = (DVTARGETDEVICE*)((char*)priv + (DWORD_PTR)fmt_ptr->fmt.ptd); ok(!memcmp(target, fmt.ptd, fmt.ptd->tdSize), "target devices differ\n"); CoTaskMemFree(fmt.ptd); } diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 2b7103c..fde0034 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -145,7 +145,7 @@ static void test_marshal_HWND(void) HWND_UserMarshal(&umcb.Flags, buffer, &hwnd); wirehwnd = (wireHWND)buffer; ok(wirehwnd->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehwnd->fContext); - ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %p\n", hwnd, (HANDLE)wirehwnd->u.hRemote); + ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %x\n", hwnd, wirehwnd->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); HWND_UserUnmarshal(&umcb.Flags, buffer, &hwnd2); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 46fba8b..f180f42 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -307,7 +307,7 @@ static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffe RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (remhandle->fContext != WDT_INPROC_CALL) RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - *handle = (HANDLE)remhandle->u.hInproc; + *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; return pBuffer + sizeof(RemotableHandle); }

1 0

Alexandre Julliard : user32/tests: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 83cb24f9b43fd0ccc08da8c7227e5eb4c5b0f92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cb24f9b43fd0ccc08da8c72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:31 2009 +0200 user32/tests: Fix some pointer conversion warnings on 64-bit. --- dlls/user32/tests/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 75059ea..0948f69 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -571,7 +571,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) : 0) + arrowwidth + MOD_avec + (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) : 0) + (text && hastab ? /* TAB space */ MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + @@ -588,7 +588,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cy + 2 : GetSystemMetrics( SM_CYMENUSIZE) + 2) : 0)));

1 0

Alexandre Julliard : gphoto2.ds: Fix a pointer conversion warning on 64-bit .
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 49159aebf123f6c27e98ede0ce848e8f82f271b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49159aebf123f6c27e98ede0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:54 2009 +0200 gphoto2.ds: Fix a pointer conversion warning on 64-bit. --- dlls/gphoto2.ds/ds_image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index ae6e115..ec29eff 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -460,7 +460,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, gp_file_unref (activeDS.file); activeDS.file = NULL; ReleaseDC (activeDS.hwndOwner, dc); - *pHandle = (TW_UINT32)hDIB; + *pHandle = (UINT_PTR)hDIB; activeDS.twCC = TWCC_SUCCESS; activeDS.currentState = 7; return TWRC_XFERDONE;

1 0

Alexandre Julliard : sane.ds: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 9008daed922dbf7f30b0da5dc4b96f2008c85238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9008daed922dbf7f30b0da5dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:58 2009 +0200 sane.ds: Fix a pointer conversion warning on 64-bit. --- dlls/sane.ds/ds_image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 4777040..4945e55 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -563,7 +563,7 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, psane_cancel (activeDS.deviceHandle); activeDS.sane_started = FALSE; - *pHandle = (TW_UINT32)hDIB; + *pHandle = (UINT_PTR)hDIB; twRC = TWRC_XFERDONE; activeDS.twCC = TWCC_SUCCESS; activeDS.currentState = 7;

1 0

Alexandre Julliard : msacm32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 1fc2cebf5e1b48f4aea1cc0ded6a9e5f6f4b04f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc2cebf5e1b48f4aea1cc0de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:25:04 2009 +0200 msacm32: Fix a pointer conversion warning on 64-bit. --- dlls/msacm32/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 1b20ce0..a6f7fbd 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -475,7 +475,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, continue; hdrvr = OpenDriver(padid->pszFileName,0,0); - SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD)&adfs,(fdwEnum & 0x000000FFL)); + SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(LPARAM)&adfs,(fdwEnum & 0x000000FFL)); if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_FORMAT) != MMSYSERR_NOERROR) continue;

1 0

Alexandre Julliard : msvfw32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 75ba56f066b0a5a808d289a5e4381179918a172e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ba56f066b0a5a808d289a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:25:09 2009 +0200 msvfw32: Fix a pointer conversion warning on 64-bit. --- dlls/msvfw32/drawdib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 902f0ca..9877e62 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -72,7 +72,7 @@ static WINE_HDD* MSVIDEO_GetHddPtr(HDRAWDIB hd) return hdd; } -static DWORD HDD_HandleRef = 1; +static UINT_PTR HDD_HandleRef = 1; /*********************************************************************** * DrawDibOpen [MSVFW32.@]

1 0

Stefan Dösinger : wined3d: Manage vs_compile_args in the backends.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: aad92c0780f7a0383db1736d6fbca6a8ce6b45ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad92c0780f7a0383db1736d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:06:37 2009 +0200 wined3d: Manage vs_compile_args in the backends. --- dlls/wined3d/arb_program_shader.c | 63 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 74 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 9 +---- 3 files changed, 91 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aad92c0780f7a0383db17…

1 0