wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Alexandre Julliard : user32: Notify the user driver about window extended style changes too.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 2f1121316868b79bfe01105b6a3814a17ec655d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1121316868b79bfe01105b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 14:55:07 2008 +0200 user32: Notify the user driver about window extended style changes too. --- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 26 ++++++++++++++------------ dlls/winex11.drv/window.c | 15 +++++++-------- dlls/winex11.drv/winex11.drv.spec | 2 +- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c4522eb..38e3c1b 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -388,7 +388,7 @@ static void nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { } -static void nulldrv_SetWindowStyle( HWND hwnd, DWORD old_style ) +static void nulldrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { } @@ -723,9 +723,9 @@ static void loaderdrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) load_driver()->pSetWindowIcon( hwnd, type, icon ); } -static void loaderdrv_SetWindowStyle( HWND hwnd, DWORD old_style ) +static void loaderdrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { - load_driver()->pSetWindowStyle( hwnd, old_style ); + load_driver()->pSetWindowStyle( hwnd, offset, style ); } static void loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 909686d..baf3475 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -153,7 +153,7 @@ typedef struct tagUSER_DRIVER { void (*pSetParent)(HWND,HWND,HWND); int (*pSetWindowRgn)(HWND,HRGN,BOOL); void (*pSetWindowIcon)(HWND,UINT,HICON); - void (*pSetWindowStyle)(HWND,DWORD); + void (*pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (*pSetWindowText)(HWND,LPCWSTR); UINT (*pShowWindow)(HWND,INT,RECT*,UINT); LRESULT (*pSysCommand)(HWND,WPARAM,LPARAM); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7756ab0..e1faae8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -536,7 +536,7 @@ HWND WIN_SetOwner( HWND hwnd, HWND owner ) ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { BOOL ok; - ULONG new_style, old_style = 0; + STYLESTRUCT style; WND *win = WIN_GetPtr( hwnd ); if (!win || win == WND_DESKTOP) return 0; @@ -547,32 +547,33 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) set_bits, clear_bits, hwnd ); return 0; } - new_style = (win->dwStyle | set_bits) & ~clear_bits; - if (new_style == win->dwStyle) + style.styleOld = win->dwStyle; + style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; + if (style.styleNew == style.styleOld) { WIN_ReleasePtr( win ); - return new_style; + return style.styleNew; } SERVER_START_REQ( set_window_info ) { req->handle = hwnd; req->flags = SET_WIN_STYLE; - req->style = new_style; + req->style = style.styleNew; req->extra_offset = -1; if ((ok = !wine_server_call( req ))) { - old_style = reply->old_style; - win->dwStyle = new_style; + style.styleOld = reply->old_style; + win->dwStyle = style.styleNew; } } SERVER_END_REQ; WIN_ReleasePtr( win ); if (ok) { - USER_Driver->pSetWindowStyle( hwnd, old_style ); - if ((old_style ^ new_style) & WS_VISIBLE) invalidate_dce( hwnd, NULL ); + USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); + if ((style.styleOld ^ style.styleNew) & WS_VISIBLE) invalidate_dce( hwnd, NULL ); } - return old_style; + return style.styleOld; } @@ -2131,10 +2132,11 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!ok) return 0; - if (offset == GWL_STYLE) USER_Driver->pSetWindowStyle( hwnd, retval ); - if (offset == GWL_STYLE || offset == GWL_EXSTYLE) + { + USER_Driver->pSetWindowStyle( hwnd, offset, &style ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); + } return retval; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 33adff4..0ba15e2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1455,16 +1455,15 @@ void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) * * Update the X state of a window to reflect a style change */ -void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) +void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { struct x11drv_win_data *data; - DWORD new_style, changed; + DWORD changed; if (hwnd == GetDesktopWindow()) return; - new_style = GetWindowLongW( hwnd, GWL_STYLE ); - changed = new_style ^ old_style; + changed = style->styleNew ^ style->styleOld; - if ((changed & WS_VISIBLE) && (new_style & WS_VISIBLE)) + if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE)) { /* we don't unmap windows, that causes trouble with the window manager */ if (!(data = X11DRV_get_win_data( hwnd )) && @@ -1474,17 +1473,17 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) { Display *display = thread_display(); set_wm_hints( display, data ); - if (!data->mapped) map_window( display, data, new_style ); + if (!data->mapped) map_window( display, data, style->styleNew ); } } - if (changed & WS_DISABLED) + if (offset == GWL_STYLE && (changed & WS_DISABLED)) { data = X11DRV_get_win_data( hwnd ); if (data && data->wm_hints) { wine_tsx11_lock(); - data->wm_hints->input = !(new_style & WS_DISABLED); + data->wm_hints->input = !(style->styleNew & WS_DISABLED); XSetWMHints( thread_display(), data->whole_window, data->wm_hints ); wine_tsx11_unlock(); } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index cacc5b9..39dcc8e 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -109,7 +109,7 @@ @ cdecl SetParent(long long long) X11DRV_SetParent @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn -@ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle +@ cdecl SetWindowStyle(ptr long ptr) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand

1 0

Alexander Nicolaysen Sørnes : Add an ellipsis when cutting urls
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: 647a307fa9da3bc4d53aab98d12bcc9d0fdacd67 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=647a307fa9da3bc4d53aab98… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 9 00:41:50 2008 +0200 Add an ellipsis when cutting urls --- include/application.php | 2 +- include/util.php | 16 ++++++++++++++++ include/version.php | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 1d1fac6..57fcb57 100644 --- a/include/application.php +++ b/include/application.php @@ -744,7 +744,7 @@ class Application { $oVendor = new Vendor($this->iVendorId); // set URL - $appLinkURL = ($this->sWebpage) ? "<a href=\"".$this->sWebpage."\">".substr(stripslashes($this->sWebpage),0,30)."</a>": " "; + $appLinkURL = ($this->sWebpage) ? trimmed_link($this->sWebpage,30) : " "; // start display application echo html_frame_start("","98%","",0); diff --git a/include/util.php b/include/util.php index 49ddedf..bf6f8df 100644 --- a/include/util.php +++ b/include/util.php @@ -917,6 +917,22 @@ function HtmlAreaLoaderScript($aTextareas) } /** + * Cuts the link text to the specified number of chars if it's longer, + * and adds an ellipsis + */ +function trimmed_link($shUrl, $iLength) +{ + $shText = $shUrl; + $shEnd = ''; + if(strlen($shUrl) > $iLength) + { + $shText = substr($shUrl, 0, $iLength); + $shText .= '...'; + } + return "<a href=\"$shUrl\">$shText</a>"; +} + +/** * Remove html formatting from description and extract the first part of the description only. * This is to be used for search results, application summary tables, etc. */ diff --git a/include/version.php b/include/version.php index b6ed1bf..4bbf882 100644 --- a/include/version.php +++ b/include/version.php @@ -822,7 +822,7 @@ class version { $oCategory->display($oApp->iAppId, $this->iVersionId); // set URL - $appLinkURL = ($oApp->sWebpage) ? "<a href=\"".$oApp->sWebpage."\">".substr(stripslashes($oApp->sWebpage),0,30)."</a>": " "; + $appLinkURL = ($oApp->sWebpage) ? trimmed_link($oApp->sWebpage,30) : " "; // start version display echo html_frame_start("","98%","",0);

1 0

Alexander Nicolaysen Sørnes : util: Don' t trim app descriptions away
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: 7e5264a3d07133ee60495d2206f80daadbb28afd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7e5264a3d07133ee60495d22… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Sep 14 16:56:44 2008 +0200 util: Don't trim app descriptions away --- include/util.php | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/util.php b/include/util.php index 028edb6..49ddedf 100644 --- a/include/util.php +++ b/include/util.php @@ -922,14 +922,19 @@ function HtmlAreaLoaderScript($aTextareas) */ function util_trim_description($sDescription) { - // 1) let's take the first line of the description: - $aDesc = explode("\n",trim($sDescription),2); - // 2) maybe it's an html description and lines are separated with or - $aDesc = explode(" ",$aDesc[0],2); - $aDesc = explode(" ",$aDesc[0],2); - $aDesc = explode("",$aDesc[0],2); - $aDesc = explode("",$aDesc[0],2); - return trim(strip_tags($aDesc[0])); + // 1) maybe it's an html description and lines are separated with tags + $aReplace = array(' ',' ',''); + $sDescription = str_replace($aReplace, "\n", $sDescription); + + // 2) let's split the dsecription into lines + $aDesc = explode("\n",trim($sDescription)); + + // 3) Avoid empty lines + for($i = 0; $i < sizeof($aDesc); $i++) + if(($sText = trim(strip_tags($aDesc[$i])))) + return $sText; + + return ''; } /* This allows us to pass on the current URL to the login form so that the user is returned

1 0

Chris Morgan : filter_gpc() fix for "Fatal error: type of variable X is not recognized".
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: f8fb363ce42eba353ac74f7871cb3663b2b9df0a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f8fb363ce42eba353ac74f78… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sun Sep 14 11:19:08 2008 -0400 filter_gpc() fix for "Fatal error: type of variable X is not recognized". Ignore unknown gpc variables instead of failing with fatal errors as it isn't useful to report these errors to users. Firewalls or other programs may be inserting these cookies. Properly store array variables if they are valid arrays. --- include/filter.php | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/filter.php b/include/filter.php index 4daf875..404e3a1 100644 --- a/include/filter.php +++ b/include/filter.php @@ -94,17 +94,16 @@ function filter_gpc() } break; case "a": // array - if(!is_array($_REQUEST[$aKeys[$i]])) - return "Fatal error: ".$aKeys[$i]." should be an array. ". - $sErrorSuggestion; + // store the value if it is an array + if(is_array($_REQUEST[$aKeys[$i]])) + $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; break; default: - return "Fatal error: type of variable ".$aKeys[$i]." is not recognized.". - $sErrorSuggestion; + // type not recognized, skip it break; } } - + /* null out all input data so we can be assured that */ /* no unfiltered values are being used */ $_REQUEST = array();

1 0

Alexander Nicolaysen Sørnes : Fix appData::objectGetEntriesCount() for maintainers
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: 36c0da1c1579701d3b4c8f71acfd16a8a41b7d92 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=36c0da1c1579701d3b4c8f71… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Sep 14 13:37:52 2008 +0200 Fix appData::objectGetEntriesCount() for maintainers --- include/appData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/appData.php b/include/appData.php index d29dea2..a5e32c4 100644 --- a/include/appData.php +++ b/include/appData.php @@ -258,7 +258,7 @@ class appData appFamily.state = 'accepted'"; if($sState != 'all') - $sQuery .= " AND appData.state = 'true'"; + $sQuery .= " AND appData.state = '$sState'"; if($sType) {

1 0

Alexander Nicolaysen Sørnes : db_filter_ui: Use first filter option as default
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: 14bba93d37366ac0eea1b0cf675933558389d13b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=14bba93d37366ac0eea1b0cf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 5 17:22:40 2008 +0200 db_filter_ui: Use first filter option as default --- include/db_filter_ui.php | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index cbe69cf..0e6f56c 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -224,17 +224,13 @@ class FilterInterface { $shEditor .= "<select name='i{$sColumn}Op$sId'>"; - if($iId == -1) - { - $sText = 'criterion'; - $sSel = " selected='selected'"; - } else + if($iId != -1) { $sSel = ''; $sText = 'remove'; - } - $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; + $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; + } foreach($aTypes as $iType) {

1 0

Alexander Nicolaysen Sørnes : browse apps: More options for Wine version filter
by Chris Morgan 14 Sep '08

14 Sep '08

Module: appdb Branch: master Commit: 63ef4f4e951d9aac86ce6d38f95fcf09fe6968e2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=63ef4f4e951d9aac86ce6d38… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 5 17:16:22 2008 +0200 browse apps: More options for Wine version filter --- include/application.php | 36 ++++++++++++++++++++++++++++++++---- include/util.php | 17 +++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/include/application.php b/include/application.php index a7ffa09..1d1fac6 100644 --- a/include/application.php +++ b/include/application.php @@ -953,10 +953,24 @@ class Application { if($sWhereFilter || $aOptions['onlyDownloadable'] == 'true') { - $sExtraTables = ',appVersion'; + $sExtraTables = ",appVersion"; + $sBugzillaQuery = ''; + + /* We only query the bugzilla table when necessary; these queries + will hide apps without test results */ + if(strstr($sWhereFilter, 'versions.id')) + { + $sExtraTables .= ','.BUGZILLA_DB.'.versions'; + $sBugzillaQuery = ' AND versions.value = appVersion.ratingRelease + AND versions.product_id = '.BUGZILLA_PRODUCT_ID.' '; + } + if($sWhereFilter) $sWhereFilter = " AND $sWhereFilter"; - $sWhereFilter = " AND appVersion.state = 'accepted' AND appVersion.appId = appFamily.appId $sWhereFilter"; + $sWhereFilter = " AND appVersion.state = 'accepted' + AND appVersion.appId = appFamily.appId + $sBugzillaQuery + $sWhereFilter"; } if($aOptions['onlyDownloadable'] == 'true') @@ -1032,9 +1046,10 @@ class Application { $aLicenses = version::getLicenses(); $aWineVersions = get_bugzilla_versions(); + $aWineVersionIds = get_bugzilla_version_ids(); $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); - $oFilter->AddFilterInfo('appVersion.ratingRelease', 'Wine version', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aWineVersions); + $oFilter->AddFilterInfo('versions.id', 'Wine version', array(FILTER_EQUALS,FILTER_LESS_THAN,FILTER_GREATER_THAN), FILTER_VALUES_ENUM, $aWineVersionIds, $aWineVersions); $oFilter->AddFilterInfo('appFamily.catId', 'Category', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); @@ -1186,9 +1201,22 @@ class Application { if($sWhereFilter || $aOptions['onlyDownloadable'] == 'true') { $sExtraTables = ',appVersion'; + $sBugzillaQuery = ''; + + /* We only query the bugzilla table when necessary; these queries + will hide apps without test results */ + if(strstr($sWhereFilter, 'versions.id')) + { + $sExtraTables .= ','.BUGZILLA_DB.'.versions'; + $sBugzillaQuery = ' AND versions.value = appVersion.ratingRelease + AND versions.product_id = '.BUGZILLA_PRODUCT_ID.' '; + } + if($sWhereFilter) $sWhereFilter = " AND $sWhereFilter"; - $sWhereFilter = " AND appVersion.appId = appFamily.appId $sWhereFilter"; + $sWhereFilter = " AND appVersion.appId = appFamily.appId + $sBugzillaQuery + $sWhereFilter"; } if($aOptions['onlyDownloadable'] == 'true') diff --git a/include/util.php b/include/util.php index 3b6453d..028edb6 100644 --- a/include/util.php +++ b/include/util.php @@ -184,6 +184,23 @@ function get_bugzilla_versions() return $aVersions; } +// Returns an array containing the IDs of the Wine versions stored in Bugzilla +function get_bugzilla_version_ids() +{ + $aIds = array(); + $hResult = query_bugzilladb("SELECT id FROM ".BUGZILLA_DB.".versions WHERE + product_id = '".BUGZILLA_PRODUCT_ID."' + ORDER BY id DESC LIMIT 6"); + + if(!$hResult) + return $aIds; + + while(list($sId) = mysql_fetch_row($hResult)) + $aIds[] = $sId; + + return $aIds; +} + // $sVarname - name of the selection array that this function will output // this is the name to use to retrieve the selection on the form postback // $sSelectedValue - the currently selected entry

1 0

Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: d3dx9: Add tests for D3DXMatrixDecompose.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 54d920ae919ac25ad7a025931f824464a1bd5e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d920ae919ac25ad7a025931… Author: Luis C. Busquets Pérez <luiscar2001(a)yahoo.es> Date: Thu Sep 11 20:11:53 2008 +0200 d3dx9: Add tests for D3DXMatrixDecompose. --- dlls/d3dx9_36/tests/math.c | 371 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 370 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54d920ae919ac25ad7a02…

1 0

Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: d3dx9: Implement D3DXMatrixDecompose.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 0af9415a4f876c59a75cffbe578b516e997b2fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af9415a4f876c59a75cffbe5… Author: Luis C. Busquets Pérez <luiscar2001(a)yahoo.es> Date: Thu Sep 11 20:14:38 2008 +0200 d3dx9: Implement D3DXMatrixDecompose. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 54 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9math.h | 1 + 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index a2dab96..2e68ba2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -198,7 +198,7 @@ @ stub D3DXLoadVolumeFromVolume @ stdcall D3DXMatrixAffineTransformation(ptr long ptr ptr ptr) d3dx8.D3DXMatrixAffineTransformation @ stub D3DXMatrixAffineTransformation2D -@ stub D3DXMatrixDecompose +@ stdcall D3DXMatrixDecompose(ptr ptr ptr ptr) @ stdcall D3DXMatrixDeterminant(ptr) d3dx8.D3DXMatrixfDeterminant @ stdcall D3DXMatrixInverse(ptr ptr ptr) d3dx8.D3DXMatrixInverse @ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr) d3dx8.D3DXMatrixLookAtLH diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index deb52d2..adee217 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -27,6 +27,60 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /************************************************************************* + * D3DXMatrixDecompose + */ +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm) +{ + D3DXMATRIX normalized; + D3DXVECTOR3 vec; + + if (!pm) + { + return D3DERR_INVALIDCALL; + } + + /*Compute the scaling part.*/ + vec.x=pm->m[0][0]; + vec.y=pm->m[0][1]; + vec.z=pm->m[0][2]; + poutscale->x=D3DXVec3Length(&vec); + + vec.x=pm->m[1][0]; + vec.y=pm->m[1][1]; + vec.z=pm->m[1][2]; + poutscale->y=D3DXVec3Length(&vec); + + vec.x=pm->m[2][0]; + vec.y=pm->m[2][1]; + vec.z=pm->m[2][2]; + poutscale->z=D3DXVec3Length(&vec); + + /*Compute the translation part.*/ + pouttranslation->x=pm->m[3][0]; + pouttranslation->y=pm->m[3][1]; + pouttranslation->z=pm->m[3][2]; + + /*Let's calculate the rotation now*/ + if ( (poutscale->x == 0.0f) || (poutscale->y == 0.0f) || (poutscale->z == 0.0f) ) + { + return D3DERR_INVALIDCALL; + } + + normalized.m[0][0]=pm->m[0][0]/poutscale->x; + normalized.m[0][1]=pm->m[0][1]/poutscale->x; + normalized.m[0][2]=pm->m[0][2]/poutscale->x; + normalized.m[1][0]=pm->m[1][0]/poutscale->y; + normalized.m[1][1]=pm->m[1][1]/poutscale->y; + normalized.m[1][2]=pm->m[1][2]/poutscale->y; + normalized.m[2][0]=pm->m[2][0]/poutscale->z; + normalized.m[2][1]=pm->m[2][1]/poutscale->z; + normalized.m[2][2]=pm->m[2][2]/poutscale->z; + + D3DXQuaternionRotationMatrix(poutrotation,&normalized); + return S_OK; +} + +/************************************************************************* * D3DXPlaneTransformArray */ D3DXPLANE* WINAPI D3DXPlaneTransformArray( diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 9801504..54e7762 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -267,6 +267,7 @@ D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, D3DXCOLOR* WINAPI D3DXColorAdjustSaturation(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s); D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); +HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutrotation, D3DXVECTOR3 *pouttranslation, D3DXMATRIX *pm); FLOAT WINAPI D3DXMatrixDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);

1 0

Tobias Jakobi : wined3d: Fix long int warnings.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 36cf25b5983f121e440b297b0687798feb9fdaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36cf25b5983f121e440b297b0… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Sep 10 15:41:10 2008 -0500 wined3d: Fix long int warnings. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2099bec..37cbe19 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1025,7 +1025,7 @@ void drawPrimitive(IWineD3DDevice *iface, WINED3DLOCKED_RECT r; char buffer[80]; IWineD3DSurface_LockRect(This->render_targets[0], &r, NULL, WINED3DLOCK_READONLY); - sprintf(buffer, "/tmp/backbuffer_%d.tga", primCounter); + sprintf(buffer, "/tmp/backbuffer_%ld.tga", primCounter); TRACE("Saving screenshot %s\n", buffer); IWineD3DSurface_SaveSnapshot(This->render_targets[0], buffer); IWineD3DSurface_UnlockRect(This->render_targets[0]); @@ -1036,7 +1036,7 @@ void drawPrimitive(IWineD3DDevice *iface, int textureNo; for (textureNo = 0; textureNo < MAX_COMBINED_SAMPLERS; ++textureNo) { if (This->stateBlock->textures[textureNo] != NULL) { - sprintf(buffer, "/tmp/texture_%p_%d_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo); + sprintf(buffer, "/tmp/texture_%p_%ld_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo); TRACE("Saving texture %s\n", buffer); if (IWineD3DBaseTexture_GetType(This->stateBlock->textures[textureNo]) == WINED3DRTYPE_TEXTURE) { IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)This->stateBlock->textures[textureNo], 0, &pSur); @@ -1050,7 +1050,7 @@ void drawPrimitive(IWineD3DDevice *iface, } #endif } - TRACE("drawprim #%d\n", primCounter); + TRACE("drawprim #%ld\n", primCounter); ++primCounter; } #endif

1 0

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 September 2008